@gajae-code/coding-agent 0.5.1 → 0.5.2

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>

package/src/sdk.ts

@@ -115,6 +115,7 @@ import {
 	FindTool,
 	getSearchTools,
 	HIDDEN_TOOLS,
+	isConfigurableSearchProviderId,
 	isSearchProviderPreference,
 	type LspStartupServerInfo,
 	loadSshTool,
@@ -124,6 +125,7 @@ import {
 	SearchTool,
 	setPreferredImageProvider,
 	setPreferredSearchProvider,
+	setSearchFallbackProviders,
 	type Tool,
 	type ToolSession,
 	WebSearchTool,
@@ -133,6 +135,7 @@ import {
 import { ToolContextStore } from "./tools/context";
 import { getImageGenTools } from "./tools/image-gen";
 import { wrapToolWithMetaNotice } from "./tools/output-meta";
+import { guardToolForUltragoalAsk } from "./tools/ultragoal-ask-guard";
 import { EventBus } from "./utils/event-bus";
 import { buildNamedToolChoice, buildNamedToolChoiceResult } from "./utils/tool-choice";
 import { buildWorkspaceTree, type WorkspaceTree } from "./workspace-tree";
@@ -865,6 +868,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	if (typeof webSearchProvider === "string" && isSearchProviderPreference(webSearchProvider)) {
 		setPreferredSearchProvider(webSearchProvider);
 	}
+	const webSearchFallback = settings.get("web_search.fallback");
+	if (Array.isArray(webSearchFallback)) {
+		setSearchFallbackProviders(
+			webSearchFallback.filter(value => typeof value === "string" && isConfigurableSearchProviderId(value)),
+		);
+	}
 
 	const imageProvider = settings.get("providers.image");
 	if (
@@ -1806,7 +1815,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 		const initialTools = initialToolNames
 			.map(name => toolRegistry.get(name))
-			.filter((tool): tool is AgentTool => tool !== undefined);
+			.filter((tool): tool is AgentTool => tool !== undefined)
+			// AgentSession tool wrapping is not installed until after Agent construction.
+			.map(tool => guardToolForUltragoalAsk(tool, () => sessionManager.getCwd()));
 
 		const openaiWebsocketSetting = settings.get("providers.openaiWebsockets") ?? "off";
 		const preferOpenAICodexWebsockets =

package/src/session/agent-session.ts

@@ -240,6 +240,7 @@ import { normalizeLocalScheme, resolveToCwd } from "../tools/path-utils";
 import { getLatestTodoPhasesFromEntries, type TodoItem, type TodoPhase } from "../tools/todo-write";
 import { ToolAbortError, ToolError } from "../tools/tool-errors";
 import { clampTimeout } from "../tools/tool-timeouts";
+import { guardToolForUltragoalAsk } from "../tools/ultragoal-ask-guard";
 import { parseCommandArgs } from "../utils/command-args";
 import { type EditMode, resolveEditMode } from "../utils/edit-mode";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
@@ -1186,6 +1187,7 @@ export class AgentSession {
 				};
 		this.agent.setProviderResponseInterceptor(this.#onResponse);
 		this.agent.setRawSseEventInterceptor(this.#onSseEvent);
+		this.#setGuardedAgentTools(this.agent.state.tools);
 		this.yieldQueue = new YieldQueue({
 			isStreaming: () => this.isStreaming,
 			injectStreaming: message => this.agent.followUp(message),
@@ -3690,6 +3692,16 @@ export class AgentSession {
 		}) as T;
 	}
 
+	#prepareToolForExecution<T extends AgentTool>(tool: T): T {
+		return this.#wrapToolForDeepInterviewMutationGuard(
+			this.#wrapToolForAcpPermission(guardToolForUltragoalAsk(tool, () => this.sessionManager.getCwd())),
+		);
+	}
+
+	#setGuardedAgentTools(tools: AgentTool[]): void {
+		this.agent.setTools(tools.map(tool => this.#prepareToolForExecution(tool)));
+	}
+
 	async #applyActiveToolsByName(
 		toolNames: string[],
 		options?: { persistMCPSelection?: boolean; previousSelectedMCPToolNames?: string[] },
@@ -3701,7 +3713,7 @@ export class AgentSession {
 		for (const name of toolNames) {
 			const tool = this.#toolRegistry.get(name);
 			if (tool) {
-				tools.push(this.#wrapToolForDeepInterviewMutationGuard(this.#wrapToolForAcpPermission(tool)));
+				tools.push(tool);
 				validToolNames.push(name);
 			}
 		}
@@ -3718,7 +3730,7 @@ export class AgentSession {
 				this.#selectedDiscoveredToolNames.delete(name);
 			}
 		}
-		this.agent.setTools(tools);
+		this.#setGuardedAgentTools(tools);
 
 		// Active tool set changed → discoverable tool list (which excludes already-active tools)
 		// is now stale. Invalidate before any prompt-template hook reads the discovery list.
@@ -3976,6 +3988,9 @@ export class AgentSession {
 		if (uniqueToolNames.size !== nextToolNames.length) {
 			throw new Error("RPC host tool names must be unique");
 		}
+		if (uniqueToolNames.has("ask")) {
+			throw new Error('RPC host tool "ask" is reserved and cannot be supplied by the host');
+		}
 
 		for (const name of uniqueToolNames) {
 			if (this.#toolRegistry.has(name) && !this.#rpcHostToolNames.has(name)) {
@@ -4303,11 +4318,8 @@ export class AgentSession {
 		this.#toolRegistry.set(finalTool.name, finalTool);
 
 		if (!this.getActiveToolNames().includes(finalTool.name)) {
-			const activeTools = [
-				...this.agent.state.tools,
-				this.#wrapToolForDeepInterviewMutationGuard(this.#wrapToolForAcpPermission(finalTool)),
-			];
-			this.agent.setTools(activeTools);
+			const activeTools = [...this.agent.state.tools, finalTool];
+			this.#setGuardedAgentTools(activeTools);
 			this.#invalidateDiscoveryCaches();
 			void this.refreshBaseSystemPrompt().catch(error => {
 				logger.warn("Failed to refresh system prompt after workflow gate ask tool registration", {
@@ -4339,9 +4351,8 @@ export class AgentSession {
 		const activeToolNames = this.getActiveToolNames();
 		const activeTools = activeToolNames
 			.map(name => this.#toolRegistry.get(name))
-			.filter((tool): tool is AgentTool => tool !== undefined)
-			.map(tool => this.#wrapToolForAcpPermission(tool));
-		this.agent.setTools(activeTools);
+			.filter((tool): tool is AgentTool => tool !== undefined);
+		this.#setGuardedAgentTools(activeTools);
 	}
 
 	getCheckpointState(): CheckpointState | undefined {
@@ -9174,7 +9185,7 @@ export class AgentSession {
 					error: String(mcpError),
 				});
 				this.#selectedMCPToolNames = new Set(previousSelectedMCPToolNames);
-				this.agent.setTools(previousTools);
+				this.#setGuardedAgentTools(previousTools);
 				this.#baseSystemPrompt = previousBaseSystemPrompt;
 				this.agent.setSystemPrompt(previousSystemPrompt);
 			}

package/src/session/history-storage.ts

@@ -67,10 +67,14 @@ export class HistoryStorage {
 	// Prepared statements
 	#insertRowStmt: Statement;
 	#recentStmt: Statement;
+	#recentByCwdStmt: Statement;
 	#searchStmt: Statement;
+	#searchByCwdStmt: Statement;
 	#lastPromptStmt: Statement;
 	// Cache substring-fallback prepared statements keyed by token count.
 	#substringStmts = new Map<number, Statement>();
+	// Cache cwd-filtered substring-fallback statements keyed by token count.
+	#substringCwdStmts = new Map<number, Statement>();
 
 	// In-memory cache of last prompt to avoid sync DB reads on add
 	#lastPromptCache: string | null = null;
@@ -94,6 +98,7 @@ CREATE TABLE IF NOT EXISTS history (
 	cwd TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_history_created_at ON history(created_at DESC);
+CREATE INDEX IF NOT EXISTS idx_history_cwd_created_at ON history(cwd, created_at DESC);
 
 CREATE VIRTUAL TABLE IF NOT EXISTS history_fts USING fts5(prompt, content='history', content_rowid='id');
 
@@ -117,9 +122,15 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		this.#recentStmt = this.#db.prepare(
 			"SELECT id, prompt, created_at, cwd FROM history ORDER BY created_at DESC, id DESC LIMIT ?",
 		);
+		this.#recentByCwdStmt = this.#db.prepare(
+			"SELECT id, prompt, created_at, cwd FROM history WHERE cwd = ? ORDER BY created_at DESC, id DESC LIMIT ?",
+		);
 		this.#searchStmt = this.#db.prepare(
 			"SELECT h.id, h.prompt, h.created_at, h.cwd FROM history_fts f JOIN history h ON h.id = f.rowid WHERE history_fts MATCH ? ORDER BY h.created_at DESC, h.id DESC LIMIT ?",
 		);
+		this.#searchByCwdStmt = this.#db.prepare(
+			"SELECT h.id, h.prompt, h.created_at, h.cwd FROM history_fts f JOIN history h ON h.id = f.rowid WHERE history_fts MATCH ? AND h.cwd = ? ORDER BY h.created_at DESC, h.id DESC LIMIT ?",
+		);
 		this.#lastPromptStmt = this.#db.prepare("SELECT prompt FROM history ORDER BY id DESC LIMIT 1");
 
 		this.#insertRowStmt = this.#db.prepare("INSERT INTO history (prompt, cwd) VALUES (?, ?)");
@@ -158,12 +169,14 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		});
 	}
 
-	getRecent(limit: number): HistoryEntry[] {
+	getRecent(limit: number, cwd?: string): HistoryEntry[] {
 		const safeLimit = this.#normalizeLimit(limit);
 		if (safeLimit === 0) return [];
 
 		try {
-			const rows = this.#recentStmt.all(safeLimit) as HistoryRow[];
+			const rows = (
+				cwd === undefined ? this.#recentStmt.all(safeLimit) : this.#recentByCwdStmt.all(cwd, safeLimit)
+			) as HistoryRow[];
 			return rows.map(row => this.#toEntry(row));
 		} catch (error) {
 			logger.error("HistoryStorage getRecent failed", { error: String(error) });
@@ -171,7 +184,7 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		}
 	}
 
-	search(query: string, limit: number): HistoryEntry[] {
+	search(query: string, limit: number, cwd?: string): HistoryEntry[] {
 		const safeLimit = this.#normalizeLimit(limit);
 		if (safeLimit === 0) return [];
 
@@ -184,7 +197,11 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		const ftsQuery = tokens.map(tok => `"${tok.replace(/"/g, '""')}"*`).join(" ");
 		let ftsRows: HistoryRow[] = [];
 		try {
-			ftsRows = this.#searchStmt.all(ftsQuery, safeLimit) as HistoryRow[];
+			ftsRows = (
+				cwd === undefined
+					? this.#searchStmt.all(ftsQuery, safeLimit)
+					: this.#searchByCwdStmt.all(ftsQuery, cwd, safeLimit)
+			) as HistoryRow[];
 		} catch (error) {
 			// Malformed FTS expression - fall through to substring path.
 			logger.debug("HistoryStorage FTS query failed, using substring only", { error: String(error) });
@@ -199,7 +216,7 @@ CREATE TRIGGER IF NOT EXISTS history_ai AFTER INSERT ON history BEGIN
 		//    by safeLimit, ordered by recency - no full-table load into JS.
 		let subRows: HistoryRow[] = [];
 		try {
-			subRows = this.#searchSubstring(tokens, safeLimit);
+			subRows = this.#searchSubstring(tokens, safeLimit, cwd);
 		} catch (error) {
 			logger.error("HistoryStorage substring search failed", { error: String(error) });
 		}
@@ -250,6 +267,7 @@ CREATE TABLE history (
 	cwd TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_history_created_at ON history(created_at DESC);
+CREATE INDEX IF NOT EXISTS idx_history_cwd_created_at ON history(cwd, created_at DESC);
 INSERT INTO history (id, prompt, created_at, cwd)
 SELECT id, prompt, created_at, cwd
 FROM history_legacy;
@@ -282,21 +300,24 @@ END;
 			.filter(tok => tok.length > 0);
 	}
 
-	#searchSubstring(tokens: string[], limit: number): HistoryRow[] {
-		const stmt = this.#getSubstringStmt(tokens.length);
+	#searchSubstring(tokens: string[], limit: number, cwd?: string): HistoryRow[] {
+		const stmt = this.#getSubstringStmt(tokens.length, cwd !== undefined);
 		const params: unknown[] = tokens.map(tok => `%${escapeLikePattern(tok)}%`);
+		if (cwd !== undefined) params.push(cwd);
 		params.push(limit);
 		return stmt.all(...(params as [string, ...unknown[]])) as HistoryRow[];
 	}
 
-	#getSubstringStmt(tokenCount: number): Statement {
-		let stmt = this.#substringStmts.get(tokenCount);
+	#getSubstringStmt(tokenCount: number, withCwd: boolean): Statement {
+		const cache = withCwd ? this.#substringCwdStmts : this.#substringStmts;
+		let stmt = cache.get(tokenCount);
 		if (stmt) return stmt;
 		const whereClause = Array(tokenCount).fill("prompt LIKE ? ESCAPE '\\' COLLATE NOCASE").join(" AND ");
+		const cwdClause = withCwd ? " AND cwd = ?" : "";
 		stmt = this.#db.prepare(
-			`SELECT id, prompt, created_at, cwd FROM history WHERE ${whereClause} ORDER BY created_at DESC, id DESC LIMIT ?`,
+			`SELECT id, prompt, created_at, cwd FROM history WHERE ${whereClause}${cwdClause} ORDER BY created_at DESC, id DESC LIMIT ?`,
 		);
-		this.#substringStmts.set(tokenCount, stmt);
+		cache.set(tokenCount, stmt);
 		return stmt;
 	}