@gajae-code/coding-agent 0.16.0 → 0.16.1

package/src/tools/index.ts

@@ -1,7 +1,7 @@
 import type { AgentTelemetryConfig, AgentTool } from "@gajae-code/agent-core";
 import type { Model, ServiceTier, ToolChoice } from "@gajae-code/ai/core";
 import { $env, logger } from "@gajae-code/utils";
-import type { AsyncJobManager } from "../async";
+import type { AsyncJobManager, FoldReason } from "../async";
 import type { PromptTemplate } from "../config/prompt-templates";
 import type { Settings } from "../config/settings";
 import type { Skill } from "../extensibility/skills";
@@ -240,12 +240,14 @@ export interface ToolSession {
 	registerForegroundFoldParticipant?: (adapter: FoldAdapter) => () => void;
 	/** Whether a foreground wait is currently foldable into a background job. */
 	hasForegroundBashBackgroundRequestHandler?: () => boolean;
-	/** Request that the active foreground wait fold into a background job, if supported. */
-	requestForegroundBashBackground?: () => Promise<boolean>;
+	/** Request that a foreground wait fold into a background job, if supported. `reason` names the trigger; `adapter` targets a specific wait instead of the newest registration. */
+	requestForegroundBashBackground?: (reason?: FoldReason, adapter?: FoldAdapter) => Promise<boolean>;
+	/** Current tool interrupt policy; `finish_tools` lets the running tool finish, so a steer must not fold it. */
+	getToolInterruptPolicy?: () => "abort_tools" | "finish_tools";
 
 	/** Get the session-owned or inherited async job manager. */
 	getAsyncJobManager?: () => AsyncJobManager | undefined;
-	/** Resolves when the session queues user steering (or `signal` aborts) without consuming it; wait-style tools use this to end their observation early. */
+	/** Resolves on a steer admitted after the wait starts, or when `signal` aborts, without consuming the steer. */
 	waitForUserSteering?: (signal: AbortSignal) => Promise<void>;
 	/** Get session ID */
 	getSessionId?: () => string | null;
@@ -379,8 +381,6 @@ export interface ToolSession {
 	buildToolChoice?(toolName: string): ToolChoice | undefined;
 	/** Build a named tool-choice decision, preserving whether exact named forcing survived capability degradation. */
 	buildToolChoiceResult?(toolName: string): import("../utils/tool-choice").NamedToolChoiceResult;
-	/** Steer a hidden custom message into the conversation (e.g. a preview reminder). */
-	steer?(message: { customType: string; content: string; details?: unknown }): void;
 	/** Peek the currently in-flight tool-choice queue directive's invocation handler. Used by the `resolve` tool to dispatch to the pending action. */
 	peekQueueInvoker?(): ((input: unknown) => Promise<unknown> | unknown) | undefined;
 	/** Peek the long-lived "standing" resolve handler registered by a mode (e.g. plan mode).

package/src/tools/job.ts

@@ -3,7 +3,7 @@ import type { Component } from "@gajae-code/tui";
 import { Text } from "@gajae-code/tui";
 import { prompt } from "@gajae-code/utils";
 import * as z from "zod/v4";
-import { type AsyncJob, AsyncJobManager, isBackgroundJobSupportEnabled, jobElapsedMs } from "../async";
+import { type AsyncJob, AsyncJobManager, type FoldReason, isBackgroundJobSupportEnabled, jobElapsedMs } from "../async";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import jobDescription from "../prompts/tools/job.md" with { type: "text" };
@@ -50,6 +50,8 @@ interface JobSnapshot {
 	status: "running" | "completed" | "failed" | "cancelled";
 	label: string;
 	durationMs: number;
+	/** Present when the job was folded out of a foreground wait. */
+	foldReason?: FoldReason;
 	resultText?: string;
 	errorText?: string;
 }
@@ -344,6 +346,7 @@ export class JobTool implements AgentTool<typeof jobSchema, JobToolDetails> {
 				status: latest.status as JobSnapshot["status"],
 				label: latest.label,
 				durationMs: jobElapsedMs(latest, now),
+				...(current?.metadata?.foldReason ? { foldReason: current.metadata.foldReason } : {}),
 				...(latest.resultText ? { resultText: latest.resultText } : {}),
 				...(latest.errorText ? { errorText: latest.errorText } : {}),
 			};

package/src/tools/monitor.ts

@@ -229,19 +229,22 @@ export class MonitorTool implements AgentTool<typeof monitorSchema, MonitorToolD
 				);
 				pendingNotifications = MAX_PENDING_MONITOR_NOTIFICATIONS;
 			}
-			const sendPromise = this.session.sendCustomMessage?.(
-				{ customType: "task-notification", content, display: false, attribution: "agent", details },
-				{ triggerTurn: true, deliverAs: "followUp" },
-			);
-			if (sendPromise) {
-				void sendPromise.catch(error => {
+			if (!this.session.sendCustomMessage) {
+				logger.warn("Monitor task-notification dropped: session has no custom-message router", {
+					taskId: jobId,
+				});
+				return;
+			}
+			void this.session
+				.sendCustomMessage(
+					{ customType: "task-notification", content, display: false, attribution: "agent", details },
+					{ triggerTurn: true, deliverAs: "followUp" },
+				)
+				.catch(error => {
 					logger.warn("Monitor task-notification delivery failed", {
 						error: error instanceof Error ? error.message : String(error),
 					});
 				});
-			} else {
-				this.session.steer?.({ customType: "task-notification", content, details });
-			}
 		};
 		const schedulePersistentNotification = (line: string) => {
 			latestLine = line;

package/src/tools/resolve.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { ToolChoice } from "@gajae-code/ai/core";
 import type { Component } from "@gajae-code/tui";
 import { Text } from "@gajae-code/tui";
-import { prompt, untilAborted } from "@gajae-code/utils";
+import { logger, prompt, untilAborted } from "@gajae-code/utils";
 import * as z from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
@@ -66,15 +66,35 @@ export function queueResolveHandler(
 	const queue = session.getToolChoiceQueue?.();
 
 	const steerReminder = (): void => {
-		session.steer?.({
-			customType: "resolve-reminder",
-			content: [
-				"<system-reminder>",
-				"This is a preview. Call the `resolve` tool to apply or discard these changes.",
-				"</system-reminder>",
-			].join("\n"),
-			details: { toolName: options.sourceToolName },
-		});
+		if (!session.sendCustomMessage) {
+			// The reminder is a degraded model's only model-visible route back to the
+			// standing resolve handler; a missing router must be visible.
+			logger.warn("Resolve reminder dropped: session has no custom-message router", {
+				toolName: options.sourceToolName,
+			});
+			return;
+		}
+		void session
+			.sendCustomMessage(
+				{
+					customType: "resolve-reminder",
+					content: [
+						"<system-reminder>",
+						"This is a preview. Call the `resolve` tool to apply or discard these changes.",
+						"</system-reminder>",
+					].join("\n"),
+					display: false,
+					attribution: "agent",
+					details: { toolName: options.sourceToolName },
+				},
+				{ deliverAs: "steer" },
+			)
+			.catch(error => {
+				logger.warn("Resolve reminder delivery failed", {
+					toolName: options.sourceToolName,
+					error: error instanceof Error ? error.message : String(error),
+				});
+			});
 	};
 
 	// Re-evaluated on every push (including apply-error re-pushes) so a runtime

package/src/tools/tool-catalog.generated.ts

@@ -283,7 +283,7 @@ export const TOOL_CATALOG: Readonly<Record<string, ToolCatalogEntry>> = {
 	"ask": {
 		"name": "ask",
 		"label": "Ask",
-		"description": "Asks user when you need clarification or input during task execution.\n\n<conditions>\n- Multiple approaches exist with significantly different tradeoffs user should weigh\n</conditions>\n\n<instruction>\n- Use `recommended: <index>` to mark default (0-indexed); \" (Recommended)\" added automatically\n- Use `questions` for multiple related questions instead of asking one at a time\n- Set `multi: true` on question to allow multiple selections\n</instruction>\n\n<caution>\n- Provide 2-5 concise, distinct options\n</caution>\n\n<critical>\n- **Default to action.** Resolve ambiguity yourself using repo conventions, existing patterns, and reasonable defaults. Exhaust existing sources (code, configs, docs, history) before asking. Only ask when options have materially different tradeoffs the user must decide.\n- **If multiple choices are acceptable**, pick the most conservative/standard option and proceed; state the choice.\n- **Do NOT include \"Other\" option** — UI automatically adds \"Other (type your own)\" to every question.\n</critical>\n\n<examples>\n# Single question\nquestions: [{\"id\": \"auth_method\", \"question\": \"Which authentication method should this API use?\", \"options\": [{\"label\": \"JWT\"}, {\"label\": \"OAuth2\"}, {\"label\": \"Session cookies\"}], \"recommended\": 0}]\n\n# Multiple questions\nquestions: [{\"id\": \"storage_type\", \"question\": \"Which storage backend?\", \"options\": [{\"label\": \"SQLite\"}, {\"label\": \"PostgreSQL\"}]}, {\"id\": \"auth_method\", \"question\": \"Which auth method?\", \"options\": [{\"label\": \"JWT\"}, {\"label\": \"Session cookies\"}]}]\n</examples>",
+		"description": "Asks user when you need clarification or input during task execution.\n\n<conditions>\n- Multiple approaches exist with significantly different tradeoffs user should weigh\n</conditions>\n\n<instruction>\n- Use `recommended: <index>` to mark default (0-indexed); \" (Recommended)\" added automatically\n- Use `questions` for multiple related questions instead of asking one at a time\n- Set `multi: true` on question to allow multiple selections\n</instruction>\n\n<caution>\n- Provide 2-5 concise, distinct options\n</caution>\n\n<critical>\n- **Default to action.** Resolve ambiguity yourself using repo conventions, existing patterns, and reasonable defaults. Exhaust existing sources (code, configs, docs, history) before asking. Only ask when options have materially different tradeoffs the user must decide.\n- **If multiple choices are acceptable**, pick the most conservative/standard option and proceed; state the choice.\n- **Do NOT include the automatic custom-input control or labels that imitate it** such as \"Other (type your own)\", \"Other (specify)\", \"type your own\", \"custom input\", or \"직접 입력\" — UI automatically adds \"Other (type your own)\" to every question. A plain domain value such as \"Other\" is allowed when it is a genuine answer, not a request for free text. To collect free text, ask for it in the question body and rely on the automatic Other/custom-input control instead of adding a fake option.\n</critical>\n\n<examples>\n# Single question\nquestions: [{\"id\": \"auth_method\", \"question\": \"Which authentication method should this API use?\", \"options\": [{\"label\": \"JWT\"}, {\"label\": \"OAuth2\"}, {\"label\": \"Session cookies\"}], \"recommended\": 0}]\n\n# Multiple questions\nquestions: [{\"id\": \"storage_type\", \"question\": \"Which storage backend?\", \"options\": [{\"label\": \"SQLite\"}, {\"label\": \"PostgreSQL\"}]}, {\"id\": \"auth_method\", \"question\": \"Which auth method?\", \"options\": [{\"label\": \"JWT\"}, {\"label\": \"Session cookies\"}]}]\n</examples>",
 		"parameters": {
 			"type": "object",
 			"properties": {
@@ -2319,7 +2319,7 @@ export const TOOL_CATALOG: Readonly<Record<string, ToolCatalogEntry>> = {
 	"job": {
 		"name": "job",
 		"label": "Job",
-		"description": "Inspects, waits, or cancels async jobs.\n\nBackground job results are delivered automatically when complete. Jobs that back task subagents should be controlled via the `subagent` tool when it is available; use `job` for non-subagent jobs (async bash, monitors) and as a compatibility fallback. Running job output stays quiet by default to avoid flooding the conversation; use `tail` when you explicitly want to show/reopen retained output. Reach for this tool only when you need to inspect or intervene.\n\nIn the interactive TUI, a running foreground command can be folded into a background job by pressing the fold chord twice (default `Alt+Shift+B`, plus `Cmd+B` on macOS; remappable via `app.tool.backgroundFold`). This covers managed non-PTY bash, editor/ACP client-terminal commands, and PTY-mode commands. A folded job keeps its original deadline, is never killed or restarted by folding, and its result wakes a later turn automatically; a folded PTY continues output-only and no longer accepts input. `task`/`subagent` waits are not foldable. Raw shell `Ctrl+Z`/`bg` is not the supported path inside GJC because it bypasses job ownership and output-routing contracts.\n\n# Operations\n\n## `list: true`\nUse to inspect what's running.\n\n## `tail: [id, …]`\nShow the retained output buffer for one or more background jobs without waiting.\n- Use this to reopen/tail a backgrounded long-running bash/tool output after folding it away.\n- Output is bounded by the manager retention window; stale cursors may report that only the retained tail is available.\n- Prefer `tail` over polling when you only need to peek at progress, so the conversation can continue without flooding the TUI.\n\n## `poll: [id, …]`\nBlock until the specified jobs finish or the wait window (~30 s, not configurable) elapses.\n- Use when you are genuinely blocked on a result and have no other work to do.\n- Returns the current snapshot when the timer elapses; running jobs remain running.\n- Completed jobs include their final output in the returned snapshot.\n\n## `cancel: [id, …]`\nStop running jobs.\n- Use when a job is stalled, hung, or no longer needed.\n- Returns immediately after cancelling.",
+		"description": "Inspects, waits, or cancels async jobs.\n\nBackground job results are delivered automatically when complete. Jobs that back task subagents should be controlled via the `subagent` tool when it is available; use `job` for non-subagent jobs (async bash, monitors) and as a compatibility fallback. Running job output stays quiet by default to avoid flooding the conversation; use `tail` when you explicitly want to show/reopen retained output. Reach for this tool only when you need to inspect or intervene.\n\nIn the interactive TUI, a running foreground command can be folded into a background job by pressing the fold chord twice (default `Alt+Shift+B`, plus `Cmd+B` on macOS; remappable via `app.tool.backgroundFold`), or automatically when the user sends a steer after the command has run for at least 2 seconds (with `busyPromptMode=steer` and `toolInterruptPolicy=abort_tools`). This covers managed non-PTY bash, editor/ACP client-terminal commands, and PTY-mode commands. A folded job keeps its original deadline, is never killed or restarted by folding, and its result wakes a later turn automatically; a folded PTY continues output-only and no longer accepts input. Job listings expose `foldReason` (`steer`, `chord`, `timer`, or `sdk_control`) beside `backgrounded` so you can tell why a job left the foreground. `task`/`subagent` waits are not foldable. Raw shell `Ctrl+Z`/`bg` is not the supported path inside GJC because it bypasses job ownership and output-routing contracts.\n\n# Operations\n\n## `list: true`\nUse to inspect what's running.\n\n## `tail: [id, …]`\nShow the retained output buffer for one or more background jobs without waiting.\n- Use this to reopen/tail a backgrounded long-running bash/tool output after folding it away.\n- Output is bounded by the manager retention window; stale cursors may report that only the retained tail is available.\n- Prefer `tail` over polling when you only need to peek at progress, so the conversation can continue without flooding the TUI.\n\n## `poll: [id, …]`\nBlock until the specified jobs finish or the wait window (~30 s, not configurable) elapses.\n- Use when you are genuinely blocked on a result and have no other work to do.\n- Returns the current snapshot when the timer elapses; running jobs remain running.\n- Completed jobs include their final output in the returned snapshot.\n\n## `cancel: [id, …]`\nStop running jobs.\n- Use when a job is stalled, hung, or no longer needed.\n- Returns immediately after cancelling.",
 		"parameters": {
 			"type": "object",
 			"properties": {

package/src/utils/external-editor.ts

@@ -1,6 +1,7 @@
 /**
  * Utilities for launching an external text editor ($VISUAL / $EDITOR).
  */
+import { dlopen, FFIType, ptr } from "bun:ffi";
 import { spawn } from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
@@ -26,6 +27,71 @@ export function trimEditorTrailingNewline(text: string): string {
 	return text.replace(/\r?\n$/, "");
 }
 
+/**
+ * Native Windows editor executables must bypass cmd.exe. The shell wrapper
+ * reclaims the shared console input buffer while it waits for the editor,
+ * reopening the cooked-mode window that loses the first keystroke. Batch
+ * files still require a shell on Windows; ordinary executables do not.
+ */
+export function shouldUseExternalEditorShell(editor: string, platform: NodeJS.Platform = process.platform): boolean {
+	return platform === "win32" && /\.(?:cmd|bat)$/iu.test(editor);
+}
+
+/**
+ * On Windows the console input buffer is shared between the parent and the
+ * child. When the parent TUI stops it restores the console to cooked mode
+ * (ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT) and disables
+ * ENABLE_VIRTUAL_TERMINAL_INPUT. A child TUI such as Neovim then inherits
+ * that cooked state: the very next keystroke is line-buffered until an
+ * Enter flushes it — exactly the "first i is swallowed, Enter fixes it"
+ * symptom reported in #5224.
+ *
+ * Neovim (via libuv's uv_tty) re-enables raw VT input on startup, but the
+ * race window between the parent's restore and the child's init is enough
+ * to deterministically line-buffer the first typed keystroke when the child
+ * is spawned through `cmd.exe` (`shell: true`), because `cmd` itself keeps
+ * the console in cooked mode while it waits for the child.
+ *
+ * To make the handover symmetric:
+ *  - flush any pending console input left over from the parent (e.g. probe
+ *    reply fragments that were already read into the kernel buffer), and
+ *  - leave the console in raw VT mode (VT on, LINE/ECHO off) so the child
+ *    inherits an immediately-usable mode; the caller's `ui.start()` will
+ *    reconcile the mode again when the editor exits.
+ */
+const STD_INPUT_HANDLE = -10;
+const ENABLE_LINE_INPUT = 0x0002;
+const ENABLE_ECHO_INPUT = 0x0004;
+const ENABLE_WINDOW_INPUT = 0x0008;
+const ENABLE_VIRTUAL_TERMINAL_INPUT = 0x0200;
+
+function prepareWindowsConsoleForExternalEditor(): void {
+	if (process.platform !== "win32") return;
+	try {
+		const kernel32 = dlopen("kernel32.dll", {
+			GetStdHandle: { args: [FFIType.i32], returns: FFIType.ptr },
+			GetConsoleMode: { args: [FFIType.ptr, FFIType.ptr], returns: FFIType.bool },
+			SetConsoleMode: { args: [FFIType.ptr, FFIType.u32], returns: FFIType.bool },
+			FlushConsoleInputBuffer: { args: [FFIType.ptr], returns: FFIType.bool },
+		});
+		const handle = kernel32.symbols.GetStdHandle(STD_INPUT_HANDLE);
+		try {
+			kernel32.symbols.FlushConsoleInputBuffer(handle);
+		} catch {}
+		const mode = new Uint32Array(1);
+		const modePtr = ptr(mode);
+		if (modePtr && kernel32.symbols.GetConsoleMode(handle, modePtr)) {
+			const cur = mode[0]!;
+			const next =
+				(cur | ENABLE_VIRTUAL_TERMINAL_INPUT | ENABLE_WINDOW_INPUT) & ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
+			if (next !== cur) {
+				kernel32.symbols.SetConsoleMode(handle, next);
+			}
+		}
+		kernel32.close();
+	} catch {}
+}
+
 /**
  * Opens `content` in the user's external editor and returns the edited text.
  * Returns `null` if the editor exits with a non-zero code.
@@ -46,7 +112,12 @@ export async function openInEditor(
 		const [editor, ...editorArgs] = editorCmd.split(" ");
 		const stdio = options?.stdio ?? ["inherit", "inherit", "inherit"];
 
-		const child = spawn(editor, [...editorArgs, tmpFile], { stdio, shell: process.platform === "win32" });
+		prepareWindowsConsoleForExternalEditor();
+
+		const child = spawn(editor, [...editorArgs, tmpFile], {
+			stdio,
+			shell: shouldUseExternalEditorShell(editor),
+		});
 		const { promise, reject, resolve } = Promise.withResolvers<number>();
 		child.once("exit", (code, signal) => resolve(code ?? (signal ? -1 : 0)));
 		child.once("error", error => reject(error));