@gajae-code/coding-agent 0.4.3 → 0.4.5

package/src/main.ts

@@ -33,7 +33,7 @@ import { getDefault, type SettingPath, Settings, settings } from "./config/setti
 import { initializeWithSettings } from "./discovery";
 import { exportFromFile } from "./export/html";
 import type { ExtensionUIContext } from "./extensibility/extensions/types";
-import { InteractiveMode, runAcpMode, runBridgeMode, runPrintMode, runRpcMode } from "./modes";
+import type { InteractiveMode } from "./modes/interactive-mode";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
 import type { SubmittedUserInput } from "./modes/types";
 import type { MCPManager } from "./runtime-mcp";
@@ -304,6 +304,7 @@ async function runInteractiveMode(
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 ): Promise<void> {
+	const { InteractiveMode } = await import("./modes/interactive-mode");
 	const mode = new InteractiveMode(
 		session,
 		version,
@@ -706,7 +707,7 @@ async function buildSessionOptions(
 interface RunRootCommandDependencies {
 	createAgentSession?: typeof createAgentSession;
 	discoverAuthStorage?: typeof discoverAuthStorage;
-	runAcpMode?: typeof runAcpMode;
+	runAcpMode?: (createSession: AcpSessionFactory) => Promise<void>;
 	settings?: Settings;
 }
 
@@ -927,7 +928,7 @@ export async function runRootCommand(
 			rawArgs,
 			createSession,
 		});
-		await (deps.runAcpMode ?? runAcpMode)(createAcpSession);
+		await (deps.runAcpMode ?? (await import("./modes/acp")).runAcpMode)(createAcpSession);
 	} else {
 		const { session, setToolUIContext, modelFallbackMessage, lspServers, mcpManager, eventBus } =
 			await createSession(sessionOptions);
@@ -973,8 +974,10 @@ export async function runRootCommand(
 		}
 
 		if (mode === "rpc" || mode === "rpc-ui") {
+			const { runRpcMode } = await import("./modes/rpc/rpc-mode");
 			await runRpcMode(session, mode === "rpc-ui" ? setToolUIContext : undefined);
 		} else if (mode === "bridge") {
+			const { runBridgeMode } = await import("./modes/bridge/bridge-mode");
 			await runBridgeMode(session, setToolUIContext);
 		} else if (isInteractive) {
 			const versionCheckPromise = checkForNewVersion(VERSION).catch(() => undefined);
@@ -1014,6 +1017,7 @@ export async function runRootCommand(
 				initialImages,
 			);
 		} else {
+			const { runPrintMode } = await import("./modes/print-mode");
 			await runPrintMode(session, {
 				mode,
 				messages: parsedArgs.messages,

package/src/modes/components/hook-selector.ts

@@ -4,6 +4,7 @@
  */
 import {
 	Container,
+	Editor,
 	Markdown,
 	matchesKey,
 	padding,
@@ -16,8 +17,13 @@ import {
 	visibleWidth,
 	wrapTextWithAnsi,
 } from "@gajae-code/tui";
-import { getMarkdownTheme, theme } from "../../modes/theme/theme";
-import { matchesAppExternalEditor, matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
+import { getEditorTheme, getMarkdownTheme, theme } from "../../modes/theme/theme";
+import {
+	matchesAppExternalEditor,
+	matchesAppInterrupt,
+	matchesSelectCancel,
+} from "../../modes/utils/keybinding-matchers";
+import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -56,6 +62,17 @@ export interface HookSelectorOptions {
 	 */
 	wrapFocused?: boolean;
 	scrollTitleRows?: number;
+	/**
+	 * Inline free-text entry for the option with this label (e.g. the ask
+	 * tool's "Other (type your own)"). Selecting it keeps the title and option
+	 * list on screen and opens a prompt-style editor below the list instead of
+	 * replacing the whole selector. Enter submits via `onSubmit`; Escape
+	 * returns to option selection.
+	 */
+	customInput?: {
+		optionLabel: string;
+		onSubmit: (text: string) => void;
+	};
 }
 
 class OutlinedList extends Container {
@@ -297,6 +314,12 @@ export class HookSelectorComponent extends Container {
 	#wrapFocused: boolean;
 	#outline: boolean;
 	#scrollTitleRows: number | undefined;
+	#customInput: { optionLabel: string; onSubmit: (text: string) => void } | undefined;
+	#inputArea: Container;
+	#inlineEditor: Editor | undefined;
+	#helpTextComponent: Text;
+	#baseHelpText: string;
+	#tui: TUI | undefined;
 	constructor(
 		title: string,
 		options: string[],
@@ -317,6 +340,8 @@ export class HookSelectorComponent extends Container {
 		this.#onExternalEditorCallback = opts?.onExternalEditor;
 		this.#wrapFocused = opts?.wrapFocused === true;
 		this.#outline = opts?.outline === true;
+		this.#customInput = opts?.customInput;
+		this.#tui = opts?.tui;
 
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
@@ -364,9 +389,12 @@ export class HookSelectorComponent extends Container {
 			this.#listContainer = new Container();
 			this.addChild(this.#listContainer);
 		}
+		this.#inputArea = new Container();
+		this.addChild(this.#inputArea);
 		this.addChild(new Spacer(1));
-		const controlsHint = opts?.helpText ?? "up/down navigate  enter select  esc cancel";
-		this.addChild(new Text(theme.fg("dim", controlsHint), 1, 0));
+		this.#baseHelpText = opts?.helpText ?? "up/down navigate  enter select  esc cancel";
+		this.#helpTextComponent = new Text(theme.fg("dim", this.#baseHelpText), 1, 0);
+		this.addChild(this.#helpTextComponent);
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
 
@@ -432,6 +460,10 @@ export class HookSelectorComponent extends Container {
 			this.#scrollableTitle?.scrollBy(this.#scrollTitleRows);
 			return;
 		}
+		if (this.#inlineEditor) {
+			this.#handleInputModeKey(keyData, this.#inlineEditor);
+			return;
+		}
 		if (matchesKey(keyData, "up") || keyData === "k") {
 			this.#selectedIndex = Math.max(0, this.#selectedIndex - 1);
 			this.#updateList();
@@ -440,7 +472,12 @@ export class HookSelectorComponent extends Container {
 			this.#updateList();
 		} else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.#options[this.#selectedIndex];
-			if (selected) this.#onSelectCallback(selected);
+			if (!selected) return;
+			if (this.#customInput && selected === this.#customInput.optionLabel) {
+				this.#enterInputMode();
+				return;
+			}
+			this.#onSelectCallback(selected);
 		} else if (matchesKey(keyData, "left")) {
 			this.#onLeftCallback?.();
 		} else if (matchesKey(keyData, "right")) {
@@ -452,6 +489,73 @@ export class HookSelectorComponent extends Container {
 		}
 	}
 
+	/** Keys while the inline custom-input editor is open below the option list. */
+	#handleInputModeKey(keyData: string, editor: Editor): void {
+		// Escape backs out to option selection instead of cancelling the dialog,
+		// so a stray Esc never throws away the question context.
+		if (matchesKey(keyData, "escape") || matchesAppInterrupt(keyData)) {
+			this.#exitInputMode();
+			return;
+		}
+		if (matchesAppExternalEditor(keyData)) {
+			void this.#openExternalEditor(editor);
+			return;
+		}
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return")) {
+			this.#customInput?.onSubmit(editor.getText());
+			return;
+		}
+		editor.handleInput(keyData);
+	}
+
+	#enterInputMode(): void {
+		if (this.#inlineEditor) return;
+		// Stop the auto-select countdown for good: the user is actively typing,
+		// matching the old behavior where the separate editor had no timeout.
+		if (this.#countdown) {
+			this.#countdown.dispose();
+			this.#countdown = undefined;
+			this.#titleComponent.setText(this.#baseTitle);
+		}
+		const editor = new Editor(getEditorTheme());
+		editor.setBorderVisible(false);
+		editor.setPromptGutter("> ");
+		editor.disableSubmit = true;
+		this.#inlineEditor = editor;
+		this.#inputArea.addChild(new Spacer(1));
+		this.#inputArea.addChild(editor);
+		const scrollHint = this.#scrollTitleRows === undefined ? "" : "  wheel/PgUp/PgDn scroll question";
+		this.#helpTextComponent.setText(
+			theme.fg("dim", `enter submit  esc back to options  ctrl+g external editor${scrollHint}`),
+		);
+		this.invalidate();
+	}
+
+	#exitInputMode(): void {
+		if (!this.#inlineEditor) return;
+		this.#inlineEditor = undefined;
+		this.#inputArea.clear();
+		this.#helpTextComponent.setText(theme.fg("dim", this.#baseHelpText));
+		this.invalidate();
+	}
+
+	async #openExternalEditor(editor: Editor): Promise<void> {
+		const editorCmd = getEditorCommand();
+		if (!editorCmd || !this.#tui) return;
+
+		const currentText = editor.getExpandedText();
+		try {
+			this.#tui.stop();
+			const result = await openInEditor(editorCmd, currentText);
+			if (result !== null) {
+				editor.setText(result);
+			}
+		} finally {
+			this.#tui.start();
+			this.#tui.requestRender(true);
+		}
+	}
+
 	dispose(): void {
 		this.#countdown?.dispose();
 	}

package/src/modes/components/status-line.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import type { AgentMessage } from "@gajae-code/agent-core";
-import { estimateTokens } from "@gajae-code/agent-core/compaction";
+import { estimateMessageTokensHeuristic } from "@gajae-code/agent-core/compaction";
 import { type Component, truncateToWidth, visibleWidth } from "@gajae-code/tui";
 import { formatCount, getProjectDir } from "@gajae-code/utils";
 import { $ } from "bun";
@@ -50,7 +50,7 @@ export interface StatusLineSettings {
 
 /**
  * Symbol-keyed sidecar tagged onto each `AgentMessage` to memoize its
- * `estimateTokens` result. Keyed by message identity (the object itself);
+ * `estimateMessageTokensHeuristic` result. Keyed by message identity (the object itself);
  * a cheap content fingerprint detects in-place mutations (post-hoc error
  * attachment, retry-truncated branch rebuild, etc.) and forces recompute.
  *
@@ -64,11 +64,11 @@ interface TaggedMessage {
 }
 
 /**
- * Cheap structural fingerprint mirroring `estimateTokens`'s content walk.
+ * Cheap structural fingerprint mirroring `estimateMessageTokensHeuristic`'s content walk.
  * O(blocks) — only reads string `.length` and primitives, never copies or
  * serializes content. Any in-place mutation that alters total tokenized
  * content also alters one of the byte-length sums or block counts captured
- * here, forcing the cached `estimateTokens` value to be recomputed.
+ * here, forcing the cached heuristic token value to be recomputed.
  */
 function messageFingerprint(msg: AgentMessage): string {
 	const role = (msg as { role?: string }).role ?? "";
@@ -136,7 +136,7 @@ function tokensForMessage(msg: AgentMessage): number {
 	const tagged = msg as TaggedMessage;
 	const cached = tagged[kTokenCache];
 	if (cached && cached.fingerprint === fp) return cached.tokens;
-	const tokens = estimateTokens(msg);
+	const tokens = estimateMessageTokensHeuristic(msg);
 	tagged[kTokenCache] = { fingerprint: fp, tokens };
 	return tokens;
 }
@@ -560,7 +560,7 @@ export class StatusLineComponent implements Component {
 		let messagesTokens = 0;
 		const lastIdx = messages.length - 1;
 		for (let i = 0; i < messages.length; i++) {
-			messagesTokens += i === lastIdx ? estimateTokens(messages[i]) : tokensForMessage(messages[i]);
+			messagesTokens += i === lastIdx ? estimateMessageTokensHeuristic(messages[i]) : tokensForMessage(messages[i]);
 		}
 
 		const usedTokens = this.#nonMessageTokensCache + messagesTokens;

package/src/modes/controllers/event-controller.ts

@@ -20,6 +20,7 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import { isSilentAbort, readPendingDisplayTag } from "../../session/messages";
 import type { ResolveToolDetails } from "../../tools/resolve";
 import { interruptHint } from "../shared";
+import { buildAbortDisplayMessage } from "../utils/abort-message";
 
 type AgentSessionEventKind = AgentSessionEvent["type"];
 
@@ -419,10 +420,10 @@ export class EventController {
 				// controller ran, so reaching this branch implies the abort was NOT a
 				// silent internal transition.
 				const retryAttempt = this.ctx.session.retryAttempt;
-				errorMessage =
-					retryAttempt > 0
-						? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-						: "Operation aborted";
+				errorMessage = buildAbortDisplayMessage({
+					errorMessage: this.ctx.streamingMessage.errorMessage,
+					retryAttempt,
+				});
 				this.ctx.streamingMessage.errorMessage = errorMessage;
 			}
 			if (silentlyAborted || ttsrSilenced) {

package/src/modes/controllers/extension-ui-controller.ts

@@ -29,6 +29,7 @@ const HOOK_SELECTOR_MOUSE_REPORTING_ENABLE = "\x1b[?1006h\x1b[?1000h";
 const HOOK_SELECTOR_MOUSE_REPORTING_DISABLE = "\x1b[?1000l\x1b[?1006l";
 const HOOK_SELECTOR_CHROME_ROWS = 7;
 const HOOK_SELECTOR_OUTLINE_ROWS = 2;
+const HOOK_SELECTOR_INLINE_INPUT_ROWS = 2;
 
 export class ExtensionUiController {
 	#extensionTerminalInputUnsubscribers = new Set<() => void>();
@@ -601,8 +602,11 @@ export class ExtensionUiController {
 		const maxVisible =
 			requestedTitleRows === undefined ? baseMaxVisible : Math.min(15, Math.max(3, scrollOptionRows + 1));
 		const listChromeRows = dialogOptions?.outline === true ? HOOK_SELECTOR_OUTLINE_ROWS : 0;
+		// Reserve rows for the inline custom-input editor so opening it doesn't
+		// push the scrollable title past the viewport into terminal scrollback.
+		const inlineInputRows = dialogOptions?.customInput ? HOOK_SELECTOR_INLINE_INPUT_ROWS : 0;
 		const availableTitleRows =
-			this.ctx.ui.terminal.rows - scrollOptionRows - listChromeRows - HOOK_SELECTOR_CHROME_ROWS;
+			this.ctx.ui.terminal.rows - scrollOptionRows - listChromeRows - inlineInputRows - HOOK_SELECTOR_CHROME_ROWS;
 		const scrollTitleRows =
 			requestedTitleRows === undefined ? undefined : Math.max(1, Math.min(requestedTitleRows, availableTitleRows));
 		if (scrollTitleRows !== undefined) {
@@ -645,6 +649,17 @@ export class ExtensionUiController {
 				wrapFocused: dialogOptions?.wrapFocused,
 				scrollTitleRows,
 				maxVisible,
+				customInput: dialogOptions?.customInput
+					? {
+							optionLabel: dialogOptions.customInput.optionLabel,
+							onSubmit: text => {
+								const optionLabel = dialogOptions.customInput?.optionLabel;
+								this.hideHookSelector();
+								dialogOptions.customInput?.onSubmit(text);
+								finish(optionLabel);
+							},
+						}
+					: undefined,
 			},
 		);
 		this.ctx.editorContainer.clear();

package/src/modes/interactive-mode.ts

@@ -1057,7 +1057,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				return;
 			}
 			if (event.state?.enabled === true && !this.#goalModePreviousTools) {
-				this.#goalModePreviousTools = this.session.getActiveToolNames().filter(name => name !== "goal");
+				this.#goalModePreviousTools = this.session.getActiveToolNames();
 			}
 			this.goalModeEnabled = event.state?.enabled === true;
 			this.goalModePaused = event.state?.enabled !== true && event.state?.goal?.status === "paused";
@@ -1146,10 +1146,9 @@ export class InteractiveMode implements InteractiveModeContext {
 			const restored = await this.session.goalRuntime.onThreadResumed();
 			this.goalModeEnabled = restored?.enabled === true;
 			this.goalModePaused = restored?.enabled !== true && restored?.goal.status === "paused";
-			// sdk.ts excludes "goal" from the initial active tool set unconditionally.
-			// Re-add it now so the agent can call resume, complete, or drop on this goal.
+			// Keep `goal` armed on resumed threads; it is part of the default active tool set.
 			if (restored?.goal) {
-				const previousTools = this.session.getActiveToolNames().filter(name => name !== "goal");
+				const previousTools = this.session.getActiveToolNames();
 				this.#goalModePreviousTools = previousTools;
 				await this.session.setActiveToolsByName([...new Set([...previousTools, "goal"])]);
 			}
@@ -1318,7 +1317,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			this.showWarning("Exit plan mode first.");
 			return;
 		}
-		const previousTools = this.session.getActiveToolNames().filter(name => name !== "goal");
+		const previousTools = this.session.getActiveToolNames();
 		const goalTools = [...new Set([...previousTools, "goal"])];
 		this.#goalModePreviousTools = previousTools;
 		this.goalModePaused = false;

package/src/modes/print-mode.ts

@@ -72,7 +72,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	// In text mode, output final response
 	if (mode === "text") {
 		const state = session.state;
-		const lastMessage = state.messages[state.messages.length - 1];
+		const lastMessage = state.messages.findLast(message => message.role === "assistant");
 
 		if (lastMessage?.role === "assistant") {
 			const assistantMsg = lastMessage as AssistantMessage;

package/src/modes/theme/theme.ts

@@ -264,7 +264,7 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"icon.context": "◫",
 	"icon.cost": "💲",
 	"icon.time": "⏱",
-	"icon.pi": "π",
+	"icon.pi": "🦞",
 	"icon.agents": "👥",
 	"icon.cache": "💾",
 	"icon.input": "⤵",
@@ -686,7 +686,7 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"icon.context": "ctx:",
 	"icon.cost": "$",
 	"icon.time": "t:",
-	"icon.pi": "pi",
+	"icon.pi": "GJC",
 	"icon.agents": "AG",
 	"icon.cache": "cache",
 	"icon.input": "in:",

package/src/modes/utils/abort-message.ts

@@ -0,0 +1,41 @@
+const STREAM_IDLE_TIMEOUT_PATTERN = /\bstream stalled while waiting for the next event\b/i;
+const GENERIC_ABORT_PATTERN = /^Request was aborted\.?$/i;
+const ABORT_DISPLAY_LABEL_PATTERN = /^(?:Operation aborted|Aborted after \d+ retry attempts?)(?::|$)/;
+
+export function buildAbortDisplayMessage({
+	errorMessage,
+	retryAttempt,
+}: {
+	errorMessage?: string;
+	retryAttempt: number;
+}): string {
+	const existingDisplayMessage = normalizeExistingAbortDisplayMessage(errorMessage);
+	if (existingDisplayMessage) return existingDisplayMessage;
+
+	const baseMessage =
+		retryAttempt > 0
+			? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+			: "Operation aborted";
+	const cause = normalizeAbortCause(errorMessage);
+	if (!cause) return baseMessage;
+
+	return `${baseMessage}: ${cause}${streamIdleTimeoutHint(cause)}`;
+}
+
+function normalizeExistingAbortDisplayMessage(errorMessage: string | undefined): string {
+	const trimmed = errorMessage?.trim();
+	if (!trimmed || !ABORT_DISPLAY_LABEL_PATTERN.test(trimmed)) return "";
+	return trimmed;
+}
+
+function normalizeAbortCause(errorMessage: string | undefined): string {
+	const trimmed = errorMessage?.trim();
+	if (!trimmed || GENERIC_ABORT_PATTERN.test(trimmed)) return "";
+	return trimmed;
+}
+
+function streamIdleTimeoutHint(cause: string): string {
+	if (!STREAM_IDLE_TIMEOUT_PATTERN.test(cause)) return "";
+	const separator = /[.!?]$/.test(cause) ? " " : ". ";
+	return `${separator}Hint: set PI_STREAM_IDLE_TIMEOUT_MS=300000 for slow reasoning/proxy streams, or PI_STREAM_IDLE_TIMEOUT_MS=0 to disable the watchdog.`;
+}

package/src/modes/utils/context-usage.ts

@@ -1,8 +1,12 @@
 import type { AgentMessage } from "@gajae-code/agent-core";
 import type { CompactionSettings } from "@gajae-code/agent-core/compaction";
-import { effectiveReserveTokens, estimateTokens, resolveThresholdTokens } from "@gajae-code/agent-core/compaction";
+import {
+	effectiveReserveTokens,
+	estimateMessageTokensHeuristic,
+	estimateTextTokensHeuristic,
+	resolveThresholdTokens,
+} from "@gajae-code/agent-core/compaction";
 import type { Model } from "@gajae-code/ai";
-import { countTokens } from "@gajae-code/natives";
 import { formatNumber } from "@gajae-code/utils";
 import type { Skill } from "../../extensibility/skills";
 import type { AgentSession } from "../../session/agent-session";
@@ -46,7 +50,7 @@ export function estimateSkillsTokens(skills: readonly Skill[]): number {
 		// concatenated form, so encode each piece separately and sum.
 		fragments.push(skill.name, skill.description);
 	}
-	return countTokens(fragments);
+	return estimateTextTokensHeuristic(fragments);
 }
 
 export function estimateToolSchemaTokens(
@@ -61,7 +65,7 @@ export function estimateToolSchemaTokens(
 			// Schema may contain functions or cycles; ignore.
 		}
 	}
-	return countTokens(fragments);
+	return estimateTextTokensHeuristic(fragments);
 }
 
 /**
@@ -100,8 +104,11 @@ function computeNonMessageBreakdown(session: AgentSession): {
 	const toolsTokens = estimateToolSchemaTokens(session.agent?.state?.tools ?? []);
 	const systemPromptParts = session.systemPrompt ?? [];
 	const rulesTokens = estimateRulesTokens(systemPromptParts);
-	const systemContextTokens = countTokens(systemPromptParts.slice(1));
-	const systemPromptTokens = Math.max(0, countTokens(systemPromptParts[0] ?? "") - skillsTokens - rulesTokens);
+	const systemContextTokens = estimateTextTokensHeuristic(systemPromptParts.slice(1));
+	const systemPromptTokens = Math.max(
+		0,
+		estimateTextTokensHeuristic(systemPromptParts[0] ?? "") - skillsTokens - rulesTokens,
+	);
 	return { rulesTokens, skillsTokens, toolsTokens, systemContextTokens, systemPromptTokens };
 }
 
@@ -112,7 +119,7 @@ function estimateRulesTokens(systemPromptParts: readonly string[]): number {
 			fragments.push(match[0]);
 		}
 	}
-	return fragments.length === 0 ? 0 : countTokens(fragments);
+	return fragments.length === 0 ? 0 : estimateTextTokensHeuristic(fragments);
 }
 
 function splitLastUserTurn(messages: readonly AgentMessage[]): {
@@ -130,7 +137,7 @@ function splitLastUserTurn(messages: readonly AgentMessage[]): {
 	let regularMessagesTokens = 0;
 	let lastUserTurnTokens = 0;
 	for (let i = 0; i < messages.length; i++) {
-		const tokens = estimateTokens(messages[i]);
+		const tokens = estimateMessageTokensHeuristic(messages[i]);
 		if (i === lastUserIndex) {
 			lastUserTurnTokens = tokens;
 		} else {

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

@@ -27,6 +27,7 @@ import {
 } from "../../session/messages";
 import type { SessionContext } from "../../session/session-manager";
 import { formatBytes, formatDuration } from "../../tools/render-utils";
+import { buildAbortDisplayMessage } from "./abort-message";
 
 type TextBlock = { type: "text"; text: string };
 interface RenderInitialMessagesOptions {
@@ -319,12 +320,10 @@ export class UiHelpers {
 					!isAbortedSilently && (message.stopReason === "aborted" || message.stopReason === "error");
 				const errorMessage = hasErrorStop
 					? message.stopReason === "aborted"
-						? (() => {
-								const retryAttempt = this.ctx.session.retryAttempt;
-								return retryAttempt > 0
-									? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-									: "Operation aborted";
-							})()
+						? buildAbortDisplayMessage({
+								errorMessage: message.errorMessage,
+								retryAttempt: this.ctx.session.retryAttempt,
+							})
 						: message.errorMessage || "Error"
 					: null;
 

package/src/prompts/agents/architect.md

@@ -83,4 +83,10 @@ Prioritized concrete actions.
 
 ## Trade-offs
 Table or bullets comparing viable options when relevant.
+
+Persist this full review as the durable artifact via the restricted bash CLI, passing the markdown inline (never a file path, never `/tmp`):
+
+  gjc ralplan --write --stage architect --stage_n <N> --artifact "<full review markdown>" --json
+
+Then return to the caller ONLY the write receipt (`run_id`, `path`, `sha256`, `stage`, `stage_n`) plus the compact verdict (Architectural Status + Code Review Recommendation). Never paste the full review body back into your response — the caller reads the persisted artifact when it needs the full text.
 </output_contract>

package/src/prompts/agents/critic.md

@@ -56,4 +56,10 @@ Review plan clarity, completeness, verification, big-picture fit, referenced fil
 - Risk/Verification Rigor
 
 If not OKAY, list concrete required fixes.
+
+Persist this full evaluation as the durable artifact via the restricted bash CLI, passing the markdown inline (never a file path, never `/tmp`):
+
+  gjc ralplan --write --stage critic --stage_n <N> --artifact "<full evaluation markdown>" --json
+
+Then return to the caller ONLY the write receipt (`run_id`, `path`, `sha256`, `stage`, `stage_n`) plus the compact verdict (OKAY / ITERATE / REJECT). Never paste the full evaluation body back into your response — the caller reads the persisted artifact when it needs the full text.
 </output_contract>

package/src/prompts/agents/planner.md

@@ -18,6 +18,7 @@ Leave execution with a right-sized, evidence-grounded plan: scope, steps, accept
 <constraints>
 - Read-only: never write, edit, format, commit, push, or mutate files.
 - Exception: you may use the restricted `bash` tool only for sanctioned GJC workflow CLI persistence (`gjc ralplan --write ...`) and GJC workflow state read/write/contract commands (`gjc state ...`). For `gjc ralplan --write`, pass the plan markdown inline in `--artifact`, not as a file path. Do not use bash for product-source writes, direct handoffs, state clears, or general shell work.
+- Persist durable plans only through `gjc ralplan --write`. Never write plan files to `/tmp`, the repository, or any other path, and never rely on a file the caller must read back. The CLI is your only persistence channel.
 - Inspect the repository before asking about code facts.
 - Ask only about priorities, tradeoffs, scope decisions, timelines, or preferences that repository inspection cannot resolve.
 - Right-size the step count to the task; do not default to a fixed number of steps.
@@ -42,7 +43,7 @@ Leave execution with a right-sized, evidence-grounded plan: scope, steps, accept
 </success_criteria>
 
 <output_contract>
-Return:
+Build the full plan as a single markdown document containing:
 - Summary
 - In scope / out of scope
 - File-level changes
@@ -50,4 +51,10 @@ Return:
 - Acceptance criteria
 - Verification
 - Risks and mitigations
+
+Persist that markdown as the durable artifact via the restricted bash CLI, passing the plan inline (never a file path, never `/tmp`):
+
+  gjc ralplan --write --stage planner --stage_n <N> --artifact "<full plan markdown>" --json
+
+Then return to the caller ONLY the write receipt (`run_id`, `path`, `sha256`, `stage`, `stage_n`) plus a compact plan summary (<=10 lines). Never paste the full plan body back into your response — the caller reads the persisted artifact when it needs the full text.
 </output_contract>

package/src/sdk.ts

@@ -1622,9 +1622,14 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		};
 
 		const toolNamesFromRegistry = Array.from(toolRegistry.keys());
-		const requestedToolNames =
-			(options.toolNames ? [...new Set(options.toolNames.map(name => name.toLowerCase()))] : undefined) ??
-			toolNamesFromRegistry;
+		const requestedToolNames = options.toolNames
+			? [
+					...new Set([
+						...options.toolNames.map(name => name.toLowerCase()),
+						...(settings.get("goal.enabled") ? ["goal"] : []),
+					]),
+				]
+			: toolNamesFromRegistry;
 		const normalizedRequested = requestedToolNames.filter(name => toolRegistry.has(name));
 		const requestedToolNameSet = new Set(normalizedRequested);
 		// Effective discovery mode only covers built-in tools; MCP tool discovery
@@ -1635,7 +1640,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		const defaultInactiveToolNames = new Set(
 			registeredTools.filter(tool => tool.definition.defaultInactive).map(tool => tool.definition.name),
 		);
-		const requestedActiveToolNames = normalizedRequested.filter(name => name !== "goal");
+		const requestedActiveToolNames = normalizedRequested;
 		const initialRequestedActiveToolNames = options.toolNames
 			? requestedActiveToolNames
 			: requestedActiveToolNames.filter(name => !defaultInactiveToolNames.has(name));