@gajae-code/coding-agent 0.15.5 → 0.16.0

package/src/modes/print-mode.ts

@@ -5,6 +5,7 @@
  * - `gjc -p "prompt"` - text output
  * - `gjc --mode json "prompt"` - JSON event stream
  */
+import type { AgentMessage } from "@gajae-code/agent-core";
 import { type AssistantMessage, type ImageContent, isContextOverflow } from "@gajae-code/ai/core";
 import { isKnownSinkPeerClosedError, logger, sanitizeText } from "@gajae-code/utils";
 import { loadSlashCommands } from "../extensibility/slash-commands";
@@ -46,6 +47,48 @@ export interface PrintModeOptions {
  */
 export const CONTEXT_OVERFLOW_EXIT_CODE = 78;
 
+const EMPTY_TURN_ERROR = {
+	code: "empty_response",
+	message: "Turn completed without assistant text.",
+} as const;
+
+export type PrintTerminalDisposition =
+	| { status: "success"; assistantText: true }
+	| { status: "failure"; error: typeof EMPTY_TURN_ERROR | { code: "assistant_error"; message: string } };
+
+function assistantText(message: AssistantMessage): string {
+	return message.content
+		.filter((content): content is { type: "text"; text: string } => content.type === "text")
+		.map(content => content.text)
+		.join("");
+}
+
+export function resolvePrintTerminalDisposition(
+	messages: readonly AgentMessage[],
+	submittedPrompt: boolean,
+	turnStartIndex?: number,
+): PrintTerminalDisposition | undefined {
+	if (!submittedPrompt) return undefined;
+	const turnMessages = turnStartIndex === undefined ? messages : messages.slice(turnStartIndex);
+	const lastAssistant = turnMessages.findLast((message): message is AssistantMessage => message.role === "assistant");
+	if (!lastAssistant) return { status: "failure", error: EMPTY_TURN_ERROR };
+	if (
+		(lastAssistant.stopReason === "error" || lastAssistant.stopReason === "aborted") &&
+		!isSilentAbort(lastAssistant.errorMessage)
+	) {
+		return {
+			status: "failure",
+			error: {
+				code: "assistant_error",
+				message: sanitizeText(lastAssistant.errorMessage || `Request ${lastAssistant.stopReason}`),
+			},
+		};
+	}
+	if (isSilentAbort(lastAssistant.errorMessage)) return undefined;
+	if (assistantText(lastAssistant).trim().length === 0) return { status: "failure", error: EMPTY_TURN_ERROR };
+	return { status: "success", assistantText: true };
+}
+
 /**
  * Build an actionable stderr diagnostic for a terminal context-overflow error in
  * text mode. The raw provider message is preserved (appended) for debugging, but
@@ -201,6 +244,8 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	let unsubscribe: (() => void) | undefined;
 	let submittedPrompt = false;
 	let consumedCommand = false;
+	let jsonFailureObserved = false;
+	let lastPromptMessageStart: number | undefined;
 
 	try {
 		for (const warning of new Set(session.configWarnings)) {
@@ -237,6 +282,14 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 		// when it must render the JSON event stream.
 		if (mode === "json") {
 			unsubscribe = session.subscribe(event => {
+				if (
+					event.type === "agent_failed" ||
+					(event.type === "message_end" &&
+						event.message.role === "assistant" &&
+						(event.message.stopReason === "error" || event.message.stopReason === "aborted"))
+				) {
+					jsonFailureObserved = true;
+				}
 				stdout.write(`${JSON.stringify(event)}\n`);
 			});
 		}
@@ -265,6 +318,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 				if (command !== false) text = command.prompt;
 			}
 			submittedPrompt = true;
+			lastPromptMessageStart = session.state.messages.length;
 			await session.prompt(text, images ? { images } : undefined);
 		};
 
@@ -277,6 +331,16 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 			await logger.time("print:prompt:next", () => submitInput(message));
 		}
 
+		const terminal = resolvePrintTerminalDisposition(session.state.messages, submittedPrompt, lastPromptMessageStart);
+		if (terminal?.status === "failure") {
+			if (!options.suppressProcessExit) process.exitCode = 1;
+			if (mode === "json" && !jsonFailureObserved) {
+				stdout.write(`${JSON.stringify({ type: "agent_failed", error: terminal.error })}\n`);
+			} else if (mode === "text" && terminal.error.code === EMPTY_TURN_ERROR.code) {
+				await writeStderrAndQuiesce(`${terminal.error.message}\n`);
+			}
+		}
+
 		// In text mode, output final response.
 		if (mode === "text" && (!consumedCommand || submittedPrompt)) {
 			const lastMessage = session.state.messages.findLast(message => message.role === "assistant");

package/src/modes/runtime-init.ts

@@ -343,7 +343,7 @@ export async function initializeExtensions(session: AgentSession, options: Initi
 						return { retried: true, immediate: true };
 					}
 					case "bash.background": {
-						if (!session.requestForegroundBashBackground())
+						if (!(await session.requestForegroundBashBackground()))
 							throw Object.assign(
 								new Error("The active bash command cannot be moved to a managed background job."),
 								{ code: "not_foldable" },

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/injected-user-submission.ts

@@ -17,7 +17,11 @@ import type { InteractiveModeContext } from "../types";
  * (unhandled rejection → resident crash).
  */
 export function extensionUserMessageContentError(content: string | (TextContent | ImageContent)[]): Error | undefined {
-	if (typeof content === "string") return undefined;
+	if (typeof content === "string") {
+		if (content.trim().length === 0)
+			return Object.assign(new Error("Prompt must not be empty."), { code: "invalid_input" });
+		return undefined;
+	}
 	if (!Array.isArray(content)) {
 		return Object.assign(new Error("sendUserMessage requires string or content-array content."), {
 			code: "invalid_input",
@@ -30,6 +34,16 @@ export function extensionUserMessageContentError(content: string | (TextContent
 			});
 		}
 	}
+	const text = content
+		.filter((part): part is TextContent => part.type === "text")
+		.map(part => part.text)
+		.join("\n");
+	const hasUsableImage = content.some(
+		(part): part is ImageContent =>
+			part.type === "image" && typeof part.data === "string" && part.data.trim().length > 0,
+	);
+	if (text.trim().length === 0 && !hasUsableImage)
+		return Object.assign(new Error("Prompt must not be empty."), { code: "invalid_input" });
 	return undefined;
 }
 export function normalizeInjectedUserContent(content: string | (TextContent | ImageContent)[]): {

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/bash.md

@@ -16,8 +16,8 @@ Executes bash command in shell session for terminal operations like git, bun, ca
 {{#if asyncEnabled}}
 - Use `async: true` for long-running commands when you don't need immediate output; the call returns a background job ID and the result is delivered automatically as a follow-up.
 {{/if}}
-{{#if autoBackgroundEnabled}}
-- In the interactive TUI, the user can press `Ctrl+B` twice while a supported managed foreground bash command is still running to fold it into a quiet background job. Do not instruct users to use raw shell `Ctrl+Z`/`bg` inside the GJC TUI; ownership and output routing are not safe there.
+{{#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.
 {{/if}}
 </instruction>
 {{#if restrictedAllowedPrefixes}}

package/src/prompts/tools/fold-receipt.md

@@ -0,0 +1,3 @@
+This result came from a folded {{kind}} wait (job {{jobId}}).
+Output reference: {{outputInstruction}}
+{{cwdNotice}}{{intentNotice}}

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, supported managed foreground bash can be folded into a background job by pressing `Ctrl+B` twice while it is running. 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`). 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.
 
 # Operations
 

package/src/sdk/acp/adapter.ts

@@ -9,7 +9,11 @@ import {
 	type SessionReconcileUncertainTarget,
 	validateSessionReconcileUncertainTarget,
 } from "../lifecycle/service";
-import { validateAdapterControl, validateAdapterSecretFields } from "../protocol/adapter-validation";
+import {
+	validateAdapterControl,
+	validateAdapterSecretFields,
+	validateRequiredPromptText,
+} from "../protocol/adapter-validation";
 import { OPERATIONS } from "../protocol/operation-registry";
 import { type SessionAttachment, type SessionRouter, SessionRouterError } from "../router";
 import { ACP_SESSION_RECONNECT, SESSION_ABORT_TIMEOUT_MS } from "../session-reconnect";
@@ -343,7 +347,18 @@ export class AcpSdkAdapter {
 	}
 
 	async prompt(params: JsonObject | string): Promise<unknown> {
-		const text = typeof params === "string" ? params : String(params.prompt ?? params.text ?? "");
+		const rawText =
+			typeof params === "string"
+				? params
+				: params !== null && typeof params === "object"
+					? (params.prompt ?? params.text)
+					: undefined;
+		const text = typeof rawText === "string" ? rawText : "";
+		const invalid = validateRequiredPromptText("turn.prompt", {
+			text,
+			...(typeof params === "object" && Array.isArray(params.images) ? { images: params.images } : {}),
+		});
+		if (invalid) throw new AcpSdkAdapterError(invalid.code, invalid.message);
 		return await this.#requestSession({
 			type: "control_request",
 			operation: "turn.prompt",