@code-yeongyu/senpi 2026.7.17 → 2026.7.20

package/dist/core/extensions/builtin/terminal/tools/bash.js

@@ -1,5 +1,5 @@
 import { Type } from "typebox";
-import { BACKGROUND_START_GRACE_MS, DEFAULT_COLS, DEFAULT_ROWS, TERMINAL_BASH_TOOL } from "../shared.js";
+import { BACKGROUND_START_GRACE_MS, DEFAULT_COLS, DEFAULT_ROWS, KILLED_SESSION_EXIT_GRACE_MS, TERMINAL_BASH_TOOL, } from "../shared.js";
 import { errorResult, textResult } from "./context.js";
 import { describeExit, spawnCommandSession } from "./spawn.js";
 export const ptyBashSchema = Type.Object({
@@ -22,28 +22,90 @@ function resolveDimension(value, fallback) {
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+const MAX_TIMEOUT_MS = 2_147_483_647;
+/**
+ * Wait for the session's exit to settle, but stop waiting a bounded grace after
+ * the session has been killed. The native wait joins the PTY reader thread,
+ * which blocks while any surviving descendant holds the PTY open — without the
+ * grace, an aborted or timed-out command can pin the agent forever.
+ */
+function raceExitWithKillGrace(runtime, signal, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        let abortGraceTimer;
+        let timeoutGraceTimer;
+        let armAbortGrace;
+        const settle = (finish) => {
+            if (settled)
+                return;
+            settled = true;
+            if (abortGraceTimer)
+                clearTimeout(abortGraceTimer);
+            if (timeoutGraceTimer)
+                clearTimeout(timeoutGraceTimer);
+            if (signal && armAbortGrace)
+                signal.removeEventListener("abort", armAbortGrace);
+            finish();
+        };
+        runtime.session.waitExit().then(() => settle(() => resolve("exited")), (error) => settle(() => reject(error instanceof Error ? error : new Error(String(error)))));
+        if (timeoutMs !== undefined) {
+            const timeoutGraceDeadlineMs = timeoutMs + KILLED_SESSION_EXIT_GRACE_MS;
+            // Beyond the 32-bit setTimeout range the deadline cannot be represented;
+            // keep the unbounded wait rather than firing a false early timeout.
+            if (timeoutGraceDeadlineMs <= MAX_TIMEOUT_MS) {
+                timeoutGraceTimer = setTimeout(() => settle(() => resolve("timeout_grace")), timeoutGraceDeadlineMs);
+            }
+        }
+        if (signal) {
+            armAbortGrace = () => {
+                abortGraceTimer ??= setTimeout(() => settle(() => resolve("abort_grace")), KILLED_SESSION_EXIT_GRACE_MS);
+            };
+            if (signal.aborted)
+                armAbortGrace();
+            else
+                signal.addEventListener("abort", armAbortGrace, { once: true });
+        }
+    });
+}
 async function runForeground(ctx, input, cols, rows, signal, cwd) {
+    if (signal?.aborted)
+        return errorResult("Command aborted");
     const timeoutMs = input.timeout !== undefined ? Math.trunc(input.timeout * 1000) : undefined;
-    const { runtime } = await spawnCommandSession(ctx, { command: input.command, cols, rows, timeoutMs, cwd });
-    const onAbort = () => runtime.session.kill();
+    const { id, runtime } = await spawnCommandSession(ctx, { command: input.command, cols, rows, timeoutMs, cwd });
+    // Interrupt means "stop now": SIGKILL the whole process group in one shot.
+    // kill() is one-shot idempotent, so a gentle SIGTERM first would block any
+    // escalation, and a SIGTERM-ignoring command would pin the agent forever.
+    const onAbort = () => runtime.session.kill("SIGKILL");
     if (signal) {
         if (signal.aborted)
             onAbort();
         else
             signal.addEventListener("abort", onAbort, { once: true });
     }
+    let outcome;
     try {
-        await runtime.session.waitExit();
+        outcome = await raceExitWithKillGrace(runtime, signal, timeoutMs);
     }
     finally {
         signal?.removeEventListener("abort", onAbort);
     }
+    if (outcome !== "exited") {
+        // Sweep the never-settling session: the bounded registry stop marks it
+        // `stopping`, so later /exit teardown cannot hang on its exit wait.
+        void ctx.manager.stop(id).catch(() => { });
+    }
     const output = runtime.fullOutput().trimEnd();
-    const status = describeExit(runtime);
+    // Aborted runs report "Command aborted" (core bash parity) whether the exit
+    // settled normally or the kill grace released the wait. `outcome` matters
+    // beyond that only for the timeout grace, where exitResult is still null.
+    if (signal?.aborted) {
+        return errorResult(`${output ? `${output}\n\n` : ""}Command aborted`);
+    }
     const exit = runtime.exitResult;
-    if (exit?.timedOut) {
+    if (outcome === "timeout_grace" || exit?.timedOut) {
         return errorResult(`${output ? `${output}\n\n` : ""}Command timed out after ${input.timeout} seconds`);
     }
+    const status = describeExit(runtime);
     if (exit && exit.exitCode !== 0 && exit.exitCode !== null) {
         return errorResult(`${output ? `${output}\n\n` : ""}Command exited with code ${exit.exitCode}`);
     }

package/dist/core/extensions/builtin/terminal/tools/bash.js.map

@@ -1 +1 @@
-{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/terminal/tools/bash.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Static, Type } from \"typebox\";\nimport { BACKGROUND_START_GRACE_MS, DEFAULT_COLS, DEFAULT_ROWS, TERMINAL_BASH_TOOL } from \"../shared.ts\";\nimport { errorResult, type TerminalToolContext, type TerminalToolResult, textResult } from \"./context.ts\";\nimport { describeExit, spawnCommandSession } from \"./spawn.ts\";\n\nexport const ptyBashSchema = Type.Object({\n\tcommand: Type.String({ description: \"Shell command to execute in a PTY-backed session.\" }),\n\ttimeout: Type.Optional(\n\t\tType.Number({\n\t\t\tdescription:\n\t\t\t\t\"Foreground kill deadline in seconds. Ignored for run_in_background sessions (they live until exit or kill_bash).\",\n\t\t}),\n\t),\n\tdescription: Type.Optional(Type.String({ description: \"Short human-readable label for this command.\" })),\n\trun_in_background: Type.Optional(\n\t\tType.Boolean({\n\t\t\tdescription:\n\t\t\t\t\"Run as a persistent background session. Returns a bash_id immediately; query it with bash_output, steer with bash_input, tear down with kill_bash.\",\n\t\t}),\n\t),\n\tcols: Type.Optional(Type.Number({ description: \"PTY width in columns (default 120).\" })),\n\trows: Type.Optional(Type.Number({ description: \"PTY height in rows (default 40).\" })),\n});\n\nexport type PtyBashInput = Static<typeof ptyBashSchema>;\n\nfunction resolveDimension(value: number | undefined, fallback: number): number {\n\tif (value === undefined || !Number.isFinite(value) || value < 1) return fallback;\n\treturn Math.trunc(value);\n}\n\nfunction delay(ms: number): Promise<void> {\n\treturn new Promise((resolve) => setTimeout(resolve, ms));\n}\n\nasync function runForeground(\n\tctx: TerminalToolContext,\n\tinput: PtyBashInput,\n\tcols: number,\n\trows: number,\n\tsignal: AbortSignal | undefined,\n\tcwd: string | undefined,\n): Promise<TerminalToolResult> {\n\tconst timeoutMs = input.timeout !== undefined ? Math.trunc(input.timeout * 1000) : undefined;\n\tconst { runtime } = await spawnCommandSession(ctx, { command: input.command, cols, rows, timeoutMs, cwd });\n\tconst onAbort = () => runtime.session.kill();\n\tif (signal) {\n\t\tif (signal.aborted) onAbort();\n\t\telse signal.addEventListener(\"abort\", onAbort, { once: true });\n\t}\n\ttry {\n\t\tawait runtime.session.waitExit();\n\t} finally {\n\t\tsignal?.removeEventListener(\"abort\", onAbort);\n\t}\n\n\tconst output = runtime.fullOutput().trimEnd();\n\tconst status = describeExit(runtime);\n\tconst exit = runtime.exitResult;\n\tif (exit?.timedOut) {\n\t\treturn errorResult(`${output ? `${output}\\n\\n` : \"\"}Command timed out after ${input.timeout} seconds`);\n\t}\n\tif (exit && exit.exitCode !== 0 && exit.exitCode !== null) {\n\t\treturn errorResult(`${output ? `${output}\\n\\n` : \"\"}Command exited with code ${exit.exitCode}`);\n\t}\n\treturn textResult(output || \"(no output)\", { details: { status } });\n}\n\nasync function runBackground(\n\tctx: TerminalToolContext,\n\tinput: PtyBashInput,\n\tcols: number,\n\trows: number,\n\tcwd: string | undefined,\n): Promise<TerminalToolResult> {\n\t// Background sessions are NEVER killed by `timeout` (bash-timeout injects a default into\n\t// every bash call); they live until exit or kill_bash, so no timeoutMs is passed.\n\tconst { id, runtime } = await spawnCommandSession(ctx, { command: input.command, cols, rows, cwd });\n\tif (ctx.onBackgroundExit) runtime.session.onExit(() => ctx.onBackgroundExit?.(id, runtime));\n\n\t// Capture any output the command emits within a short grace window (or its exit).\n\tawait Promise.race([delay(BACKGROUND_START_GRACE_MS), runtime.session.waitExit()]);\n\tconst early = runtime.readDelta().text.trimEnd();\n\tconst header = `Command running in background with ID: ${id}`;\n\tconst backendNote =\n\t\truntime.backend === \"pipe-fallback\"\n\t\t\t? \"\\n(native PTY unavailable — running via pipe fallback; bash_input/bash_resize are limited.)\"\n\t\t\t: \"\";\n\tconst earlyBlock = early ? `\\n\\n${early}` : \"\";\n\treturn textResult(`${header}${backendNote}${earlyBlock}`, { details: { bash_id: id, background: true } });\n}\n\n/** Build the PTY-backed `bash` tool definition. */\nexport function createPtyBashTool(ctx: TerminalToolContext) {\n\treturn {\n\t\tname: TERMINAL_BASH_TOOL,\n\t\tlabel: \"bash\",\n\t\tdescription:\n\t\t\t\"Execute a shell command in a persistent PTY-backed session. Set run_in_background:true for long-lived or interactive sessions; steer them with bash_input, snapshot with bash_output, tear down with kill_bash. Foreground timeout is a kill deadline in seconds.\",\n\t\tpromptSnippet: \"Run shell commands; run_in_background:true for long-lived/interactive PTY sessions\",\n\t\tparameters: ptyBashSchema,\n\t\tasync execute(\n\t\t\t_toolCallId: string,\n\t\t\tinput: PtyBashInput,\n\t\t\tsignal?: AbortSignal,\n\t\t\t_onUpdate?: unknown,\n\t\t\texecCtx?: { cwd?: string },\n\t\t): Promise<TerminalToolResult> {\n\t\t\tconst cols = resolveDimension(input.cols, ctx.defaultCols || DEFAULT_COLS);\n\t\t\tconst rows = resolveDimension(input.rows, ctx.defaultRows || DEFAULT_ROWS);\n\t\t\tconst cwd = execCtx?.cwd;\n\t\t\tif (input.run_in_background) return runBackground(ctx, input, cols, rows, cwd);\n\t\t\treturn runForeground(ctx, input, cols, rows, signal, cwd);\n\t\t},\n\t};\n}\n"]}
+{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/terminal/tools/bash.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Static, Type } from \"typebox\";\nimport type { TerminalRuntimeSession } from \"../runtime-session.ts\";\nimport {\n\tBACKGROUND_START_GRACE_MS,\n\tDEFAULT_COLS,\n\tDEFAULT_ROWS,\n\tKILLED_SESSION_EXIT_GRACE_MS,\n\tTERMINAL_BASH_TOOL,\n} from \"../shared.ts\";\nimport { errorResult, type TerminalToolContext, type TerminalToolResult, textResult } from \"./context.ts\";\nimport { describeExit, spawnCommandSession } from \"./spawn.ts\";\n\nexport const ptyBashSchema = Type.Object({\n\tcommand: Type.String({ description: \"Shell command to execute in a PTY-backed session.\" }),\n\ttimeout: Type.Optional(\n\t\tType.Number({\n\t\t\tdescription:\n\t\t\t\t\"Foreground kill deadline in seconds. Ignored for run_in_background sessions (they live until exit or kill_bash).\",\n\t\t}),\n\t),\n\tdescription: Type.Optional(Type.String({ description: \"Short human-readable label for this command.\" })),\n\trun_in_background: Type.Optional(\n\t\tType.Boolean({\n\t\t\tdescription:\n\t\t\t\t\"Run as a persistent background session. Returns a bash_id immediately; query it with bash_output, steer with bash_input, tear down with kill_bash.\",\n\t\t}),\n\t),\n\tcols: Type.Optional(Type.Number({ description: \"PTY width in columns (default 120).\" })),\n\trows: Type.Optional(Type.Number({ description: \"PTY height in rows (default 40).\" })),\n});\n\nexport type PtyBashInput = Static<typeof ptyBashSchema>;\n\nfunction resolveDimension(value: number | undefined, fallback: number): number {\n\tif (value === undefined || !Number.isFinite(value) || value < 1) return fallback;\n\treturn Math.trunc(value);\n}\n\nfunction delay(ms: number): Promise<void> {\n\treturn new Promise((resolve) => setTimeout(resolve, ms));\n}\n\nconst MAX_TIMEOUT_MS = 2_147_483_647;\n\ntype ForegroundWaitOutcome = \"exited\" | \"abort_grace\" | \"timeout_grace\";\n\n/**\n * Wait for the session's exit to settle, but stop waiting a bounded grace after\n * the session has been killed. The native wait joins the PTY reader thread,\n * which blocks while any surviving descendant holds the PTY open — without the\n * grace, an aborted or timed-out command can pin the agent forever.\n */\nfunction raceExitWithKillGrace(\n\truntime: TerminalRuntimeSession,\n\tsignal: AbortSignal | undefined,\n\ttimeoutMs: number | undefined,\n): Promise<ForegroundWaitOutcome> {\n\treturn new Promise((resolve, reject) => {\n\t\tlet settled = false;\n\t\tlet abortGraceTimer: ReturnType<typeof setTimeout> | undefined;\n\t\tlet timeoutGraceTimer: ReturnType<typeof setTimeout> | undefined;\n\t\tlet armAbortGrace: (() => void) | undefined;\n\t\tconst settle = (finish: () => void) => {\n\t\t\tif (settled) return;\n\t\t\tsettled = true;\n\t\t\tif (abortGraceTimer) clearTimeout(abortGraceTimer);\n\t\t\tif (timeoutGraceTimer) clearTimeout(timeoutGraceTimer);\n\t\t\tif (signal && armAbortGrace) signal.removeEventListener(\"abort\", armAbortGrace);\n\t\t\tfinish();\n\t\t};\n\t\truntime.session.waitExit().then(\n\t\t\t() => settle(() => resolve(\"exited\")),\n\t\t\t(error: unknown) => settle(() => reject(error instanceof Error ? error : new Error(String(error)))),\n\t\t);\n\t\tif (timeoutMs !== undefined) {\n\t\t\tconst timeoutGraceDeadlineMs = timeoutMs + KILLED_SESSION_EXIT_GRACE_MS;\n\t\t\t// Beyond the 32-bit setTimeout range the deadline cannot be represented;\n\t\t\t// keep the unbounded wait rather than firing a false early timeout.\n\t\t\tif (timeoutGraceDeadlineMs <= MAX_TIMEOUT_MS) {\n\t\t\t\ttimeoutGraceTimer = setTimeout(() => settle(() => resolve(\"timeout_grace\")), timeoutGraceDeadlineMs);\n\t\t\t}\n\t\t}\n\t\tif (signal) {\n\t\t\tarmAbortGrace = () => {\n\t\t\t\tabortGraceTimer ??= setTimeout(() => settle(() => resolve(\"abort_grace\")), KILLED_SESSION_EXIT_GRACE_MS);\n\t\t\t};\n\t\t\tif (signal.aborted) armAbortGrace();\n\t\t\telse signal.addEventListener(\"abort\", armAbortGrace, { once: true });\n\t\t}\n\t});\n}\n\nasync function runForeground(\n\tctx: TerminalToolContext,\n\tinput: PtyBashInput,\n\tcols: number,\n\trows: number,\n\tsignal: AbortSignal | undefined,\n\tcwd: string | undefined,\n): Promise<TerminalToolResult> {\n\tif (signal?.aborted) return errorResult(\"Command aborted\");\n\tconst timeoutMs = input.timeout !== undefined ? Math.trunc(input.timeout * 1000) : undefined;\n\tconst { id, runtime } = await spawnCommandSession(ctx, { command: input.command, cols, rows, timeoutMs, cwd });\n\t// Interrupt means \"stop now\": SIGKILL the whole process group in one shot.\n\t// kill() is one-shot idempotent, so a gentle SIGTERM first would block any\n\t// escalation, and a SIGTERM-ignoring command would pin the agent forever.\n\tconst onAbort = () => runtime.session.kill(\"SIGKILL\");\n\tif (signal) {\n\t\tif (signal.aborted) onAbort();\n\t\telse signal.addEventListener(\"abort\", onAbort, { once: true });\n\t}\n\tlet outcome: ForegroundWaitOutcome;\n\ttry {\n\t\toutcome = await raceExitWithKillGrace(runtime, signal, timeoutMs);\n\t} finally {\n\t\tsignal?.removeEventListener(\"abort\", onAbort);\n\t}\n\n\tif (outcome !== \"exited\") {\n\t\t// Sweep the never-settling session: the bounded registry stop marks it\n\t\t// `stopping`, so later /exit teardown cannot hang on its exit wait.\n\t\tvoid ctx.manager.stop(id).catch(() => {});\n\t}\n\tconst output = runtime.fullOutput().trimEnd();\n\t// Aborted runs report \"Command aborted\" (core bash parity) whether the exit\n\t// settled normally or the kill grace released the wait. `outcome` matters\n\t// beyond that only for the timeout grace, where exitResult is still null.\n\tif (signal?.aborted) {\n\t\treturn errorResult(`${output ? `${output}\\n\\n` : \"\"}Command aborted`);\n\t}\n\tconst exit = runtime.exitResult;\n\tif (outcome === \"timeout_grace\" || exit?.timedOut) {\n\t\treturn errorResult(`${output ? `${output}\\n\\n` : \"\"}Command timed out after ${input.timeout} seconds`);\n\t}\n\tconst status = describeExit(runtime);\n\tif (exit && exit.exitCode !== 0 && exit.exitCode !== null) {\n\t\treturn errorResult(`${output ? `${output}\\n\\n` : \"\"}Command exited with code ${exit.exitCode}`);\n\t}\n\treturn textResult(output || \"(no output)\", { details: { status } });\n}\n\nasync function runBackground(\n\tctx: TerminalToolContext,\n\tinput: PtyBashInput,\n\tcols: number,\n\trows: number,\n\tcwd: string | undefined,\n): Promise<TerminalToolResult> {\n\t// Background sessions are NEVER killed by `timeout` (bash-timeout injects a default into\n\t// every bash call); they live until exit or kill_bash, so no timeoutMs is passed.\n\tconst { id, runtime } = await spawnCommandSession(ctx, { command: input.command, cols, rows, cwd });\n\tif (ctx.onBackgroundExit) runtime.session.onExit(() => ctx.onBackgroundExit?.(id, runtime));\n\n\t// Capture any output the command emits within a short grace window (or its exit).\n\tawait Promise.race([delay(BACKGROUND_START_GRACE_MS), runtime.session.waitExit()]);\n\tconst early = runtime.readDelta().text.trimEnd();\n\tconst header = `Command running in background with ID: ${id}`;\n\tconst backendNote =\n\t\truntime.backend === \"pipe-fallback\"\n\t\t\t? \"\\n(native PTY unavailable — running via pipe fallback; bash_input/bash_resize are limited.)\"\n\t\t\t: \"\";\n\tconst earlyBlock = early ? `\\n\\n${early}` : \"\";\n\treturn textResult(`${header}${backendNote}${earlyBlock}`, { details: { bash_id: id, background: true } });\n}\n\n/** Build the PTY-backed `bash` tool definition. */\nexport function createPtyBashTool(ctx: TerminalToolContext) {\n\treturn {\n\t\tname: TERMINAL_BASH_TOOL,\n\t\tlabel: \"bash\",\n\t\tdescription:\n\t\t\t\"Execute a shell command in a persistent PTY-backed session. Set run_in_background:true for long-lived or interactive sessions; steer them with bash_input, snapshot with bash_output, tear down with kill_bash. Foreground timeout is a kill deadline in seconds.\",\n\t\tpromptSnippet: \"Run shell commands; run_in_background:true for long-lived/interactive PTY sessions\",\n\t\tparameters: ptyBashSchema,\n\t\tasync execute(\n\t\t\t_toolCallId: string,\n\t\t\tinput: PtyBashInput,\n\t\t\tsignal?: AbortSignal,\n\t\t\t_onUpdate?: unknown,\n\t\t\texecCtx?: { cwd?: string },\n\t\t): Promise<TerminalToolResult> {\n\t\t\tconst cols = resolveDimension(input.cols, ctx.defaultCols || DEFAULT_COLS);\n\t\t\tconst rows = resolveDimension(input.rows, ctx.defaultRows || DEFAULT_ROWS);\n\t\t\tconst cwd = execCtx?.cwd;\n\t\t\tif (input.run_in_background) return runBackground(ctx, input, cols, rows, cwd);\n\t\t\treturn runForeground(ctx, input, cols, rows, signal, cwd);\n\t\t},\n\t};\n}\n"]}

package/dist/core/extensions/builtin/todotools/commands.d.ts

@@ -0,0 +1,18 @@
+import type { ExtensionAPI, ExtensionContext } from "../../types.ts";
+import { type TodoItem, type TodoPhase } from "./state.ts";
+export type TodoCommandAccessors = {
+    getCurrentPhases: () => TodoPhase[];
+    setCurrentPhases: (phases: TodoPhase[]) => void;
+    syncWidget: (ctx: ExtensionContext) => void;
+};
+/** Tokenizer honoring double-quoted strings and backslash escapes. */
+export declare function tokenizeTodoArgs(input: string): string[];
+/** Exact name first, then unique prefix, then unique substring (case-insensitive). */
+export declare function findPhaseFuzzy(phases: TodoPhase[], query: string): TodoPhase | undefined;
+/** Exact content first, then unique substring; ambiguity resolved toward open work. */
+export declare function findTaskFuzzy(phases: TodoPhase[], query: string): {
+    task: TodoItem;
+    phase: TodoPhase;
+} | undefined;
+export declare function registerTodoCommand(pi: ExtensionAPI, accessors: TodoCommandAccessors): void;
+//# sourceMappingURL=commands.d.ts.map

package/dist/core/extensions/builtin/todotools/commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/todotools/commands.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAA2B,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE9F,OAAO,EAKN,KAAK,QAAQ,EACb,KAAK,SAAS,EAEd,MAAM,YAAY,CAAC;AAkBpB,MAAM,MAAM,oBAAoB,GAAG;IAClC,gBAAgB,EAAE,MAAM,SAAS,EAAE,CAAC;IACpC,gBAAgB,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;IAChD,UAAU,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAC5C,CAAC;AAEF,sEAAsE;AACtE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA0BxD;AAED,sFAAsF;AACtF,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAUxF;AAED,uFAAuF;AACvF,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,SAAS,CAkBlH;AA8BD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,oBAAoB,GAAG,IAAI,CAmS3F"}

package/dist/core/extensions/builtin/todotools/commands.js

@@ -0,0 +1,395 @@
+// /todo slash command: user-facing todo management.
+//
+// Ported and adapted from oh-my-pi's
+// `packages/coding-agent/src/modes/controllers/todo-command-controller.ts`
+// (MIT — see NOTICE.md). senpi adaptations: the command registers through the
+// extension API, edits happen in the built-in `ctx.ui.editor` overlay instead
+// of a suspended external $EDITOR, and user edits persist as `senpi.todo-state`
+// entries with `source: "user"` so the branch scanner and compaction bridge
+// pick them up unchanged.
+import { readFile, writeFile } from "node:fs/promises";
+import { copyToClipboard } from "../../../../utils/clipboard.js";
+import { markdownToPhases, phasesToMarkdown, resolveTodoMarkdownPath } from "./markdown.js";
+import { applyOpsToPhases, clonePhases, DEFAULT_INIT_PHASE, TODO_STATE_ENTRY_TYPE, } from "./state.js";
+const USAGE = [
+    "Usage: /todo <verb> [args]",
+    "  /todo                              Show current todos",
+    "  /todo edit                         Edit todos as Markdown in an overlay",
+    "  /todo copy                         Copy todos as Markdown to clipboard",
+    "  /todo export [<path>]              Write todos to file (default: TODO.md)",
+    "  /todo import [<path>]              Replace todos from file (default: TODO.md)",
+    "  /todo append [<phase>] <task...>   Append a task; phase fuzzy-matched or created",
+    "  /todo start  <task>                Mark task in_progress (fuzzy match)",
+    "  /todo done   [<task|phase>]        Mark task/phase/all completed",
+    "  /todo drop   [<task|phase>]        Mark task/phase/all abandoned",
+    "  /todo rm     [<task|phase>]        Remove task/phase/all",
+].join("\n");
+const VERBS = ["edit", "copy", "export", "import", "append", "start", "done", "drop", "rm", "help"];
+/** Tokenizer honoring double-quoted strings and backslash escapes. */
+export function tokenizeTodoArgs(input) {
+    const tokens = [];
+    let current = "";
+    let inQuote = false;
+    for (let index = 0; index < input.length; index += 1) {
+        const char = input[index];
+        if (char === "\\" && index + 1 < input.length) {
+            current += input[index + 1];
+            index += 1;
+            continue;
+        }
+        if (char === '"') {
+            inQuote = !inQuote;
+            continue;
+        }
+        if (!inQuote && /\s/.test(char)) {
+            if (current) {
+                tokens.push(current);
+                current = "";
+            }
+            continue;
+        }
+        current += char;
+    }
+    if (current)
+        tokens.push(current);
+    return tokens;
+}
+/** Exact name first, then unique prefix, then unique substring (case-insensitive). */
+export function findPhaseFuzzy(phases, query) {
+    const q = query.trim().toLowerCase();
+    if (!q)
+        return undefined;
+    const byName = phases.find((phase) => phase.name.toLowerCase() === q);
+    if (byName)
+        return byName;
+    const prefixMatches = phases.filter((phase) => phase.name.toLowerCase().startsWith(q));
+    if (prefixMatches.length === 1)
+        return prefixMatches[0];
+    const substringMatches = phases.filter((phase) => phase.name.toLowerCase().includes(q));
+    if (substringMatches.length === 1)
+        return substringMatches[0];
+    return undefined;
+}
+/** Exact content first, then unique substring; ambiguity resolved toward open work. */
+export function findTaskFuzzy(phases, query) {
+    const q = query.trim().toLowerCase();
+    if (!q)
+        return undefined;
+    for (const phase of phases) {
+        for (const task of phase.tasks) {
+            if (task.content.toLowerCase() === q)
+                return { task, phase };
+        }
+    }
+    const matches = [];
+    for (const phase of phases) {
+        for (const task of phase.tasks) {
+            if (task.content.toLowerCase().includes(q))
+                matches.push({ task, phase });
+        }
+    }
+    if (matches.length === 1)
+        return matches[0];
+    const open = matches.filter((hit) => hit.task.status === "in_progress" || hit.task.status === "pending");
+    if (open.length === 1)
+        return open[0];
+    return undefined;
+}
+function titleCaseWords(text) {
+    return text
+        .split(/\s+/)
+        .filter(Boolean)
+        .map((word) => word[0].toUpperCase() + word.slice(1))
+        .join(" ");
+}
+function titleCaseSentence(text) {
+    const trimmed = text.trim();
+    if (!trimmed)
+        return trimmed;
+    return trimmed[0].toUpperCase() + trimmed.slice(1);
+}
+function buildUserEditReminder(action, phases, removed) {
+    const markdown = phases.length === 0 ? "(empty)" : phasesToMarkdown(phases).trimEnd();
+    const lines = ["<system-reminder>", `The user manually modified the todo list (${action}).`];
+    if (removed) {
+        lines.push(phases.length === 0
+            ? "The user intentionally cleared the todo list. Do NOT recreate or re-populate it unless the user explicitly asks; continue the current request without a todo list."
+            : "The user intentionally removed the entries no longer shown below. Do NOT re-add them unless the user explicitly asks.");
+    }
+    lines.push("Current todo list:", "", markdown, "</system-reminder>");
+    return lines.join("\n");
+}
+export function registerTodoCommand(pi, accessors) {
+    function commit(ctx, nextPhases, action, options) {
+        accessors.setCurrentPhases(clonePhases(nextPhases));
+        pi.appendEntry(TODO_STATE_ENTRY_TYPE, {
+            schema: "v2",
+            phases: clonePhases(nextPhases),
+            source: "user",
+            action,
+        });
+        accessors.syncWidget(ctx);
+        pi.sendMessage({
+            customType: "todotools.user-edit",
+            content: buildUserEditReminder(action, nextPhases, options?.removed ?? false),
+            display: false,
+        }, { triggerTurn: false, deliverAs: "nextTurn" });
+    }
+    function showCurrent(ctx) {
+        const phases = accessors.getCurrentPhases();
+        if (phases.length === 0) {
+            ctx.ui.notify("No todos. Use /todo append <task> to start one.", "info");
+            return;
+        }
+        ctx.ui.notify(phasesToMarkdown(phases).trimEnd(), "info");
+    }
+    async function editInOverlay(ctx) {
+        const current = accessors.getCurrentPhases();
+        const initialMarkdown = current.length > 0
+            ? phasesToMarkdown(current)
+            : `# ${DEFAULT_INIT_PHASE}\n- [ ] (replace this with your tasks)\n`;
+        const edited = await ctx.ui.editor("Edit todos (Markdown checklist)", initialMarkdown);
+        if (edited === undefined || edited === initialMarkdown) {
+            ctx.ui.notify("Todos unchanged.", "info");
+            return;
+        }
+        const { phases, errors } = markdownToPhases(edited);
+        if (errors.length > 0) {
+            ctx.ui.notify(`Could not parse Markdown:\n  ${errors.join("\n  ")}`, "error");
+            return;
+        }
+        commit(ctx, phases, "/todo edit");
+        const taskCount = phases.reduce((sum, phase) => sum + phase.tasks.length, 0);
+        ctx.ui.notify(`Todos updated: ${phases.length} phase(s), ${taskCount} task(s).`, "info");
+    }
+    async function copyMarkdown(ctx) {
+        const phases = accessors.getCurrentPhases();
+        if (phases.length === 0) {
+            ctx.ui.notify("No todos to copy.", "warning");
+            return;
+        }
+        try {
+            await copyToClipboard(phasesToMarkdown(phases));
+            ctx.ui.notify("Copied todos as Markdown to clipboard.", "info");
+        }
+        catch (error) {
+            ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
+        }
+    }
+    async function exportToFile(ctx, rest) {
+        const phases = accessors.getCurrentPhases();
+        if (phases.length === 0) {
+            ctx.ui.notify("No todos to export.", "warning");
+            return;
+        }
+        try {
+            const target = resolveTodoMarkdownPath(rest, ctx.cwd);
+            await writeFile(target, phasesToMarkdown(phases), "utf8");
+            ctx.ui.notify(`Wrote todos to ${target}`, "info");
+        }
+        catch (error) {
+            ctx.ui.notify(`Failed to write todos: ${error instanceof Error ? error.message : String(error)}`, "error");
+        }
+    }
+    async function importFromFile(ctx, rest) {
+        let source = "";
+        let content;
+        try {
+            source = resolveTodoMarkdownPath(rest, ctx.cwd);
+            content = await readFile(source, "utf8");
+        }
+        catch (error) {
+            ctx.ui.notify(`Failed to read todos: ${error instanceof Error ? error.message : String(error)}`, "error");
+            return;
+        }
+        const { phases, errors } = markdownToPhases(content);
+        if (errors.length > 0) {
+            ctx.ui.notify(`Could not parse ${source}:\n  ${errors.join("\n  ")}`, "error");
+            return;
+        }
+        commit(ctx, phases, `/todo import ${source}`);
+        const taskCount = phases.reduce((sum, phase) => sum + phase.tasks.length, 0);
+        ctx.ui.notify(`Imported ${phases.length} phase(s), ${taskCount} task(s) from ${source}.`, "info");
+    }
+    function append(ctx, rest) {
+        const tokens = tokenizeTodoArgs(rest);
+        if (tokens.length === 0) {
+            ctx.ui.notify("Usage: /todo append [<phase>] <task...>", "error");
+            return;
+        }
+        const next = clonePhases(accessors.getCurrentPhases());
+        let phaseName;
+        let content;
+        if (tokens.length === 1) {
+            content = tokens[0];
+        }
+        else {
+            phaseName = tokens[0];
+            content = tokens.slice(1).join(" ");
+        }
+        let targetPhase;
+        if (phaseName) {
+            targetPhase = findPhaseFuzzy(next, phaseName);
+            if (!targetPhase) {
+                targetPhase = { name: titleCaseWords(phaseName), tasks: [] };
+                next.push(targetPhase);
+            }
+        }
+        else if (next.length > 0) {
+            targetPhase = next[next.length - 1];
+        }
+        else {
+            targetPhase = { name: DEFAULT_INIT_PHASE, tasks: [] };
+            next.push(targetPhase);
+        }
+        const finalContent = titleCaseSentence(content);
+        targetPhase.tasks.push({ content: finalContent, status: "pending" });
+        commit(ctx, next, `/todo append → ${targetPhase.name}`);
+        ctx.ui.notify(`Appended to ${targetPhase.name}: ${finalContent}`, "info");
+    }
+    function start(ctx, rest) {
+        if (!rest) {
+            ctx.ui.notify("Usage: /todo start <task>", "error");
+            return;
+        }
+        const current = accessors.getCurrentPhases();
+        const hit = findTaskFuzzy(current, rest);
+        if (!hit) {
+            ctx.ui.notify(`No task matched "${rest}". Use /todo to list current tasks.`, "error");
+            return;
+        }
+        const { phases, errors } = applyOpsToPhases(current, [{ op: "start", task: hit.task.content }]);
+        if (errors.length > 0) {
+            ctx.ui.notify(errors.join("; "), "error");
+            return;
+        }
+        commit(ctx, phases, `/todo start ${hit.task.content}`);
+        ctx.ui.notify(`Started: ${hit.task.content}`, "info");
+    }
+    function mutateStatus(ctx, rest, target) {
+        const op = target === "completed" ? "done" : "drop";
+        const current = accessors.getCurrentPhases();
+        const trimmed = rest.trim();
+        if (!trimmed) {
+            const { phases, errors } = applyOpsToPhases(current, [{ op }]);
+            if (errors.length > 0) {
+                ctx.ui.notify(errors.join("; "), "error");
+                return;
+            }
+            commit(ctx, phases, `/todo ${op} (all)`);
+            ctx.ui.notify(`Marked all tasks ${target}.`, "info");
+            return;
+        }
+        const taskHit = findTaskFuzzy(current, trimmed);
+        if (taskHit) {
+            const { phases, errors } = applyOpsToPhases(current, [{ op, task: taskHit.task.content }]);
+            if (errors.length > 0) {
+                ctx.ui.notify(errors.join("; "), "error");
+                return;
+            }
+            commit(ctx, phases, `/todo ${op} ${taskHit.task.content}`);
+            ctx.ui.notify(`Marked ${target}: ${taskHit.task.content}`, "info");
+            return;
+        }
+        const phaseHit = findPhaseFuzzy(current, trimmed);
+        if (phaseHit) {
+            const { phases, errors } = applyOpsToPhases(current, [{ op, phase: phaseHit.name }]);
+            if (errors.length > 0) {
+                ctx.ui.notify(errors.join("; "), "error");
+                return;
+            }
+            commit(ctx, phases, `/todo ${op} ${phaseHit.name}`);
+            ctx.ui.notify(`Marked phase ${phaseHit.name} ${target}.`, "info");
+            return;
+        }
+        ctx.ui.notify(`No task or phase matched "${trimmed}".`, "error");
+    }
+    function remove(ctx, rest) {
+        const current = accessors.getCurrentPhases();
+        const trimmed = rest.trim();
+        if (!trimmed) {
+            commit(ctx, [], "/todo rm (all)", { removed: true });
+            ctx.ui.notify("Cleared all todos.", "info");
+            return;
+        }
+        const taskHit = findTaskFuzzy(current, trimmed);
+        if (taskHit) {
+            const { phases, errors } = applyOpsToPhases(current, [{ op: "rm", task: taskHit.task.content }]);
+            if (errors.length > 0) {
+                ctx.ui.notify(errors.join("; "), "error");
+                return;
+            }
+            commit(ctx, phases, `/todo rm ${taskHit.task.content}`, { removed: true });
+            ctx.ui.notify(`Removed: ${taskHit.task.content}`, "info");
+            return;
+        }
+        const phaseHit = findPhaseFuzzy(current, trimmed);
+        if (phaseHit) {
+            const { phases, errors } = applyOpsToPhases(current, [{ op: "rm", phase: phaseHit.name }]);
+            if (errors.length > 0) {
+                ctx.ui.notify(errors.join("; "), "error");
+                return;
+            }
+            commit(ctx, phases, `/todo rm ${phaseHit.name}`, { removed: true });
+            ctx.ui.notify(`Removed phase: ${phaseHit.name}`, "info");
+            return;
+        }
+        ctx.ui.notify(`No task or phase matched "${trimmed}".`, "error");
+    }
+    pi.registerCommand("todo", {
+        description: "Show or edit the todo list (edit/copy/export/import/append/start/done/drop/rm)",
+        getArgumentCompletions: (argumentPrefix) => {
+            const prefix = argumentPrefix.trim().toLowerCase();
+            const matches = VERBS.filter((verb) => verb.startsWith(prefix));
+            if (matches.length === 0)
+                return null;
+            return matches.map((verb) => ({ value: verb, label: verb }));
+        },
+        handler: async (args, ctx) => {
+            const trimmed = args.trim();
+            if (!trimmed) {
+                showCurrent(ctx);
+                return;
+            }
+            const spaceIndex = trimmed.search(/\s/);
+            const verb = (spaceIndex === -1 ? trimmed : trimmed.slice(0, spaceIndex)).toLowerCase();
+            const rest = spaceIndex === -1 ? "" : trimmed.slice(spaceIndex + 1).trim();
+            switch (verb) {
+                case "edit":
+                    await editInOverlay(ctx);
+                    return;
+                case "copy":
+                    await copyMarkdown(ctx);
+                    return;
+                case "export":
+                    await exportToFile(ctx, rest);
+                    return;
+                case "import":
+                    await importFromFile(ctx, rest);
+                    return;
+                case "help":
+                case "?":
+                    ctx.ui.notify(USAGE, "info");
+                    return;
+                case "append":
+                    append(ctx, rest);
+                    return;
+                case "start":
+                    start(ctx, rest);
+                    return;
+                case "done":
+                    mutateStatus(ctx, rest, "completed");
+                    return;
+                case "drop":
+                    mutateStatus(ctx, rest, "abandoned");
+                    return;
+                case "rm":
+                    remove(ctx, rest);
+                    return;
+                default:
+                    ctx.ui.notify(`Unknown /todo verb "${verb}".\n${USAGE}`, "error");
+            }
+        },
+    });
+}
+//# sourceMappingURL=commands.js.map