@gajae-code/coding-agent 0.6.3 → 0.6.5

package/src/skill-state/deep-interview-mutation-guard.ts

@@ -4,6 +4,8 @@ import * as path from "node:path";
 import type { AgentTool } from "@gajae-code/agent-core";
 import { logger } from "@gajae-code/utils";
 import { expandApplyPatchToEntries } from "../edit/modes/apply-patch";
+import { GJC_SESSION_PREFIX, modeStatePath as sessionModeStatePath } from "../gjc-runtime/session-layout";
+import { resolveGjcSessionForRead } from "../gjc-runtime/session-resolution";
 import { ModeStateSchema } from "../gjc-runtime/state-schema";
 import { LocalProtocolHandler, resolveLocalUrlToPath } from "../internal-urls/local-protocol";
 import { resolveToCwd } from "../tools/path-utils";
@@ -31,27 +33,10 @@ function planningPhaseBlockMessage(skill: CanonicalGjcWorkflowSkill): string {
 	return DEEP_INTERVIEW_MUTATION_BLOCK_MESSAGE;
 }
 
-const BLOCKED_TOOL_NAMES = new Set(["edit", "write", "ast_edit", "bash"]);
+const BLOCKED_TOOL_NAMES = new Set(["edit", "write", "ast_edit"]);
 const ARCHIVE_OR_SQLITE_BASE_RE = /^(.+?\.(?:tar\.gz|sqlite3|sqlite|db3|zip|tgz|tar|db))(?:$|:)/i;
 const INTERNAL_SCHEME_RE = /^[a-z][a-z0-9+.-]*:\/\//i;
 const VIM_FILE_SWITCH_RE = /^\s*:(?:e|e!|edit|edit!)(?:\s+([^<\r\n]+))?(?:<CR>|\r|\n|$)/i;
-const BASH_TOKEN_RE = /'[^']*'|"(?:\\.|[^"\\])*"|\S+/g;
-const BASH_REDIRECT_RE = /^(?:\d*)>>?$/;
-const BASH_HEREDOC_RE = /^(?:\d*)<<-?$/;
-// Shell command-list / redirection / substitution operators. Includes `\r` and
-// `\n` because the shell treats a newline as a command separator and tool command
-// strings can be multiline (e.g. heredocs).
-const BASH_CONTROL_OPERATOR_RE = /[;&|<>`\r\n]|\$\(/;
-// Best-effort, defense-in-depth bash mutation detection. The authoritative
-// planning-phase guard is the dedicated `write`/`edit`/`ast_edit` tools (fully
-// pathed); this catches the common shell mutators plus all redirect targets so a
-// cooperative agent cannot trivially side-step those tools. It is deliberately
-// NOT exhaustive: arbitrary interpreters (`python -c`, `node -e`) and the
-// `key=value` operand forms of utilities like `dd of=` are not parsed, and path
-// classification is lexical (no realpath), matching the rest of this guard and
-// the broader `.gjc` path handling. Hardening any of these would require a real
-// shell parser / symlink resolution and is out of scope for the planning rails.
-const BASH_MUTATION_COMMANDS = new Set(["rm", "mv", "cp", "touch", "mkdir", "ln", "tee"]);
 
 type ToolWithEditMode = AgentTool & {
 	mode?: unknown;
@@ -93,15 +78,18 @@ function safeString(value: unknown): string {
 	return typeof value === "string" ? value : "";
 }
 
-function encodePathSegment(value: string): string {
-	return encodeURIComponent(value).replaceAll(".", "%2E");
+async function resolveBoundarySessionId(cwd: string, sessionId?: string): Promise<string | null> {
+	const normalizedSessionId = sessionId?.trim();
+	if (normalizedSessionId) return normalizedSessionId;
+	try {
+		return (await resolveGjcSessionForRead(cwd, { envSessionId: process.env.GJC_SESSION_ID })).gjcSessionId;
+	} catch {
+		return null;
+	}
 }
 
-function modeStatePath(cwd: string, skill: string, sessionId?: string): string {
-	const stateDir = path.join(cwd, ".gjc", "state");
-	const fileName = `${skill}-state.json`;
-	if (sessionId) return path.join(stateDir, "sessions", encodePathSegment(sessionId), fileName);
-	return path.join(stateDir, fileName);
+function modeStatePath(cwd: string, skill: string, sessionId: string): string {
+	return sessionModeStatePath(cwd, sessionId, skill);
 }
 
 function warnInvalidModeState(filePath: string, error: string): void {
@@ -129,12 +117,8 @@ async function readValidatedModeState(filePath: string): Promise<ModeState | nul
 	}
 	return state;
 }
-async function readVisibleModeState(cwd: string, skill: string, sessionId?: string): Promise<ModeState | null> {
-	if (sessionId) {
-		const sessionState = await readValidatedModeState(modeStatePath(cwd, skill, sessionId));
-		if (sessionState) return sessionState;
-	}
-	return await readValidatedModeState(modeStatePath(cwd, skill));
+async function readVisibleModeState(cwd: string, skill: string, sessionId: string): Promise<ModeState | null> {
+	return await readValidatedModeState(modeStatePath(cwd, skill, sessionId));
 }
 
 /**
@@ -228,16 +212,20 @@ async function getActivePlanningSkill(
 	sessionId?: string,
 	threadId?: string,
 ): Promise<ActivePlanningSkill | null> {
-	const skillState = await readVisibleSkillActiveState(cwd, sessionId);
+	const resolvedSessionId = await resolveBoundarySessionId(cwd, sessionId);
+	if (!resolvedSessionId) return null;
+	const skillState = await readVisibleSkillActiveState(cwd, resolvedSessionId);
 	if (!skillState) return null;
-	const activeEntries = listActiveSkills(skillState).filter(entry => entryMatchesContext(entry, sessionId, threadId));
+	const activeEntries = listActiveSkills(skillState).filter(entry =>
+		entryMatchesContext(entry, resolvedSessionId, threadId),
+	);
 	if (activeEntries.length === 0) return null;
 	const current = resolveCurrentWorkflowEntry(activeEntries, safeString(skillState.skill).trim());
 	if (!isPlanningSkill(current.skill)) return null;
-	const modeState = await readVisibleModeState(cwd, current.skill, sessionId);
+	const modeState = await readVisibleModeState(cwd, current.skill, resolvedSessionId);
 	if (!modeState) return null;
 	if (modeState.active !== true) return null;
-	if (!modeStateMatchesContext(modeState, sessionId, threadId)) return null;
+	if (!modeStateMatchesContext(modeState, resolvedSessionId, threadId)) return null;
 	const phase = String(modeState.current_phase ?? current.phase ?? "").trim();
 	if (!isBlockingPlanningPhase(current.skill, phase)) return null;
 	return { skill: current.skill, phase };
@@ -342,81 +330,10 @@ function extractEditTargets(args: unknown, tool: ToolWithEditMode): ExtractedTar
 	return targets;
 }
 
-function extractBashTargets(args: unknown): ExtractedTargets {
-	const record = getRecord(args);
-	const command = safeString(record?.command).trim();
-	const targets: ExtractedTargets = { paths: [], unknown: false };
-	if (!command) {
-		targets.unknown = true;
-		return targets;
-	}
-	// Fast path for a sanctioned `gjc …` invocation, but ONLY when it is a single
-	// command with no shell control operators or redirects. Otherwise a compound
-	// like `gjc … ; tee src/x` or `gjc … > .gjc/state/foo` would skip scanning and
-	// bypass both the planning block and the always-on `.gjc/**` block, so fall
-	// through to full token scanning (which leaves the `gjc` segment's own args
-	// unextracted but still catches the trailing mutation/redirect).
-	if (/^gjc(?:\s|$)/.test(command) && !BASH_CONTROL_OPERATOR_RE.test(command)) return targets;
-
-	const tokens = command.match(BASH_TOKEN_RE)?.map(unquoteBashToken) ?? [];
-	for (let index = 0; index < tokens.length; index++) {
-		const token = tokens[index] ?? "";
-		if (BASH_REDIRECT_RE.test(token)) {
-			addPath(targets, tokens[index + 1]);
-			index++;
-			continue;
-		}
-		const redirectMatch = token.match(/^(?:\d*)>>?(.+)$/);
-		if (redirectMatch?.[1]) {
-			addPath(targets, redirectMatch[1]);
-			continue;
-		}
-		// A heredoc delimiter (`<<EOF`) is a here-document word, NOT a filesystem
-		// target. Consume it without recording a target so a legitimate
-		// `cat <<EOF > /tmp/scratch.md` is judged solely by its redirect target.
-		if (BASH_HEREDOC_RE.test(token)) {
-			index++;
-			continue;
-		}
-		if (/^(?:\d*)<<-?.+$/.test(token)) {
-			continue;
-		}
-		if (isMutationBashCommand(tokens, index)) {
-			for (let targetIndex = index + 1; targetIndex < tokens.length; targetIndex++) {
-				const target = tokens[targetIndex] ?? "";
-				if (isBashCommandBoundary(target)) break;
-				if (target.startsWith("-")) continue;
-				addPath(targets, target);
-			}
-		}
-	}
-	return targets;
-}
-
-function unquoteBashToken(token: string): string {
-	if (token.length < 2) return token;
-	const quote = token[0];
-	if ((quote === "'" || quote === '"') && token.at(-1) === quote) return token.slice(1, -1);
-	return token;
-}
-
-function isBashCommandBoundary(token: string): boolean {
-	return [";", "&&", "||", "|"].includes(token);
-}
-
-function isMutationBashCommand(tokens: string[], index: number): boolean {
-	const token = path.basename(tokens[index] ?? "");
-	if (BASH_MUTATION_COMMANDS.has(token)) return true;
-	if (token !== "sed") return false;
-	const next = tokens[index + 1] ?? "";
-	return next === "-i" || next.startsWith("-i") || next.includes("i");
-}
-
 function extractTargets(tool: ToolWithEditMode, args: unknown): ExtractedTargets {
 	if (tool.name === "write") return extractWriteTargets(args);
 	if (tool.name === "ast_edit") return extractAstEditTargets(args);
 	if (tool.name === "edit") return extractEditTargets(args, tool);
-	if (tool.name === "bash") return extractBashTargets(args);
 	return { paths: [], unknown: true };
 }
 
@@ -460,8 +377,9 @@ function relativeGjcSegments(cwd: string, rawPath: string): string[] | null {
 function blockedWorkflowStateSkill(cwd: string, rawPath: string): CanonicalGjcWorkflowSkill | null {
 	const segments = relativeGjcSegments(cwd, rawPath);
 	if (segments?.[0] !== ".gjc") return null;
-	if (segments[1] === "specs" || segments[1] === "plans") return null;
-	if (segments[1] !== "state") return null;
+	const generatedRoot = segments[1]?.startsWith(GJC_SESSION_PREFIX) ? segments[2] : segments[1];
+	if (generatedRoot === "specs" || generatedRoot === "plans") return null;
+	if (generatedRoot !== "state") return null;
 	const fileName = segments.at(-1) ?? "";
 	for (const skillName of ["deep-interview", "ralplan", "ultragoal", "team"] as const) {
 		if (fileName === workflowModeStateFileName(skillName)) return skillName;
@@ -481,7 +399,8 @@ function firstBlockedWorkflowStateSkill(cwd: string, targets: ExtractedTargets):
 function isAllowlistedPath(cwd: string, rawPath: string): boolean {
 	const segments = relativeGjcSegments(cwd, rawPath);
 	if (segments?.[0] !== ".gjc") return false;
-	return segments[1] === "specs" || segments[1] === "plans";
+	const generatedRoot = segments[1]?.startsWith(GJC_SESSION_PREFIX) ? segments[2] : segments[1];
+	return generatedRoot === "specs" || generatedRoot === "plans";
 }
 function isBlockedGjcPath(cwd: string, rawPath: string): boolean {
 	const segments = relativeGjcSegments(cwd, rawPath);

package/src/skill-state/workflow-hud.ts

@@ -40,7 +40,7 @@ interface UltragoalHudState extends WorkflowGateHudState {
 	currentGoal?: UltragoalLikeGoal;
 	counts: Record<string, number>;
 	goals: UltragoalLikeGoal[];
-	latestLedgerEvent?: { event?: string; goalId?: string; timestamp?: string };
+	latestLedgerEvent?: { event?: string; goalId?: string; timestamp?: string; kind?: string; evidence?: string };
 	updatedAt?: string;
 }
 
@@ -237,7 +237,9 @@ export function buildUltragoalHudSummary(state: UltragoalHudState): WorkflowHudS
 			chip(
 				"ledger",
 				state.latestLedgerEvent?.event
-					? [state.latestLedgerEvent.event, state.latestLedgerEvent.goalId].filter(Boolean).join(":")
+					? [state.latestLedgerEvent.event, state.latestLedgerEvent.kind, state.latestLedgerEvent.goalId]
+							.filter(Boolean)
+							.join(":")
 					: undefined,
 				35,
 			),

package/src/skill-state/workflow-state-contract.ts

@@ -141,10 +141,10 @@ export function sanctionedWorkflowStateCommand(skill: CanonicalGjcWorkflowSkill)
 export function describeWorkflowStateContract(skill: CanonicalGjcWorkflowSkill): string[] {
 	return [
 		`Sanctioned mutation path: gjc state ${skill} read|write --input '<json>'`,
-		`Canonical active HUD state: .gjc/state/${SKILL_ACTIVE_STATE_FILE} and .gjc/state/sessions/<session>/${SKILL_ACTIVE_STATE_FILE}`,
-		`Skill mode state: .gjc/state/${workflowModeStateFileName(skill)} or .gjc/state/sessions/<session>/${workflowModeStateFileName(skill)}`,
+		`Canonical active HUD state: .gjc/_session-{sessionid}/state/${SKILL_ACTIVE_STATE_FILE}`,
+		`Skill mode state: .gjc/_session-{sessionid}/state/${workflowModeStateFileName(skill)}`,
 		"Receipts include version, skill, owner, command, state_path, storage_path, mutated_at, fresh_until, status, and mutation_id.",
 		"Receipts are fresh for 30 minutes; older receipts are stale and render as HUD warnings.",
-		"Planning artifacts under .gjc/specs/** and .gjc/plans/** remain writable outside the state command.",
+		"Planning artifacts under .gjc/_session-{sessionid}/specs/** and .gjc/_session-{sessionid}/plans/** remain writable outside the state command.",
 	];
 }

package/src/slash-commands/builtin-registry.ts

@@ -250,11 +250,15 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 		inlineHint: "[objective]",
 		allowArgs: true,
 		handleTui: async (command, runtime) => {
-			const hadArgs = !!command.args;
-			// Capture state BEFORE the call (see /plan above for rationale).
-			const wasGoalModeEnabled = runtime.ctx.goalModeEnabled;
+			// The goal command always consumes the typed input: it either submits
+			// the bare objective (never the literal `/goal …` text the user typed)
+			// or shows a warning, so the normal submission path never records it in
+			// input history. Preserve the typed command whenever args were supplied
+			// — including the first-time `/goal set <objective>` case where goal
+			// mode was not yet active. A previous `wasGoalModeEnabled` guard dropped
+			// that first-time case from history (up/down-arrow recall).
 			await runtime.ctx.handleGoalModeCommand(command.args || undefined);
-			if (hadArgs && wasGoalModeEnabled) {
+			if (command.args) {
 				runtime.ctx.editor.addToHistory(command.text);
 			}
 			runtime.ctx.editor.setText("");

package/src/system-prompt.ts

@@ -253,15 +253,17 @@ export async function loadProjectContextFiles(
 
 	const result = await loadCapability(contextFileCapability.id, { cwd: resolvedCwd });
 
-	// Convert ContextFile items and preserve depth info
-	const files = result.items.map(item => {
-		const contextFile = item as ContextFile;
-		return {
-			path: contextFile.path,
-			content: contextFile.content,
-			depth: contextFile.depth,
-		};
-	});
+	// Convert project-level ContextFile items and preserve depth info
+	const files = result.items
+		.filter(item => (item as ContextFile).level === "project")
+		.map(item => {
+			const contextFile = item as ContextFile;
+			return {
+				path: contextFile.path,
+				content: contextFile.content,
+				depth: contextFile.depth,
+			};
+		});
 
 	// Sort by depth (descending): higher depth (farther from cwd) comes first,
 	// so files closer to cwd appear later and are more prominent

package/src/task/agents.ts

@@ -3,20 +3,14 @@
  *
  * Agents are embedded at build time via Bun's import with { type: "text" }.
  */
-import { Effort } from "@gajae-code/ai";
 import { parseFrontmatter, prompt } from "@gajae-code/utils";
 import { parseAgentFields } from "../discovery/helpers";
+// Embed agent markdown files at build time
 import architectMd from "../prompts/agents/architect.md" with { type: "text" };
 import criticMd from "../prompts/agents/critic.md" with { type: "text" };
 import executorMd from "../prompts/agents/executor.md" with { type: "text" };
-import exploreMd from "../prompts/agents/explore.md" with { type: "text" };
-// Embed agent markdown files at build time
 import agentFrontmatterTemplate from "../prompts/agents/frontmatter.md" with { type: "text" };
-
-import planMd from "../prompts/agents/plan.md" with { type: "text" };
 import plannerMd from "../prompts/agents/planner.md" with { type: "text" };
-import reviewerMd from "../prompts/agents/reviewer.md" with { type: "text" };
-import taskMd from "../prompts/agents/task.md" with { type: "text" };
 
 import type { AgentDefinition, AgentSource } from "./types";
 
@@ -50,21 +44,6 @@ const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
 	{ fileName: "architect.md", template: architectMd },
 	{ fileName: "planner.md", template: plannerMd },
 	{ fileName: "critic.md", template: criticMd },
-	{ fileName: "explore.md", template: exploreMd },
-	{ fileName: "plan.md", template: planMd },
-	{ fileName: "reviewer.md", template: reviewerMd },
-	{
-		fileName: "task.md",
-		frontmatter: {
-			name: "task",
-			description: "General-purpose subagent with full capabilities for delegated multi-step tasks",
-			spawns: "*",
-			model: "pi/default",
-			thinkingLevel: Effort.Medium,
-			hide: true,
-		},
-		template: taskMd,
-	},
 ];
 
 // Computed lazily on first loadBundledAgents() call to avoid eager prompt.render at module load.

package/src/task/index.ts

@@ -55,7 +55,7 @@ import { assertNoRawTaskFields, buildTaskReceipt, buildTaskRoiSummary } from "./
 import { renderResult, renderCall as renderTaskCall } from "./render";
 import { reconcileSpawnRoi } from "./roi-reconciliation";
 import { getTaskSimpleModeCapabilities, type TaskSimpleMode } from "./simple-mode";
-import { DEFAULT_SPAWN_THRESHOLD, evaluateReviewerExploreGate, evaluateSpawnGate } from "./spawn-gate";
+import { DEFAULT_SPAWN_THRESHOLD, evaluateSpawnGate } from "./spawn-gate";
 import {
 	applyNestedPatches,
 	captureBaseline,
@@ -359,7 +359,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 	readonly renderResult = renderResult;
 	readonly #discoveredAgents: AgentDefinition[];
 	readonly #blockedAgent: string | undefined;
-	readonly #spawningAgentType: string | undefined;
 
 	get parameters(): TaskToolSchemaInstance {
 		const isolationEnabled = this.session.settings.get("task.isolation.mode") !== "none";
@@ -391,7 +390,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		discoveredAgents: AgentDefinition[],
 	) {
 		this.#blockedAgent = $env.PI_BLOCKED_AGENT;
-		this.#spawningAgentType = session.currentAgentType;
 		this.#discoveredAgents = discoveredAgents;
 	}
 
@@ -478,23 +476,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 			};
 		}
 
-		const reviewerExploreDecision = evaluateReviewerExploreGate({
-			spawningAgentType: this.#spawningAgentType,
-			targetAgent: params.agent,
-			plan: params.spawnPlan,
-		});
-		if (reviewerExploreDecision.outcome === "rejected") {
-			return {
-				content: [
-					{
-						type: "text",
-						text: `Task spawn gate rejected reviewer->explore: ${reviewerExploreDecision.reason}. Provide spawnPlan fields: ${reviewerExploreDecision.missingFields.join(", ")}.`,
-					},
-				],
-				details: { projectAgentsDir: null, results: [], totalDurationMs: 0 },
-			};
-		}
-
 		const manager = AsyncJobManager.instance();
 		if (!manager) {
 			return {
@@ -1083,27 +1064,6 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 			};
 		}
 
-		const reviewerExploreDecision = evaluateReviewerExploreGate({
-			spawningAgentType: this.#spawningAgentType,
-			targetAgent: agentName,
-			plan: params.spawnPlan,
-		});
-		if (reviewerExploreDecision.outcome === "rejected") {
-			return {
-				content: [
-					{
-						type: "text",
-						text: `Task spawn gate rejected reviewer->explore: ${reviewerExploreDecision.reason}. Provide spawnPlan fields: ${reviewerExploreDecision.missingFields.join(", ")}.`,
-					},
-				],
-				details: {
-					projectAgentsDir,
-					results: [],
-					totalDurationMs: Date.now() - startTime,
-				},
-			};
-		}
-
 		let repoRoot: string | null = null;
 		let baseline: WorktreeBaseline | null = null;
 		if (isIsolated) {

package/src/task/spawn-gate.ts

@@ -1,7 +1,7 @@
 /** The hard, locked batch threshold enforced by the runtime gate. */
 export const DEFAULT_SPAWN_THRESHOLD = 4;
 
-/** The justification a large batch or reviewer-spawned explorer must supply to pass the hard gate. */
+/** The justification a large batch must supply to pass the hard gate. */
 export interface SpawnPlanReceipt {
 	whyParallel: string;
 	whyNotLocal: string;
@@ -17,15 +17,6 @@ export interface SpawnGateRequest {
 	plan?: SpawnPlanReceipt;
 }
 
-export interface ReviewerExploreGateRequest {
-	/** Agent type/name doing the spawning, when known. */
-	spawningAgentType?: string | null;
-	/** Target agent type/name requested by the task call. */
-	targetAgent: string;
-	/** The spawn-plan receipt, when provided. */
-	plan?: SpawnPlanReceipt;
-}
-
 export type SpawnGateOutcome = "allowed" | "rejected";
 
 export interface SpawnGateDecision {
@@ -102,31 +93,3 @@ export function decide(childCount: number, threshold: number, plan: SpawnPlanRec
 export function evaluateSpawnGate(request: SpawnGateRequest): SpawnGateDecision {
 	return decide(request.childCount, DEFAULT_SPAWN_THRESHOLD, request.plan);
 }
-
-export function evaluateReviewerExploreGate(request: ReviewerExploreGateRequest): SpawnGateDecision {
-	if (request.spawningAgentType !== "reviewer" || request.targetAgent !== "explore") {
-		return {
-			outcome: "allowed",
-			reason: "reviewer->explore gate does not apply",
-			planRequired: false,
-			missingFields: [],
-		};
-	}
-
-	const missingFields = findMissingPlanFields(request.plan);
-	if (missingFields.length > 0) {
-		return {
-			outcome: "rejected",
-			reason: `reviewer->explore spawn requires a complete spawn-plan receipt (${missingFields.join(", ")})`,
-			planRequired: true,
-			missingFields,
-		};
-	}
-
-	return {
-		outcome: "allowed",
-		reason: "reviewer->explore spawn has a complete spawn-plan receipt",
-		planRequired: true,
-		missingFields: [],
-	};
-}

package/src/task/types.ts

@@ -72,7 +72,7 @@ const spawnPlanSchema = z
 		expectedReceiptShape: z.string(),
 		maxInlineTokens: z.number(),
 	})
-	.describe("justification required before spawning more than four tasks or reviewer-spawned explore tasks");
+	.describe("justification required before spawning more than four tasks");
 
 const createTaskItemSchema = (_contextEnabled: boolean) =>
 	z.object({

package/src/tools/ask.ts

@@ -34,7 +34,7 @@ import {
 	renderDeepInterviewAskQuestion,
 } from "../deep-interview/render-middleware";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import { appendOrMergeDeepInterviewRound } from "../gjc-runtime/deep-interview-recorder";
+import { appendOrMergeDeepInterviewRound, syncDeepInterviewRecorderHud } from "../gjc-runtime/deep-interview-recorder";
 import { deepInterviewStatePath } from "../gjc-runtime/deep-interview-runtime";
 import { gateAnswerToResult, questionToGate } from "../modes/shared/agent-wire/deep-interview-gate";
 import { getMarkdownTheme, type Theme, theme } from "../modes/theme/theme";
@@ -104,6 +104,30 @@ export interface AskToolDetails {
 const OTHER_OPTION = "Other (type your own)";
 const RECOMMENDED_SUFFIX = " (Recommended)";
 const DEEP_INTERVIEW_SELECTOR_SCROLL_TITLE_ROWS = Number.MAX_SAFE_INTEGER;
+const DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS = 250;
+
+function errorMessage(error: unknown): string {
+	return error instanceof Error ? error.message : String(error);
+}
+
+async function awaitDeepInterviewRecorderPersistence(persistence: Promise<void>): Promise<void> {
+	let timeout: ReturnType<typeof setTimeout> | undefined;
+	try {
+		await Promise.race([
+			persistence,
+			new Promise<never>((_resolve, reject) => {
+				timeout = setTimeout(
+					() => reject(new Error(`timed out after ${DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS}ms`)),
+					DEEP_INTERVIEW_RECORDER_AWAIT_TIMEOUT_MS,
+				);
+			}),
+		]);
+	} catch (error) {
+		logger.warn(`ask: deep-interview round recording failed: ${errorMessage(error)}`);
+	} finally {
+		if (timeout) clearTimeout(timeout);
+	}
+}
 
 function getDoneOptionLabel(): string {
 	return `${theme.status.success} Done selecting`;
@@ -481,11 +505,11 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 	): Promise<void> {
 		const meta = q.deepInterview;
 		if (!meta) return;
-		try {
-			const cwd = this.session.cwd;
-			const sessionId = this.session.getSessionId?.() ?? undefined;
-			const statePath = deepInterviewStatePath(cwd, sessionId);
-			await appendOrMergeDeepInterviewRound(
+		const cwd = this.session.cwd;
+		const sessionId = this.session.getSessionId?.() ?? undefined;
+		const statePath = deepInterviewStatePath(cwd, sessionId);
+		await awaitDeepInterviewRecorderPersistence(
+			appendOrMergeDeepInterviewRound(
 				cwd,
 				statePath,
 				{
@@ -500,12 +524,10 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 					customInput,
 				},
 				{ sessionId },
-			);
-		} catch (error) {
-			logger.warn(
-				`ask: deep-interview round recording failed: ${error instanceof Error ? error.message : String(error)}`,
-			);
-		}
+			).then(async () => {
+				await syncDeepInterviewRecorderHud(cwd, statePath, sessionId);
+			}),
+		);
 	}
 
 	async execute(