@gajae-code/coding-agent 0.5.0 → 0.5.2

package/src/modes/shared/agent-wire/host-tool-bridge.ts

@@ -93,6 +93,9 @@ export class RpcHostToolBridge {
 	}
 
 	setTools(tools: RpcHostToolDefinition[]): AgentTool[] {
+		if (tools.some(tool => tool.name === "ask")) {
+			throw new Error('RPC host tool "ask" is reserved and cannot be supplied by the host');
+		}
 		this.#definitions = new Map(tools.map(tool => [tool.name, tool]));
 		return tools.map(tool => new RpcHostToolAdapter(tool, this));
 	}

package/src/modes/shared/agent-wire/session-registry.ts

@@ -0,0 +1,109 @@
+/**
+ * Cross-process registry of running gjc RPC sessions (issue 10).
+ *
+ * Each live RPC server writes a record under `<agent-dir>/rpc-sessions/<id>.json`
+ * on start and removes it on shutdown, so a separate process can discover which
+ * sessions are alive (and, once persistence lands in issue 09, how to reach
+ * them). Listing reaps records whose owning process is no longer alive, so a
+ * crashed server never leaves a permanent phantom entry.
+ */
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { getAgentDir } from "@gajae-code/utils";
+
+export type RpcSessionTransport = "stdio" | "bridge" | "socket";
+
+export interface RpcSessionRecord {
+	sessionId: string;
+	pid: number;
+	transport: RpcSessionTransport;
+	cwd: string;
+	model?: string;
+	/** ISO-8601 start timestamp. */
+	startedAt: string;
+	/** Reachable endpoint for persistent transports (issue 09); absent for stdio. */
+	endpoint?: string;
+}
+
+/** Registry directory: `<agent-dir>/rpc-sessions` (honors GJC_CODING_AGENT_DIR via getAgentDir). */
+function rpcSessionsDir(agentDir?: string): string {
+	return path.join(agentDir ?? getAgentDir(), "rpc-sessions");
+}
+
+function recordPath(sessionId: string, agentDir?: string): string {
+	return path.join(rpcSessionsDir(agentDir), `${sessionId}.json`);
+}
+
+/**
+ * Write (or replace) the registry record for a session. The record is written to
+ * a same-directory temp file and atomically renamed into place so a concurrent
+ * reader never observes (and reaps) a partially-written record.
+ */
+export async function registerRpcSession(record: RpcSessionRecord, agentDir?: string): Promise<string> {
+	const file = recordPath(record.sessionId, agentDir);
+	// `.tmp` suffix keeps the staging file out of the `*.json` listing/reaping path.
+	const staging = `${file}.${process.pid}.tmp`;
+	await Bun.write(staging, JSON.stringify(record));
+	await fs.rename(staging, file);
+	return file;
+}
+
+/** Remove a session's registry record. Best-effort: a missing file is not an error. */
+export async function unregisterRpcSession(sessionId: string, agentDir?: string): Promise<void> {
+	await fs.rm(recordPath(sessionId, agentDir), { force: true });
+}
+
+function isProcessAlive(pid: number): boolean {
+	if (!Number.isInteger(pid) || pid <= 0) return false;
+	try {
+		// Signal 0 performs error checking without delivering a signal.
+		process.kill(pid, 0);
+		return true;
+	} catch (err) {
+		// ESRCH => no such process (dead). EPERM => alive but owned by another user.
+		return (err as NodeJS.ErrnoException).code === "EPERM";
+	}
+}
+
+function parseRecord(raw: string): RpcSessionRecord | undefined {
+	let obj: Partial<RpcSessionRecord>;
+	try {
+		obj = JSON.parse(raw) as Partial<RpcSessionRecord>;
+	} catch {
+		return undefined;
+	}
+	if (typeof obj.sessionId !== "string" || typeof obj.pid !== "number") return undefined;
+	return obj as RpcSessionRecord;
+}
+
+/**
+ * List live RPC sessions, reaping records whose process is gone or whose file is
+ * unparseable. Returns records sorted by `startedAt` ascending.
+ */
+export async function listRpcSessions(agentDir?: string): Promise<RpcSessionRecord[]> {
+	const dir = rpcSessionsDir(agentDir);
+	let entries: string[];
+	try {
+		entries = await fs.readdir(dir);
+	} catch {
+		return [];
+	}
+	const live: RpcSessionRecord[] = [];
+	for (const entry of entries) {
+		if (!entry.endsWith(".json")) continue;
+		const file = path.join(dir, entry);
+		let raw: string;
+		try {
+			raw = await fs.readFile(file, "utf8");
+		} catch {
+			continue;
+		}
+		const record = parseRecord(raw);
+		if (!record || !isProcessAlive(record.pid)) {
+			await fs.rm(file, { force: true });
+			continue;
+		}
+		live.push(record);
+	}
+	return live.sort((a, b) => a.startedAt.localeCompare(b.startedAt));
+}

package/src/modes/shared/agent-wire/unattended-action-policy.ts

@@ -45,6 +45,30 @@ export function actionClassForScope(scope: BridgeCommandScope): RpcUnattendedAct
 	}
 }
 
+/** Runtime list of every v1 action class — membership-validation source for negotiate (#319). */
+export const RPC_UNATTENDED_ACTION_CLASSES: readonly RpcUnattendedActionClass[] = [
+	"command.prompt",
+	"command.control",
+	"command.bash",
+	"command.export",
+	"command.session",
+	"command.model",
+	"command.message_read",
+	"command.host_tools",
+	"command.host_uri",
+	"command.admin",
+	"bash.readonly",
+	"bash.mutating",
+	"bash.destructive",
+	"git.force_push",
+	"file.delete",
+	"file.write",
+	"host_tool.invoke",
+	"host_uri.read",
+	"host_uri.write",
+	"auth.login",
+];
+
 const READONLY_COMMANDS = new Set([
 	"ls",
 	"cat",

package/src/modes/shared/agent-wire/unattended-run-controller.ts

@@ -24,7 +24,8 @@ import type {
 	RpcUnattendedRefusalCode,
 } from "../../rpc/rpc-types";
 import type { BridgeCommandScope } from "./scopes";
-import { actionClassForScope, classifyBashAction } from "./unattended-action-policy";
+import { BRIDGE_COMMAND_SCOPES, MANDATORY_FLOOR_COMMAND_SCOPES } from "./scopes";
+import { actionClassForScope, classifyBashAction, RPC_UNATTENDED_ACTION_CLASSES } from "./unattended-action-policy";
 
 /** Coordinated abort surfaces invoked exactly once on a budget breach / abort. */
 export interface UnattendedAbortHooks {
@@ -157,8 +158,11 @@ export class UnattendedRunController {
 		this.sessionId = ctx.sessionId;
 		this.actor = declaration.actor;
 		this.budget = budget;
-		this.scopes = new Set(declaration.scopes);
-		this.actionAllowlist = new Set(declaration.action_allowlist);
+		this.scopes = new Set([...declaration.scopes, ...MANDATORY_FLOOR_COMMAND_SCOPES]);
+		this.actionAllowlist = new Set([
+			...declaration.action_allowlist,
+			...MANDATORY_FLOOR_COMMAND_SCOPES.map(actionClassForScope),
+		]);
 		this.now = ctx.now ?? Date.now;
 		this.audit = ctx.audit;
 		this.abortHooks = ctx.abortHooks ?? {};
@@ -183,6 +187,22 @@ export class UnattendedRunController {
 				"declaration.action_allowlist must be string[]",
 			);
 		}
+		const unknownScopes = d.scopes.filter(scope => !BRIDGE_COMMAND_SCOPES.includes(scope as BridgeCommandScope));
+		if (unknownScopes.length > 0) {
+			throw new UnattendedNegotiationError(
+				"invalid_unattended_declaration",
+				`declaration.scopes contains unknown scope(s): ${unknownScopes.join(", ")}`,
+			);
+		}
+		const unknownActions = d.action_allowlist.filter(
+			action => !RPC_UNATTENDED_ACTION_CLASSES.includes(action as RpcUnattendedActionClass),
+		);
+		if (unknownActions.length > 0) {
+			throw new UnattendedNegotiationError(
+				"invalid_unattended_declaration",
+				`declaration.action_allowlist contains unknown action class(es): ${unknownActions.join(", ")}`,
+			);
+		}
 		const budget = validateBudget(d.budget);
 		// Reject providers that cannot account for tokens/cost (fail-closed): require
 		// an explicit positive capability signal — omitted/unknown is refused too.

package/src/modes/shared/agent-wire/unattended-session.ts

@@ -14,6 +14,7 @@
  * Also implements the dispatch-facing {@link RpcUnattendedControlPlane} so the
  * RPC server can route `negotiate_unattended` + `workflow_gate_response` here.
  */
+import type { Model } from "@gajae-code/ai";
 import type {
 	RpcCommand,
 	RpcUnattendedAccepted,
@@ -31,6 +32,27 @@ import {
 } from "./unattended-run-controller";
 import { type GateStore, MemoryGateStore, type OpenGateInput, WorkflowGateBroker } from "./workflow-gate-broker";
 
+/**
+ * RPC commands that perform agent/tool work and therefore consume one unit of the
+ * `max_tool_calls` budget. Read-only/control/cancellation commands are wall-time-bounded
+ * and scope-checked but must NOT charge the tool-call budget (issue 04).
+ */
+const CHARGED_COMMAND_TYPES = new Set<RpcCommand["type"]>(["bash", "prompt", "steer", "follow_up", "abort_and_prompt"]);
+
+/**
+ * Derive an explicit `providerSupportsTokenCostMetrics` capability from the
+ * active model so unattended negotiation fails closed when token/cost usage
+ * cannot be accounted for (#606). Callers that omit a model — or whose model is
+ * configured to suppress streaming usage (`compat.supportsUsageInStreaming:
+ * false`) — get `false`, which the controller refuses with
+ * `unsupported_budget_metric`.
+ */
+export function modelSupportsTokenCostMetrics(model: Model | undefined): boolean {
+	if (!model) return false;
+	const compat = model.compat as { supportsUsageInStreaming?: boolean } | undefined;
+	return compat?.supportsUsageInStreaming !== false;
+}
+
 /** Minimal surface a skill runtime / ask tool uses to emit a gate and await its answer. */
 export interface WorkflowGateEmitter {
 	/** True only when unattended mode has been negotiated. */
@@ -85,7 +107,7 @@ export class UnattendedSessionControlPlane implements RpcUnattendedControlPlane,
 					this.#rejectAllPending(new Error(`unattended run aborted: ${reason}`));
 				},
 			},
-			providerSupportsTokenCostMetrics: this.opts.providerSupportsTokenCostMetrics ?? true,
+			providerSupportsTokenCostMetrics: this.opts.providerSupportsTokenCostMetrics,
 		});
 		this.#controller = controller;
 		this.#broker = new WorkflowGateBroker(this.opts.runId, this.opts.store ?? new MemoryGateStore(), {
@@ -116,7 +138,15 @@ export class UnattendedSessionControlPlane implements RpcUnattendedControlPlane,
 
 	preflightCommand(command: RpcCommand): void {
 		if (!this.#controller) return;
-		this.#controller.preflightToolCall(`${command.type} preflight`);
+		const phase = `${command.type} preflight`;
+		// Always enforce wall-time; only charge the tool-call budget for commands that perform
+		// agent/tool work (issue 04). Read-only/control/cancellation commands must not consume
+		// max_tool_calls, but remain wall-time-bounded and scope/action-checked.
+		if (CHARGED_COMMAND_TYPES.has(command.type)) {
+			this.#controller.preflightToolCall(phase);
+		} else {
+			this.#controller.checkWallTime(phase);
+		}
 		if (command.type === "bash") {
 			this.#controller.authorizeBash(command.command);
 			return;

package/src/modes/theme/defaults/claude-code.json

@@ -0,0 +1,100 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/gajae-code/main/packages/coding-agent/theme-schema.json",
+	"name": "claude-code",
+	"vars": {
+		"bg": "#1a1a1a",
+		"surface": "#373737",
+		"surfaceSubtle": "#2a2a2a",
+		"separator": "#505050",
+		"fg": "#ffffff",
+		"muted": "#888888",
+		"dim": "#666666",
+		"brandTerracotta": "#d77757",
+		"shimmerTerracotta": "#eb9f7f",
+		"toolPink": "#fd5db1",
+		"lavender": "#b1b9f9",
+		"autoAcceptPurple": "#af87ff",
+		"successGreen": "#4eba65",
+		"warningAmber": "#ffc107",
+		"errorSoftRed": "#ff6b80",
+		"diffAddedBg": "#225c2b",
+		"diffRemovedBg": "#7a2936",
+		"diffRemovedFg": "#ff8fa0"
+	},
+	"colors": {
+		"accent": "brandTerracotta",
+		"border": "separator",
+		"borderAccent": "toolPink",
+		"borderMuted": "dim",
+		"success": "successGreen",
+		"error": "errorSoftRed",
+		"warning": "warningAmber",
+		"muted": "muted",
+		"dim": "dim",
+		"text": "fg",
+		"thinkingText": "muted",
+		"selectedBg": "surface",
+		"userMessageBg": "surface",
+		"userMessageText": "fg",
+		"customMessageBg": "surfaceSubtle",
+		"customMessageText": "fg",
+		"customMessageLabel": "brandTerracotta",
+		"toolPendingBg": "surfaceSubtle",
+		"toolSuccessBg": "diffAddedBg",
+		"toolErrorBg": "diffRemovedBg",
+		"toolTitle": "fg",
+		"toolOutput": "muted",
+		"mdHeading": "brandTerracotta",
+		"mdLink": "lavender",
+		"mdLinkUrl": "muted",
+		"mdCode": "shimmerTerracotta",
+		"mdCodeBlock": "fg",
+		"mdCodeBlockBorder": "toolPink",
+		"mdQuote": "muted",
+		"mdQuoteBorder": "separator",
+		"mdHr": "dim",
+		"mdListBullet": "brandTerracotta",
+		"toolDiffAdded": "successGreen",
+		"toolDiffRemoved": "diffRemovedFg",
+		"toolDiffContext": "muted",
+		"syntaxComment": "muted",
+		"syntaxKeyword": "lavender",
+		"syntaxFunction": "shimmerTerracotta",
+		"syntaxVariable": "fg",
+		"syntaxString": "successGreen",
+		"syntaxNumber": "warningAmber",
+		"syntaxType": "autoAcceptPurple",
+		"syntaxOperator": "toolPink",
+		"syntaxPunctuation": "muted",
+		"thinkingOff": "dim",
+		"thinkingMinimal": "muted",
+		"thinkingLow": "shimmerTerracotta",
+		"thinkingMedium": "brandTerracotta",
+		"thinkingHigh": "toolPink",
+		"thinkingXhigh": "errorSoftRed",
+		"bashMode": "toolPink",
+		"pythonMode": "lavender",
+		"statusLineBg": "bg",
+		"statusLineSep": "separator",
+		"statusLineModel": "brandTerracotta",
+		"statusLinePath": "lavender",
+		"statusLineGitClean": "successGreen",
+		"statusLineGitDirty": "warningAmber",
+		"statusLineContext": "lavender",
+		"statusLineSpend": "warningAmber",
+		"statusLineStaged": "successGreen",
+		"statusLineDirty": "warningAmber",
+		"statusLineUntracked": "errorSoftRed",
+		"statusLineOutput": "fg",
+		"statusLineCost": "shimmerTerracotta",
+		"statusLineSubagents": "autoAcceptPurple"
+	},
+	"export": {
+		"pageBg": "#1a1a1a",
+		"cardBg": "#2a2a2a",
+		"infoBg": "#373737"
+	},
+	"symbols": {
+		"preset": "unicode"
+	}
+}

package/src/modes/theme/defaults/codex.json

@@ -0,0 +1,100 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/gajae-code/main/packages/coding-agent/theme-schema.json",
+	"name": "codex",
+	"vars": {
+		"bg": "#0f1115",
+		"surface": "#151922",
+		"surfaceBright": "#1c2230",
+		"selection": "#24313a",
+		"fg": "#d7d7d7",
+		"muted": "#8a8f98",
+		"dim": "#5f6670",
+		"borderNeutral": "#343a46",
+		"ansiCyan": "#00bcd4",
+		"cyanSoft": "#58d5e8",
+		"brandMagenta": "#c678dd",
+		"magentaSoft": "#d7a4e8",
+		"successGreen": "#4caf50",
+		"errorRed": "#ef5350",
+		"warningOrange": "#f59e0b",
+		"diffRemovalRed": "#d84a4a",
+		"toolSuccessBg": "#14241a",
+		"toolErrorBg": "#2a1718"
+	},
+	"colors": {
+		"accent": "ansiCyan",
+		"border": "borderNeutral",
+		"borderAccent": "ansiCyan",
+		"borderMuted": "dim",
+		"success": "successGreen",
+		"error": "errorRed",
+		"warning": "warningOrange",
+		"muted": "muted",
+		"dim": "dim",
+		"text": "fg",
+		"thinkingText": "muted",
+		"selectedBg": "selection",
+		"userMessageBg": "surface",
+		"userMessageText": "fg",
+		"customMessageBg": "surface",
+		"customMessageText": "fg",
+		"customMessageLabel": "brandMagenta",
+		"toolPendingBg": "surface",
+		"toolSuccessBg": "toolSuccessBg",
+		"toolErrorBg": "toolErrorBg",
+		"toolTitle": "fg",
+		"toolOutput": "muted",
+		"mdHeading": "brandMagenta",
+		"mdLink": "ansiCyan",
+		"mdLinkUrl": "muted",
+		"mdCode": "cyanSoft",
+		"mdCodeBlock": "fg",
+		"mdCodeBlockBorder": "borderNeutral",
+		"mdQuote": "muted",
+		"mdQuoteBorder": "borderNeutral",
+		"mdHr": "dim",
+		"mdListBullet": "ansiCyan",
+		"toolDiffAdded": "successGreen",
+		"toolDiffRemoved": "diffRemovalRed",
+		"toolDiffContext": "muted",
+		"syntaxComment": "dim",
+		"syntaxKeyword": "brandMagenta",
+		"syntaxFunction": "cyanSoft",
+		"syntaxVariable": "fg",
+		"syntaxString": "successGreen",
+		"syntaxNumber": "magentaSoft",
+		"syntaxType": "ansiCyan",
+		"syntaxOperator": "muted",
+		"syntaxPunctuation": "dim",
+		"thinkingOff": "dim",
+		"thinkingMinimal": "muted",
+		"thinkingLow": "cyanSoft",
+		"thinkingMedium": "ansiCyan",
+		"thinkingHigh": "brandMagenta",
+		"thinkingXhigh": "errorRed",
+		"bashMode": "ansiCyan",
+		"pythonMode": "brandMagenta",
+		"statusLineBg": "bg",
+		"statusLineSep": "dim",
+		"statusLineModel": "brandMagenta",
+		"statusLinePath": "cyanSoft",
+		"statusLineGitClean": "successGreen",
+		"statusLineGitDirty": "warningOrange",
+		"statusLineContext": "ansiCyan",
+		"statusLineSpend": "cyanSoft",
+		"statusLineStaged": "successGreen",
+		"statusLineDirty": "warningOrange",
+		"statusLineUntracked": "diffRemovalRed",
+		"statusLineOutput": "fg",
+		"statusLineCost": "muted",
+		"statusLineSubagents": "brandMagenta"
+	},
+	"export": {
+		"pageBg": "#0f1115",
+		"cardBg": "#151922",
+		"infoBg": "#1c2230"
+	},
+	"symbols": {
+		"preset": "unicode"
+	}
+}

package/src/modes/theme/defaults/index.ts

@@ -1,7 +1,13 @@
 import blue_crab from "./blue-crab.json" with { type: "json" };
+import claude_code from "./claude-code.json" with { type: "json" };
+import codex from "./codex.json" with { type: "json" };
+import opencode from "./opencode.json" with { type: "json" };
 import red_claw from "./red-claw.json" with { type: "json" };
 
 export const defaultThemes = {
 	"blue-crab": blue_crab,
+	"claude-code": claude_code,
+	codex,
+	opencode,
 	"red-claw": red_claw,
 };

package/src/modes/theme/defaults/opencode.json

@@ -0,0 +1,102 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/gajae-code/main/packages/coding-agent/theme-schema.json",
+	"name": "opencode",
+	"vars": {
+		"background": "#212121",
+		"currentLine": "#252525",
+		"selection": "#303030",
+		"backgroundDarker": "#121212",
+		"foreground": "#e0e0e0",
+		"comment": "#6a6a6a",
+		"primary": "#fab283",
+		"secondary": "#5c9cf5",
+		"accentPurple": "#9d7cd8",
+		"errorRed": "#e06c75",
+		"warningOrange": "#f5a742",
+		"successGreen": "#7fd88f",
+		"infoCyan": "#56b6c2",
+		"emphasizedYellow": "#e5c07b",
+		"border": "#4b4c5c",
+		"diffAdded": "#478247",
+		"diffRemoved": "#7c4444",
+		"diffContext": "#a0a0a0",
+		"addedBg": "#303a30",
+		"removedBg": "#3a3030"
+	},
+	"colors": {
+		"accent": "primary",
+		"border": "border",
+		"borderAccent": "accentPurple",
+		"borderMuted": "comment",
+		"success": "successGreen",
+		"error": "errorRed",
+		"warning": "warningOrange",
+		"muted": "comment",
+		"dim": "comment",
+		"text": "foreground",
+		"thinkingText": "diffContext",
+		"selectedBg": "selection",
+		"userMessageBg": "currentLine",
+		"userMessageText": "foreground",
+		"customMessageBg": "currentLine",
+		"customMessageText": "foreground",
+		"customMessageLabel": "primary",
+		"toolPendingBg": "currentLine",
+		"toolSuccessBg": "addedBg",
+		"toolErrorBg": "removedBg",
+		"toolTitle": "foreground",
+		"toolOutput": "comment",
+		"mdHeading": "secondary",
+		"mdLink": "primary",
+		"mdLinkUrl": "infoCyan",
+		"mdCode": "successGreen",
+		"mdCodeBlock": "foreground",
+		"mdCodeBlockBorder": "border",
+		"mdQuote": "emphasizedYellow",
+		"mdQuoteBorder": "emphasizedYellow",
+		"mdHr": "comment",
+		"mdListBullet": "primary",
+		"toolDiffAdded": "diffAdded",
+		"toolDiffRemoved": "diffRemoved",
+		"toolDiffContext": "diffContext",
+		"syntaxComment": "comment",
+		"syntaxKeyword": "secondary",
+		"syntaxFunction": "primary",
+		"syntaxVariable": "errorRed",
+		"syntaxString": "successGreen",
+		"syntaxNumber": "accentPurple",
+		"syntaxType": "emphasizedYellow",
+		"syntaxOperator": "infoCyan",
+		"syntaxPunctuation": "foreground",
+		"thinkingOff": "comment",
+		"thinkingMinimal": "diffContext",
+		"thinkingLow": "infoCyan",
+		"thinkingMedium": "secondary",
+		"thinkingHigh": "accentPurple",
+		"thinkingXhigh": "errorRed",
+		"bashMode": "infoCyan",
+		"pythonMode": "accentPurple",
+		"statusLineBg": "backgroundDarker",
+		"statusLineSep": "border",
+		"statusLineModel": "primary",
+		"statusLinePath": "secondary",
+		"statusLineGitClean": "successGreen",
+		"statusLineGitDirty": "warningOrange",
+		"statusLineContext": "infoCyan",
+		"statusLineSpend": "emphasizedYellow",
+		"statusLineStaged": "diffAdded",
+		"statusLineDirty": "warningOrange",
+		"statusLineUntracked": "errorRed",
+		"statusLineOutput": "foreground",
+		"statusLineCost": "primary",
+		"statusLineSubagents": "accentPurple"
+	},
+	"export": {
+		"pageBg": "#121212",
+		"cardBg": "#212121",
+		"infoBg": "#252525"
+	},
+	"symbols": {
+		"preset": "unicode"
+	}
+}

package/src/modes/theme/theme.ts

@@ -810,7 +810,7 @@ const colorValueSchema = z.union([
 
 type ColorValue = z.infer<typeof colorValueSchema>;
 
-const THEME_COLOR_KEYS = [
+export const THEME_COLOR_KEYS = [
 	"accent",
 	"border",
 	"borderAccent",
@@ -1648,7 +1648,7 @@ async function loadThemeJson(name: string): Promise<ThemeJson> {
 			errorMessage += `\nMissing required color tokens:\n`;
 			errorMessage += missingColors.map(c => `  - ${c}`).join("\n");
 			errorMessage += `\n\nPlease add these colors to your theme's "colors" object.`;
-			errorMessage += `\nSee the built-in themes (red-claw.json, blue-crab.json) for reference values.`;
+			errorMessage += `\nSee the built-in themes under src/modes/theme/defaults/ for reference values.`;
 		}
 		if (otherErrors.length > 0) {
 			errorMessage += `\n\nOther errors:\n${otherErrors.join("\n")}`;

package/src/modes/types.ts

@@ -109,7 +109,7 @@ export interface InteractiveModeContext {
 	retryLoader: Loader | undefined;
 	autoCompactionEscapeHandler?: () => void;
 	retryEscapeHandler?: () => void;
-	retryCountdownTimer?: ReturnType<typeof setInterval>;
+	retryCountdownTimer?: NodeJS.Timeout;
 	unsubscribe?: () => void;
 	onInputCallback?: (input: SubmittedUserInput) => void;
 	optimisticUserMessageSignature: string | undefined;

package/src/prompts/agents/executor.md

@@ -36,10 +36,13 @@ This mode activates only when the assignment explicitly labels Executor as Ultra
 
 When active:
 - Start from the approved plan/spec/acceptance criteria, then user-facing contracts, then implementation code only as supporting evidence. Treat plan/code mismatches as blockers.
-- Exercise the real user-facing invocation rather than inspecting internals alone: GUI/web uses browser automation plus screenshot or image verdict; CLI uses logs or terminal transcripts; API/package uses external consumer or black-box tests through the public interface; algorithm/math uses boundary, property, adversarial, and failure-mode cases.
+- Exercise the real user-facing invocation rather than inspecting internals alone. Live artifacts must be runtime-valid: GUI/web needs a real automation transcript plus non-uniform screenshot; CLI needs executed argv-only replay; native/desktop/TUI needs a real screenshot, PTY capture with control codes, or app-automation transcript. `inlineEvidence` is supplemental only and is never sole proof for live surfaces.
+- For CLI evidence, emit argv-only replay JSON with `schemaVersion: 1`, `kind: "cli-replay"`, `replaySafe: true`, and `command` as a string array. Use only allowlisted deterministic executables/arguments, or mark unsafe/non-deterministic commands with audited `replayExempt` metadata plus a valid structural fallback artifact.
+- Native/TUI evidence must be structural, not prose-only: screenshot, app transcript, or PTY artifact with terminal control codes.
+- Do not call the `ask` tool while an Ultragoal run is active; record unresolved decisions with `gjc ultragoal record-review-blockers`.
 - Try to break the work with adversarial cases, not just happy-path confirmations.
 - Report the QA matrix with the final field names `executorQa.contractCoverage`, `executorQa.surfaceEvidence`, `executorQa.adversarialCases`, and `executorQa.artifactRefs`.
-- Include artifact refs for every executed surface and adversarial case: transcript ids, log paths, screenshots, image verdicts, test outputs, or other durable evidence.
+- Include artifact refs for every executed surface and adversarial case: transcript ids, log paths, screenshots, image verdicts, CLI replay records, PTY captures, test outputs, or other durable evidence.
 - Use `status: "not_applicable"` only for rows in `executorQa.contractCoverage` and `executorQa.surfaceEvidence`; each not-applicable row requires `contractRef` plus `reason`. `executorQa.adversarialCases` rows cannot be not-applicable.
 - Report blockers for any missing plan/spec/acceptance source, contract ambiguity, plan/code mismatch, untestable surface, failed adversarial case, shallow evidence, or missing artifact ref.
 </ultragoal_red_team_mode>