@gajae-code/coding-agent 0.15.6 → 0.16.1

package/src/modes/runtime-init.ts

@@ -18,6 +18,7 @@ import {
 	syntheticNamespaceCollision,
 } from "../sdk/model-profile-model";
 import type { AgentSession } from "../session/agent-session";
+import { bashBackgroundControlError } from "../session/fold-coordinator";
 import { parseThinkingLevel } from "../thinking";
 import type { TodoPhase } from "../tools/todo-write";
 
@@ -68,8 +69,12 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 	runner.initialize(
 		// ExtensionActions
 		{
+			// Extension sends are INDEPENDENT producers, never continuations of the
+			// current turn: the trusted adapter classifies them so a terminal abort
+			// preserves them instead of dropping them as turn-owned work. Extensions
+			// never supply this bit themselves.
 			sendMessage: (message, sendOptions) => {
-				session.sendCustomMessage(message, sendOptions).catch(e => {
+				session.sendCustomMessage(message, { ...sendOptions, origin: "external" }).catch(e => {
 					reportSendError("extension_send", e instanceof Error ? e : new Error(String(e)));
 				});
 			},
@@ -154,8 +159,8 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 					session.setFollowUpMode(mode);
 					return true;
 				}
-				if (kind === "interrupt" && (mode === "immediate" || mode === "wait")) {
-					session.setInterruptMode(mode);
+				if (kind === "tool_interrupt" && (mode === "abort_tools" || mode === "finish_tools")) {
+					session.setToolInterruptPolicy(mode);
 					return true;
 				}
 				return false;
@@ -195,6 +200,7 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 				return { bytes: new Uint8Array(await file.slice(start, end).arrayBuffer()), totalBytes: file.size };
 			},
 			getJobs: () => session.getAsyncJobSnapshot(),
+			onJobFold: listener => session.onJobFold(listener),
 			setSdkPermissionProvider: provider => session.setSdkPermissionProvider(provider),
 			setSdkClientBridge: bridge => session.setClientBridge(bridge),
 			sdkControl: async (operation, input) => {
@@ -343,12 +349,9 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 						return { retried: true, immediate: true };
 					}
 					case "bash.background": {
-						if (!(await session.requestForegroundBashBackground()))
-							throw Object.assign(
-								new Error("The active bash command cannot be moved to a managed background job."),
-								{ code: "not_foldable" },
-							);
-						return { backgrounded: true };
+						const outcome = await session.requestForegroundBashBackgroundOutcome("sdk_control");
+						if (outcome.status !== "folded") throw bashBackgroundControlError(outcome);
+						return { backgrounded: true, jobId: outcome.jobId };
 					}
 					case "compaction.auto.set":
 						session.setAutoCompactionEnabled(input.on === true);

package/src/modes/theme/theme.ts

@@ -136,6 +136,7 @@ export type SymbolKey =
 	| "icon.output"
 	| "icon.host"
 	| "icon.session"
+	| "icon.star"
 	| "icon.package"
 	| "icon.warning"
 	| "icon.rewind"
@@ -300,6 +301,7 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"icon.output": "⤴",
 	"icon.host": "🖥",
 	"icon.session": "🆔",
+	"icon.star": "★",
 	"icon.package": "📦",
 	"icon.warning": "⚠",
 	"icon.rewind": "↶",
@@ -534,6 +536,7 @@ const NERD_SYMBOLS: SymbolMap = {
 	"icon.host": "\uf109",
 	// pick:  | alt:  
 	"icon.session": "\uf550",
+	"icon.star": "\uf005",
 	// pick:  | alt: 
 	"icon.package": "\uf487",
 	// pick:  | alt:  
@@ -722,6 +725,7 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"icon.output": "out:",
 	"icon.host": "host",
 	"icon.session": "id",
+	"icon.star": "*",
 	"icon.package": "[P]",
 	"icon.warning": "[!]",
 	"icon.rewind": "<-",
@@ -1496,6 +1500,7 @@ export class Theme {
 			output: this.#symbols["icon.output"],
 			host: this.#symbols["icon.host"],
 			session: this.#symbols["icon.session"],
+			star: this.#symbols["icon.star"],
 			package: this.#symbols["icon.package"],
 			warning: this.#symbols["icon.warning"],
 			rewind: this.#symbols["icon.rewind"],

package/src/modes/types.ts

@@ -41,6 +41,8 @@ export type CompactionQueuedMessage = {
 	text: string;
 	mode: "steer" | "followUp";
 	followUpQueuePolicy?: "sequential";
+	/** Composer steers stay one per poll even under `steeringMode: "all"`. */
+	steerQueuePolicy?: "sequential";
 };
 
 export type SubmittedUserInput = {

package/src/modes/ui-language.ts

@@ -1,4 +1,4 @@
-export const UI_LANGUAGES = ["en", "ko", "ja"] as const;
+export const UI_LANGUAGES = ["en", "ko", "zh", "ja"] as const;
 
 export type UiLanguage = (typeof UI_LANGUAGES)[number];
 
@@ -23,6 +23,7 @@ const ENGLISH_STRINGS = {
 	"settings.language.description": "Language for human-facing interactive UI text",
 	"settings.language.english": "English",
 	"settings.language.korean": "Korean (한국어)",
+	"settings.language.chinese": "Chinese (简体中文)",
 	"settings.language.japanese": "Japanese (日本語)",
 	"language.current": "Current UI language:",
 	"language.changed": "UI language changed to",
@@ -52,6 +53,7 @@ const KOREAN_STRINGS: Record<UiStringKey, string> = {
 	"settings.language.description": "사람이 읽는 대화형 UI 텍스트의 언어",
 	"settings.language.english": "English",
 	"settings.language.korean": "한국어",
+	"settings.language.chinese": "简体中文",
 	"settings.language.japanese": "日本語",
 	"language.current": "현재 UI 언어:",
 	"language.changed": "UI 언어를 다음으로 변경했습니다:",
@@ -79,21 +81,61 @@ const JAPANESE_STRINGS: Record<UiStringKey, string> = {
 	"settings.language.description": "対話型 UI テキストに使う言語",
 	"settings.language.english": "English",
 	"settings.language.korean": "한국어",
+	"settings.language.chinese": "简体中文",
 	"settings.language.japanese": "日本語",
 	"language.current": "現在の UI 言語:",
 	"language.changed": "UI 言語を次に変更しました:",
 	"language.unknown": "不明な言語",
 };
 
+const CHINESE_STRINGS: Record<UiStringKey, string> = {
+	"settings.title": "设置",
+	"settings.navigationHint": "（按 Tab 切换）",
+	"settings.selectHint": "  Enter：选择 · Esc：返回",
+	"settings.preview": "预览：",
+	"settings.tab.appearance": "外观",
+	"settings.tab.model": "模型",
+	"settings.tab.interaction": "交互",
+	"settings.tab.context": "上下文",
+	"settings.tab.memory": "记忆",
+	"settings.tab.editing": "编辑",
+	"settings.tab.tools": "工具",
+	"settings.tab.tasks": "任务",
+	"settings.tab.providers": "提供商",
+	"settings.tab.notifications": "通知",
+	"settings.tab.plugins": "插件",
+	"settings.tab.gjcBundles": "GJC 捆绑包",
+	"settings.language.label": "语言",
+	"settings.language.description": "面向用户的交互式界面文字所使用的语言",
+	"settings.language.english": "English",
+	"settings.language.korean": "한국어",
+	"settings.language.chinese": "简体中文",
+	"settings.language.japanese": "日本語",
+	"language.current": "当前界面语言：",
+	"language.changed": "界面语言已更改为",
+	"language.unknown": "未知语言",
+};
+
 const STRINGS: Record<UiLanguage, Record<UiStringKey, string>> = {
 	en: ENGLISH_STRINGS,
 	ko: KOREAN_STRINGS,
+	zh: CHINESE_STRINGS,
 	ja: JAPANESE_STRINGS,
 };
 
 /** User selection is authoritative; invalid or unavailable values deterministically fall back to English. */
 export function resolveUiLanguage(value: unknown): UiLanguage {
-	return value === "ko" || value === "ja" ? value : "en";
+	return value === "ko" || value === "zh" || value === "ja" ? value : "en";
+}
+
+/** Resolve explicit startup preference without allowing an invalid value to block startup. */
+export function resolveExplicitUiLanguage(
+	configuredValue: unknown,
+	environmentValue: string | undefined,
+): { language: UiLanguage; hasPreference: boolean } {
+	if (configuredValue !== undefined) return { language: resolveUiLanguage(configuredValue), hasPreference: true };
+	if (environmentValue === undefined) return { language: "en", hasPreference: false };
+	return { language: parseUiLanguage(environmentValue) ?? "en", hasPreference: true };
 }
 
 export function uiString(language: unknown, key: UiStringKey): string {
@@ -104,6 +146,7 @@ export function uiString(language: unknown, key: UiStringKey): string {
 export const UI_LANGUAGE_LABELS: Record<UiLanguage, string> = {
 	en: "English",
 	ko: "한국어",
+	zh: "简体中文",
 	ja: "日本語",
 };
 
@@ -117,6 +160,10 @@ const UI_LANGUAGE_ALIASES: Readonly<Record<string, UiLanguage>> = {
 	kor: "ko",
 	korean: "ko",
 	한국어: "ko",
+	zh: "zh",
+	中文: "zh",
+	简体中文: "zh",
+	chinese: "zh",
 	ja: "ja",
 	jp: "ja",
 	jpn: "ja",

package/src/modes/utils/ui-helpers.ts

@@ -1091,6 +1091,11 @@ export class UiHelpers {
 
 	queueCompactionMessage(text: string, mode: "steer" | "followUp", options?: ComposerSubmissionOptions): void {
 		const entry: CompactionQueuedMessage = { text, mode };
+		// A composer steer keeps the same one-per-poll delivery it would have had
+		// without compaction: the mark has to survive the park/replay round trip.
+		if (mode === "steer") {
+			entry.steerQueuePolicy = "sequential";
+		}
 		if (mode === "followUp") {
 			entry.followUpQueuePolicy = "sequential";
 		}
@@ -1115,6 +1120,11 @@ export class UiHelpers {
 		return message.followUpQueuePolicy ?? "sequential";
 	}
 
+	#compactionSteerQueuePolicy(message: CompactionQueuedMessage): "sequential" | undefined {
+		if (message.mode !== "steer") return undefined;
+		return message.steerQueuePolicy ?? "sequential";
+	}
+
 	async #deliverQueuedSkillMessage(message: CompactionQueuedMessage): Promise<boolean> {
 		const invocations = parseSkillInvocations(message.text, this.ctx.skillCommands ?? new Map());
 		if (invocations.length === 0) {
@@ -1163,7 +1173,10 @@ export class UiHelpers {
 							streamingBehavior: message.mode,
 							followUpQueuePolicy: this.#compactionFollowUpQueuePolicy(message),
 						}
-					: { streamingBehavior: message.mode };
+					: {
+							streamingBehavior: message.mode,
+							steerQueuePolicy: this.#compactionSteerQueuePolicy(message),
+						};
 			await this.ctx.session.promptCustomMessage(
 				{
 					customType: SKILL_PROMPT_MESSAGE_TYPE,
@@ -1196,7 +1209,10 @@ export class UiHelpers {
 				? this.ctx.session.followUp(message.text, undefined, {
 						followUpQueuePolicy: this.#compactionFollowUpQueuePolicy(message),
 					})
-				: this.ctx.session.steer(message.text),
+				: this.ctx.session.prompt(message.text, {
+						streamingBehavior: "steer",
+						steerQueuePolicy: this.#compactionSteerQueuePolicy(message),
+					}),
 		);
 	}
 
@@ -1310,7 +1326,10 @@ export class UiHelpers {
 							streamingBehavior: "followUp" as const,
 							followUpQueuePolicy: this.#compactionFollowUpQueuePolicy(firstPrompt),
 						}
-					: { streamingBehavior: "steer" as const };
+					: {
+							streamingBehavior: "steer" as const,
+							steerQueuePolicy: this.#compactionSteerQueuePolicy(firstPrompt),
+						};
 			const promptPromise = this.ctx.session.prompt(firstPrompt.text, firstPromptOptions).catch((error: unknown) => {
 				disposeFirstPrompt();
 				restoreQueue(error);

package/src/prompts/agent-fragments/browser-aside.md

@@ -0,0 +1,22 @@
+<browser-backend>
+Browser backend: Aside direct CLI. The built-in Puppeteer browser tool is disabled by configuration (`browser.backend: aside`). NEVER use or register an MCP browser server.
+
+Routing:
+- Every task that requires a rendered page, authenticated/private browser state, live tabs, browser UI, screenshots, downloads behind cookies, history, saved credentials, or profile data MUST use Bash to invoke the installed Aside CLI.
+- Default to `aside repl '<JavaScript>'` for deterministic Playwright inspection and actions, even when the answer is unknown but the procedure is discoverable from `snapshot(page, { interactive: true })`.
+- Use `aside exec '<prompt>'` only for runtime judgment, source-heavy research, browser-history search, MFA or opaque password autofill, approval/notification waits, long monitoring, multi-site synthesis, routines, or work worth a second model. Continue with `aside exec --session <id> '<follow-up>'`. Use `--account`, `--model`, `--provider`, `--speed`, or `--effort` only when the task requires overriding user defaults.
+- Cookie-free public HTTP content that does not require rendered or authenticated browser state may use GJC `read` directly.
+
+Deterministic procedure:
+- Each non-interactive `aside repl '<code>'` shell invocation starts from neutral local JavaScript scope: make it self-contained and do not depend on variables declared in an earlier invocation.
+- Call `listBrowserTabs()`, select by URL/title, `attachBrowserTab(targetId)`, then verify `page.url()` and `await page.title()` before reading or acting. Use `attachActiveBrowserTab()` only when active-tab authority is intentional; use `openTab()` only when no relevant tab exists.
+- Print results with `console.log`; returned and final-expression values are not emitted. Use `snapshot(page, { interactive: true })` before acting, prefer locators/refs, and verify every meaningful action with a fresh URL/title, snapshot diff, screenshot, or file path.
+- Use authenticated `fetch` for cookie-bearing downloads. Prefer dedicated integrations for Gmail, Google Docs/Sheets, YouTube, search, social, PDF, and Office files over manual UI automation.
+- Use `chrome.*` only for task-scoped tabs/windows/bookmarks/tab-groups/history/downloads/top-sites profile operations. Use `cua.*` only when DOM semantics cannot control canvas or visual UI; screenshot before and verify after. Use `captcha.*` only in an authorized user-owned session where automation is permitted.
+
+Safety:
+- Aside controls a live authenticated profile. Never print cookies, authorization headers, passwords, OTPs, card values, recovery material, signed URLs, raw task transcripts, private profile paths, or broad inbox/contact/history/session collections.
+- Read, inspect, draft, and preview by default. Sending/posting, accepting invitations, payments/purchases/subscriptions, credential saves, document edits, downloads to an external destination, settings/session/routine/channel changes, and destructive profile operations require explicit user intent for the exact target. Stop before the final side effect when authorization is ambiguous.
+- Permission rules (`allow`, `ask`, `deny`), password access policy, target origin, and file/network/download boundaries remain authoritative and must never be bypassed.
+- Load the installed GJC `aside` skill before a browser job when available; it contains the complete official API inventory and scenario matrix. Never claim browser work ran without the Aside CLI result and verified state.
+</browser-backend>

package/src/prompts/system/master-mode.md

@@ -0,0 +1,28 @@
+# Master Mode
+
+You are running as a GJC master session. You coordinate peer GJC sessions through the local Broker; you never control them directly.
+
+## Discovery and scope
+
+- Your launch scope (`repo`, `pwd`, or `global`) bounds which peers you see. Every search result states its requested and resolved scope; trust that envelope, never assume wider visibility.
+- Use `gjc sdk search [--scope repo|pwd|global] [--json]` for explicit scope-filtered discovery. Rows carry index live evidence plus a bounded probe verdict (`reachable`, `unreachable`, `stale`).
+- A `not-in-git-worktree` result is a successful empty answer for `repo` scope outside a Git worktree; it never falls back to another scope.
+- The one-time `<gjc-master-peer-snapshot>` block in your first request is a startup observation, not a live view; re-run `gjc sdk search` before acting on peers.
+
+## Peer orchestration
+
+- All peer control is broker-routed and best effort: inspect, status, send, tail, steer, and interrupt through the `gjc sdk session` commands. Pre-existing peers owe you nothing; treat them as independent owners.
+- Read-only first: inspect and observe a peer before sending steering or interrupts.
+- Never steer a peer while its user is mid-turn; wait for the peer to be idle or explicitly awaiting input.
+- Do not invent locks, reservations, or exclusive claims over peers; no such mechanism exists, and pretending otherwise corrupts coordination.
+
+## Spawning children
+
+- `gjc sdk spawn --cwd <dir> --prompt <task> [--model <selector>] [--profile <name>] [--idempotency-key <key>]` creates one task-seeded background child through the Broker. It is legal only inside this interactive master session.
+- One idempotency identity produces at most one child and one seed prompt. Reuse of the same key replays the stored outcome; a semantically new task requires a new invocation.
+- Spawn responses carry only safe facts (claim, child session id, substrate kind, seed phase/status). `spawn_in_progress` and `terminal_uncertain` are honest states: never retry them blindly; inspect with `gjc sdk search` / session status instead. For `uncertain_after_send`, repeat the same spawn invocation with its reported `--idempotency-key` to join the original claim rather than create another child.
+
+## Delegation discipline
+
+- Give each spawned child one bounded task with explicit acceptance criteria in the seed prompt; monitor via broker-routed status/tail and aggregate results yourself.
+- Clean up children you created with `gjc sdk session raw global --op session.close --json-input '{"sessionId":"<id>"}' --idempotency-key <key>` when their work is integrated. Orphaned children are reaped automatically after the configured grace period, but explicit close is the polite default.

package/src/prompts/tools/ask.md

@@ -17,7 +17,7 @@ Asks user when you need clarification or input during task execution.
 <critical>
 - **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.
 - **If multiple choices are acceptable**, pick the most conservative/standard option and proceed; state the choice.
-- **Do NOT include "Other" option** — UI automatically adds "Other (type your own)" to every question.
+- **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.
 </critical>
 
 <examples>

package/src/prompts/tools/bash.md

@@ -18,6 +18,7 @@ Executes bash command in shell session for terminal operations like git, bun, ca
 {{/if}}
 {{#if foregroundFoldEnabled}}
 - In the interactive TUI, the user can press the fold chord twice (default `Alt+Shift+B`, plus `Cmd+B` on macOS; remappable via the `app.tool.backgroundFold` keybinding) while a foreground command is still running to fold it into a background job. All three command surfaces fold: managed non-PTY bash, editor/ACP client-terminal commands, and PTY-mode commands. A folded command keeps its original timeout and is never killed or restarted by folding; a folded PTY continues output-only, so it stops accepting input. The turn then ends cleanly and a later turn resumes automatically with the command's result, so the interrupted task is finished rather than abandoned. `task`/`subagent` waits are deliberately NOT foldable. Do not instruct users to use raw shell `Ctrl+Z`/`bg` inside the GJC TUI; ownership and output routing are not safe there.
+- A user steer folds the same way: when the user sends a message while a foreground command has already run for at least 2 seconds, the command is folded into a background job and this call returns the background-start result plus the line `Folded into background job <id> because a user steer arrived; the command keeps running with its original timeout and its result will wake a later turn.` The steer is then delivered at this tool boundary, so handle it next; do not re-run the folded command. Steers that arrive within the first 2 seconds let the command finish normally. This applies only while `busyPromptMode` is `steer` and `toolInterruptPolicy` is `abort_tools`.
 {{/if}}
 </instruction>
 {{#if restrictedAllowedPrefixes}}

package/src/prompts/tools/job.md

@@ -2,7 +2,7 @@ Inspects, waits, or cancels async jobs.
 
 Background 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.
 
-In 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.
+In 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.
 
 # Operations
 

package/src/sdk/acp/adapter.ts

@@ -91,6 +91,11 @@ const ACP_MCP_PRESERVED_LAUNCH_CODES = new Set([
 	"startup_admission_timeout",
 	"ready_then_exited",
 	"endpoint_unreadable",
+	"worktree_preparation_timeout",
+	"dependency_preparation_timeout",
+	"readiness_timeout",
+	"spawn_failed",
+	"worktree_in_use",
 ]);
 
 /**