shumengya/sproutclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(coding-agent): refine session_directory hook closes #1729

Browse Source
This commit is contained in:
Mario Zechner
2026-03-08 00:07:56 +01:00
parent 7df89066d9
commit 787f351ab7
6 changed files with 38 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/coding-agent/src/core/extensions/index.ts
View File

@@ -115,6 +115,7 @@ export type {
SessionBeforeTreeResult,
SessionCompactEvent,
SessionDirectoryEvent,
SessionDirectoryHandler,
SessionDirectoryResult,
SessionEvent,
SessionForkEvent,

34
packages/coding-agent/src/core/extensions/runner.ts
View File

@@ -851,40 +851,6 @@ export class ExtensionRunner {
return { skillPaths, promptPaths, themePaths };
}
/** Emit session_directory event. Returns custom session directory from extensions (last one wins). */
async emitSessionDirectory(cwd: string, cliSessionDir: string | undefined): Promise<string | undefined> {
const ctx = this.createContext();
let customSessionDir: string | undefined;
for (const ext of this.extensions) {
const handlers = ext.handlers.get("session_directory");
if (!handlers || handlers.length === 0) continue;
for (const handler of handlers) {
try {
const event = { type: "session_directory" as const, cwd, cliSessionDir };
const handlerResult = await handler(event, ctx);
const result = handlerResult as { sessionDir?: string } | undefined;
if (result?.sessionDir) {
customSessionDir = result.sessionDir;
}
} catch (err) {
const message = err instanceof Error ? err.message : String(err);
const stack = err instanceof Error ? err.stack : undefined;
this.emitError({
extensionPath: ext.path,
event: "session_directory",
error: message,
stack,
});
}
}
}
return customSessionDir;
}
/** Emit input event. Transforms chain, "handled" short-circuits. */
async emitInput(text: string, images: ImageContent[] | undefined, source: InputSource): Promise<InputEventResult> {
const ctx = this.createContext();

9
packages/coding-agent/src/core/extensions/types.ts
View File

@@ -392,8 +392,6 @@ export interface ResourcesDiscoverResult {
export interface SessionDirectoryEvent {
type: "session_directory";
cwd: string;
/** CLI-provided session directory (if any) */
cliSessionDir: string | undefined;
}
/** Fired on initial session load */
@@ -880,6 +878,11 @@ export interface SessionDirectoryResult {
sessionDir?: string;
}
/** Special startup-only handler. Unlike other events, this receives no ExtensionContext. */
export type SessionDirectoryHandler = (
event: SessionDirectoryEvent,
) => Promise<SessionDirectoryResult | undefined> | SessionDirectoryResult | undefined;
export interface SessionBeforeSwitchResult {
cancel?: boolean;
}
@@ -950,7 +953,7 @@ export interface ExtensionAPI {
// =========================================================================
on(event: "resources_discover", handler: ExtensionHandler<ResourcesDiscoverEvent, ResourcesDiscoverResult>): void;
on(event: "session_directory", handler: ExtensionHandler<SessionDirectoryEvent, SessionDirectoryResult>): void;
on(event: "session_directory", handler: SessionDirectoryHandler): void;
on(event: "session_start", handler: ExtensionHandler<SessionStartEvent>): void;
on(
event: "session_before_switch",

34
packages/coding-agent/src/main.ts
View File

@@ -379,39 +379,18 @@ async function promptConfirm(message: string): Promise<boolean> {
});
}
/** Helper to call session_directory handlers from extensions before runner is fully initialized */
async function callSessionDirectoryHook(
extensions: LoadExtensionsResult,
cwd: string,
cliSessionDir: string | undefined,
): Promise<string | undefined> {
/** Helper to call CLI-only session_directory handlers before the initial session manager is created */
async function callSessionDirectoryHook(extensions: LoadExtensionsResult, cwd: string): Promise<string | undefined> {
let customSessionDir: string | undefined;
// Minimal context for this early event - most context actions will throw if called
const ctx = {
ui: { notify: () => {}, setStatus: () => {}, setWorkingMessage: () => {} } as any,
hasUI: false,
cwd,
sessionManager: undefined as any,
modelRegistry: undefined as any,
model: undefined,
isIdle: () => true,
abort: () => {},
hasPendingMessages: () => false,
shutdown: () => process.exit(0),
getContextUsage: () => undefined,
compact: () => {},
getSystemPrompt: () => "",
};
for (const ext of extensions.extensions) {
const handlers = ext.handlers.get("session_directory");
if (!handlers || handlers.length === 0) continue;
for (const handler of handlers) {
try {
const event = { type: "session_directory" as const, cwd, cliSessionDir };
const result = (await handler(event, ctx)) as { sessionDir?: string } | undefined;
const event = { type: "session_directory" as const, cwd };
const result = (await handler(event)) as { sessionDir?: string } | undefined;
if (result?.sessionDir) {
customSessionDir = result.sessionDir;
@@ -438,7 +417,7 @@ async function createSessionManager(
// CLI flag takes precedence, otherwise ask extensions for custom session directory
let effectiveSessionDir = parsed.sessionDir;
if (!effectiveSessionDir) {
effectiveSessionDir = await callSessionDirectoryHook(extensions, cwd, parsed.sessionDir);
effectiveSessionDir = await callSessionDirectoryHook(extensions, cwd);
}
if (parsed.session) {
@@ -742,8 +721,7 @@ export async function main(args: string[]) {
KeybindingsManager.create();
// Compute effective session dir for resume (same logic as createSessionManager)
const effectiveSessionDir =
parsed.sessionDir || (await callSessionDirectoryHook(extensionsResult, cwd, parsed.sessionDir));
const effectiveSessionDir = parsed.sessionDir || (await callSessionDirectoryHook(extensionsResult, cwd));
const selectedPath = await selectSession(
(onProgress) => SessionManager.list(cwd, effectiveSessionDir, onProgress),