@gajae-code/coding-agent 0.2.3 → 0.2.5

package/src/lsp/render.ts

@@ -103,7 +103,7 @@ export function renderResult(
 	args?: LspParams,
 ): Component {
 	const content = result.content?.[0];
-	if (!content || content.type !== "text" || !("text" in content) || !content.text) {
+	if (content?.type !== "text" || !("text" in content) || !content.text) {
 		const icon = formatStatusIcon("warning", theme, options.spinnerFrame);
 		const header = `${icon} LSP`;
 		return new Text([header, theme.fg("dim", "No result")].join("\n"), 0, 0);

package/src/memories/index.ts

@@ -12,6 +12,7 @@ import consolidationTemplate from "../prompts/memories/consolidation.md" with {
 import readPathTemplate from "../prompts/memories/read-path.md" with { type: "text" };
 import stageOneInputTemplate from "../prompts/memories/stage_one_input.md" with { type: "text" };
 import stageOneSystemTemplate from "../prompts/memories/stage_one_system.md" with { type: "text" };
+import unavailableTemplate from "../prompts/memories/unavailable.md" with { type: "text" };
 import type { AgentSession } from "../session/agent-session";
 import {
 	claimStage1Jobs,
@@ -153,20 +154,20 @@ export async function buildMemoryToolDeveloperInstructions(
 ): Promise<string | undefined> {
 	const cfg = loadMemoryConfig(settings);
 	if (!cfg.enabled) return undefined;
-	const memoryRoot = getMemoryRoot(agentDir, session?.sessionManager.getCwd() ?? settings.getCwd());
+	const memoryRoot = getMemoryRoot(agentDir, session?.sessionManager?.getCwd() ?? settings.getCwd());
 	const summaryPath = path.join(memoryRoot, "memory_summary.md");
 
 	let text: string;
 	try {
 		text = await Bun.file(summaryPath).text();
 	} catch {
-		return undefined;
+		return unavailableTemplate;
 	}
 
 	const summary = text.trim();
-	if (!summary) return undefined;
+	if (!summary) return unavailableTemplate;
 	const truncated = truncateByApproxTokens(summary, cfg.summaryInjectionTokenLimit);
-	if (!truncated.trim()) return undefined;
+	if (!truncated.trim()) return unavailableTemplate;
 
 	return prompt.render(readPathTemplate, {
 		memory_summary: truncated,

package/src/modes/acp/acp-agent.ts

@@ -272,7 +272,7 @@ async function elicitFromAcpClient(
 			finish(undefined);
 		});
 	const response = await promise;
-	if (!response || response.action !== "accept" || !response.content) {
+	if (response?.action !== "accept" || !response.content) {
 		return undefined;
 	}
 	return response.content.value;

package/src/modes/acp/acp-client-bridge.ts

@@ -1,6 +1,6 @@
 /**
  * ACP-side `ClientBridge` implementation. Wraps `AgentSideConnection` so the
- * `read`/`write`/`bash`/`edit` tools (and the permission gate in
+ * `read`/`write`/`bash`/`monitor`/`edit` tools (and the permission gate in
  * `AgentSession`) can route through the client when it advertises the
  * relevant capabilities at `initialize` time.
  */

package/src/modes/components/agent-dashboard.ts

@@ -121,7 +121,7 @@ function matchAgent(agent: DashboardAgent, query: string): boolean {
 function extractAssistantText(messages: AgentMessage[]): string | null {
 	for (let i = messages.length - 1; i >= 0; i--) {
 		const message = messages[i];
-		if (!message || message.role !== "assistant") continue;
+		if (message?.role !== "assistant") continue;
 		const blocks = message.content;
 		if (!Array.isArray(blocks)) continue;
 		const text = blocks

package/src/modes/components/diff.ts

@@ -151,7 +151,7 @@ export function renderDiff(diffText: string, options: RenderDiffOptions = {}): s
 			const removedLines: { lineNum: string; content: string }[] = [];
 			while (i < lines.length) {
 				const p = parseDiffLine(lines[i]);
-				if (!p || p.prefix !== "-") break;
+				if (p?.prefix !== "-") break;
 				removedLines.push({ lineNum: p.lineNum, content: p.content });
 				i++;
 			}
@@ -159,7 +159,7 @@ export function renderDiff(diffText: string, options: RenderDiffOptions = {}): s
 			const addedLines: { lineNum: string; content: string }[] = [];
 			while (i < lines.length) {
 				const p = parseDiffLine(lines[i]);
-				if (!p || p.prefix !== "+") break;
+				if (p?.prefix !== "+") break;
 				addedLines.push({ lineNum: p.lineNum, content: p.content });
 				i++;
 			}

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

@@ -21,7 +21,7 @@ import type {
 	StatusLineSeparatorStyle,
 } from "../../config/settings-schema";
 import { SETTING_TABS, TAB_METADATA } from "../../config/settings-schema";
-import { getSelectListTheme, getSettingsListTheme, theme } from "../../modes/theme/theme";
+import { getCurrentThemeName, getSelectListTheme, getSettingsListTheme, theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getTabBarTheme } from "../shared";
 import { DynamicBorder } from "./dynamic-border";
@@ -200,6 +200,10 @@ export interface StatusLinePreviewSettings {
 export interface SettingsCallbacks {
 	/** Called when any setting value changes */
 	onChange: (path: SettingPath, newValue: unknown) => void;
+	/** Called for theme preview while browsing theme settings */
+	onThemePreview?: (theme: string) => void | Promise<void>;
+	/** Called to restore the rendered theme when theme settings preview is cancelled */
+	onThemePreviewCancel?: (theme: string) => void | Promise<void>;
 	/** Called for status line preview while configuring */
 	onStatusLinePreview?: (settings: StatusLinePreviewSettings) => void;
 	/** Get current rendered status line for inline preview */
@@ -217,7 +221,6 @@ export interface SettingsCallbacks {
 export class SettingsSelectorComponent extends Container {
 	#tabBar: TabBar;
 	#currentList: SettingsList | null = null;
-	#currentSubmenu: Container | null = null;
 	#pluginComponent: PluginSettingsComponent | null = null;
 	#statusPreviewContainer: Container | null = null;
 	#statusPreviewText: Text | null = null;
@@ -374,10 +377,15 @@ export class SettingsSelectorComponent extends Container {
 		let onPreview: ((value: string) => void | Promise<void>) | undefined;
 		let onPreviewCancel: (() => void) | undefined;
 
-		// Theme selection is confirm-only: moving through the list must not mutate
-		// the rendered theme while the displayed/persisted setting still names
-		// the previous value. Confirmation persists through Settings hooks.
-		if (def.path === "statusLine.preset") {
+		if (def.path === "theme.dark" || def.path === "theme.light") {
+			const activeThemeBeforePreview = getCurrentThemeName() ?? currentValue;
+			onPreview = value => {
+				return this.callbacks.onThemePreview?.(value);
+			};
+			onPreviewCancel = () => {
+				return this.callbacks.onThemePreviewCancel?.(activeThemeBeforePreview);
+			};
+		} else if (def.path === "statusLine.preset") {
 			onPreview = value => {
 				const presetDef = getPreset(
 					value as "default" | "minimal" | "compact" | "full" | "nerd" | "ascii" | "custom",
@@ -612,17 +620,20 @@ export class SettingsSelectorComponent extends Container {
 			return;
 		}
 
-		// Escape at top level cancels
-		if (matchesAppInterrupt(data) && !this.#currentSubmenu) {
-			this.callbacks.onCancel();
-			return;
-		}
-
-		// Pass to current content
+		// Pass to current content. SettingsList owns Escape routing so open
+		// submenus can run their cancel/restore callbacks before closing.
 		if (this.#currentList) {
 			this.#currentList.handleInput(data);
-		} else if (this.#pluginComponent) {
+			return;
+		}
+		if (this.#pluginComponent) {
 			this.#pluginComponent.handleInput(data);
+			return;
+		}
+
+		// Fallback for future top-level content that does not own cancellation.
+		if (matchesAppInterrupt(data)) {
+			this.callbacks.onCancel();
 		}
 	}
 }

package/src/modes/components/skill-hud/render.ts

@@ -1,4 +1,8 @@
-import type { SkillActiveEntry, WorkflowHudChip } from "../../../skill-state/active-state";
+import {
+	collapsePlanningPipeline,
+	type SkillActiveEntry,
+	type WorkflowHudChip,
+} from "../../../skill-state/active-state";
 import { workflowReceiptStatus } from "../../../skill-state/workflow-state-contract";
 
 const ANSI_RESET_FG = "\x1b[39m";
@@ -69,7 +73,8 @@ function formatEntry(entry: SkillActiveEntry): string {
 }
 
 export function renderSkillHudBar(entries: readonly SkillActiveEntry[], width: number): string | null {
-	const active = entries.filter(entry => entry.active !== false && sanitizeHudPart(entry.skill)).sort(compareEntries);
+	const visible = collapsePlanningPipeline(entries.filter(entry => entry.active !== false));
+	const active = visible.filter(entry => sanitizeHudPart(entry.skill)).sort(compareEntries);
 	if (active.length === 0 || width <= 0) return null;
 	const body = active.map(formatEntry).join(" + ");
 	const prefix = `${ANSI_BORDER}◆${ANSI_RESET_FG} ${ANSI_BOLD}${ANSI_ACCENT}hud${ANSI_RESET_FG}${ANSI_RESET_BOLD} `;

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

@@ -585,7 +585,7 @@ export class CommandController {
 		if (action === "view") {
 			const payload = await backend.buildDeveloperInstructions(agentDir, this.ctx.settings, this.ctx.session);
 			if (!payload) {
-				this.ctx.showWarning("Memory payload is empty (memory backend off, disabled, or no memory available).");
+				this.ctx.showWarning("Memory payload is empty; durable memory is unavailable or unconfirmed.");
 				return;
 			}
 			this.ctx.chatContainer.addChild(new Spacer(1));

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

@@ -64,6 +64,7 @@ export class InputController {
 			} else if (this.ctx.isBashMode) {
 				this.ctx.editor.setText("");
 				this.ctx.isBashMode = false;
+				this.ctx.isBashNoContext = false;
 				this.ctx.updateEditorBorderColor();
 			} else if (this.ctx.session.isEvalRunning) {
 				this.ctx.session.abortEval();
@@ -172,11 +173,17 @@ export class InputController {
 
 		this.ctx.editor.onChange = (text: string) => {
 			const wasBashMode = this.ctx.isBashMode;
+			const wasBashNoContext = this.ctx.isBashNoContext;
 			const wasPythonMode = this.ctx.isPythonMode;
 			const trimmed = text.trimStart();
-			this.ctx.isBashMode = text.trimStart().startsWith("!");
+			this.ctx.isBashMode = trimmed.startsWith("!");
+			this.ctx.isBashNoContext = trimmed.startsWith("!!");
 			this.ctx.isPythonMode = trimmed.startsWith("$") && !trimmed.startsWith("${");
-			if (wasBashMode !== this.ctx.isBashMode || wasPythonMode !== this.ctx.isPythonMode) {
+			if (
+				wasBashMode !== this.ctx.isBashMode ||
+				wasBashNoContext !== this.ctx.isBashNoContext ||
+				wasPythonMode !== this.ctx.isPythonMode
+			) {
 				this.ctx.updateEditorBorderColor();
 			}
 		};
@@ -260,6 +267,7 @@ export class InputController {
 					this.ctx.editor.addToHistory(text);
 					await this.ctx.handleBashCommand(command, isExcluded);
 					this.ctx.isBashMode = false;
+					this.ctx.isBashNoContext = false;
 					this.ctx.updateEditorBorderColor();
 					return;
 				}

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

@@ -17,7 +17,11 @@ import {
 } from "../../extensibility/plugins/marketplace";
 import {
 	getAvailableThemes,
+	getCurrentThemeName,
+	getDetectedThemeSettingsPath,
 	getSymbolTheme,
+	previewTheme,
+	restoreThemePreview,
 	setColorBlindMode,
 	setSymbolPreset,
 	setTheme,
@@ -47,6 +51,7 @@ import {
 import { SessionObserverOverlayComponent } from "../components/session-observer-overlay";
 import { SessionSelectorComponent } from "../components/session-selector";
 import { SettingsSelectorComponent } from "../components/settings-selector";
+import { ThemeSelectorComponent } from "../components/theme-selector";
 import { ToolExecutionComponent } from "../components/tool-execution";
 import { TreeSelectorComponent } from "../components/tree-selector";
 import { UserMessageSelectorComponent } from "../components/user-message-selector";
@@ -62,6 +67,10 @@ const CALLBACK_SERVER_PROVIDERS = new Set<OAuthProvider>([
 
 const MANUAL_LOGIN_TIP = "Tip: You can complete pairing with /login <redirect URL>.";
 
+function isThemePreviewSuperseded(result: { success: boolean; error?: string }): boolean {
+	return !result.success && result.error?.includes("superseded by a newer request") === true;
+}
+
 function formatProviderOnboardingCommandGuide(): string {
 	return [
 		"Provider preset setup:",
@@ -134,6 +143,22 @@ export class SelectorController {
 					},
 					{
 						onChange: (id, value) => this.handleSettingChange(id, value),
+						onThemePreview: themeName => {
+							return previewTheme(themeName).then(result => {
+								if (!result.success && result.error && !isThemePreviewSuperseded(result)) {
+									this.ctx.showError(`Failed to preview theme: ${result.error}`);
+								}
+								this.#refreshThemeUi();
+							});
+						},
+						onThemePreviewCancel: themeName => {
+							return restoreThemePreview(themeName).then(result => {
+								if (!result.success && result.error && !isThemePreviewSuperseded(result)) {
+									this.ctx.showError(`Failed to restore theme preview: ${result.error}`);
+								}
+								this.#refreshThemeUi();
+							});
+						},
 						onStatusLinePreview: previewSettings => {
 							// Update status line with preview settings
 							this.ctx.statusLine.updateSettings({
@@ -177,6 +202,48 @@ export class SelectorController {
 		});
 	}
 
+	#refreshThemeUi(): void {
+		this.ctx.statusLine.invalidate();
+		this.ctx.updateEditorTopBorder();
+		this.ctx.ui.requestRender();
+	}
+
+	showThemeSelector(): void {
+		getAvailableThemes().then(availableThemes => {
+			const initialTheme = getCurrentThemeName() ?? "red-claw";
+			this.showSelector(done => {
+				const selector = new ThemeSelectorComponent(
+					initialTheme,
+					availableThemes,
+					themeName => {
+						const settingPath = getDetectedThemeSettingsPath();
+						settings.set(settingPath, themeName);
+						this.#refreshThemeUi();
+						done();
+					},
+					() => {
+						void restoreThemePreview(initialTheme).then(result => {
+							if (!result.success && result.error) {
+								this.ctx.showError(`Failed to restore theme preview: ${result.error}`);
+							}
+							this.#refreshThemeUi();
+						});
+						done();
+					},
+					themeName => {
+						void previewTheme(themeName).then(result => {
+							if (!result.success && result.error) {
+								this.ctx.showError(`Failed to preview theme: ${result.error}`);
+							}
+							this.#refreshThemeUi();
+						});
+					},
+				);
+				return { component: selector, focus: selector.getSelectList() };
+			});
+		});
+	}
+
 	showHistorySearch(): void {
 		const historyStorage = this.ctx.historyStorage;
 		if (!historyStorage) return;

package/src/modes/interactive-mode.ts

@@ -112,12 +112,23 @@ const HINT_SHIMMER_PALETTE: ShimmerPalette = {
 	high: "borderAccent",
 };
 
+function getDefaultInputPrefix(): string {
+	return `${theme.fg("accent", ">")} `;
+}
+
+function getShellInputPrefix(isNoContext: boolean): string {
+	const shellLabel = isNoContext
+		? theme.fg("warning", theme.bold("shell no-context"))
+		: theme.fg("bashMode", theme.bold("shell"));
+	return `${shellLabel} ${getDefaultInputPrefix()}`;
+}
+
 function configureDefaultComposerChrome(editor: CustomEditor): void {
 	editor.setBorderVisible(true);
 	editor.setBorderStyle("sharp");
 	editor.setClosedBorderBox(true);
 	editor.setPromptGutter(undefined);
-	editor.setInputPrefix(`${theme.fg("accent", ">")} `);
+	editor.setInputPrefix(getDefaultInputPrefix());
 	editor.setPlaceholder("Type your message...");
 	editor.setPaddingX(1);
 	editor.setTopBorder(undefined);
@@ -236,6 +247,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	isInitialized = false;
 	isBackgrounded = false;
 	isBashMode = false;
+	isBashNoContext = false;
 	toolOutputExpanded = false;
 	todoExpanded = false;
 	planModeEnabled = false;
@@ -808,7 +820,10 @@ export class InteractiveMode implements InteractiveModeContext {
 
 	updateEditorChrome(): void {
 		if (this.isBashMode) {
-			this.editor.borderColor = theme.getBashModeBorderColor();
+			this.editor.borderColor = this.isBashNoContext
+				? (str: string) => theme.fg("warning", str)
+				: theme.getBashModeBorderColor();
+			this.editor.setInputPrefix(getShellInputPrefix(this.isBashNoContext));
 		} else if (this.isPythonMode) {
 			this.editor.borderColor = theme.getPythonModeBorderColor();
 		} else {
@@ -823,6 +838,9 @@ export class InteractiveMode implements InteractiveModeContext {
 				this.editor.borderColor = theme.getThinkingBorderColor(level);
 			}
 		}
+		if (!this.isBashMode) {
+			this.editor.setInputPrefix(getDefaultInputPrefix());
+		}
 		this.#setComposerTopBorder();
 		this.ui.requestRender();
 	}
@@ -1281,7 +1299,16 @@ export class InteractiveMode implements InteractiveModeContext {
 		reason?: "completed" | "paused" | "dropped";
 	}): Promise<void> {
 		const previousTools = this.#goalModePreviousTools;
-		if (this.goalModeEnabled && previousTools) {
+		// Drop keeps the `goal` tool callable so the agent can immediately create a new
+		// goal in the same session without a leader-side cleanup. Complete (and pause)
+		// exit goal mode and restore the pre-goal tool set even when the goal_updated
+		// event has already cleared goalModeEnabled (see #completeGoalFromTool emitting
+		// state.enabled = false before #exitGoalMode runs). Spec: deep-interview-ultragoal-goal-tool-wiring AC1+AC2.
+		const shouldRestoreTools =
+			previousTools &&
+			options?.reason !== "dropped" &&
+			(this.goalModeEnabled || options?.reason === "completed" || options?.paused === true);
+		if (shouldRestoreTools) {
 			await this.session.setActiveToolsByName(previousTools);
 		}
 		const currentState = this.session.getGoalModeState();
@@ -2339,6 +2366,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#selectorController.showSettingsSelector();
 	}
 
+	showThemeSelector(): void {
+		this.#selectorController.showThemeSelector();
+	}
+
 	showHistorySearch(): void {
 		this.#selectorController.showHistorySearch();
 	}

package/src/modes/theme/defaults/blue-crab.json

@@ -0,0 +1,126 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/gajae-code/main/packages/coding-agent/theme-schema.json",
+	"name": "blue-crab",
+	"vars": {
+		"cyan": "#66e8ff",
+		"blue": "#4ea1ff",
+		"green": "#72e6b8",
+		"red": "#ff6b7a",
+		"yellow": "#f3c76d",
+		"gray": "#b8c7d9",
+		"dimGray": "#5d7288",
+		"darkGray": "#344456",
+		"accent": "#2f9bff",
+		"selectedBg": "#12314a",
+		"userMsgBg": "#081b2a",
+		"toolPendingBg": "#0a2235",
+		"toolSuccessBg": "#0b2b25",
+		"toolErrorBg": "#321923",
+		"customMsgBg": "#0c1a2c",
+		"abyss": "#020812",
+		"deepNavy": "#061321",
+		"crabShell": "#2f9bff",
+		"claw": "#5ec8ff",
+		"ocean": "#0b4f8a",
+		"azure": "#7dd3fc",
+		"seafoam": "#80f2d3",
+		"kelp": "#62d9a8",
+		"sand": "#f4d6a0",
+		"coral": "#ff8a7a",
+		"ink": "#020812",
+		"mantle": "#061321",
+		"surface": "#0a1d31",
+		"surfaceBright": "#12314a",
+		"foam": "#e6f7ff",
+		"mutedShell": "#9db5c9",
+		"dimShell": "#55708a",
+		"brandBlue": "#2f9bff",
+		"shell": "#e6f7ff",
+		"dangerRed": "#ff5f75",
+		"warningAmber": "#f5bd58",
+		"diffRemovalRed": "#df5b61"
+	},
+	"colors": {
+		"accent": "claw",
+		"border": "ocean",
+		"borderAccent": "brandBlue",
+		"borderMuted": "dimShell",
+		"success": "kelp",
+		"error": "dangerRed",
+		"warning": "warningAmber",
+		"muted": "mutedShell",
+		"dim": "dimShell",
+		"text": "shell",
+		"thinkingText": "mutedShell",
+		"selectedBg": "surfaceBright",
+		"userMessageBg": "surface",
+		"userMessageText": "shell",
+		"customMessageBg": "mantle",
+		"customMessageText": "shell",
+		"customMessageLabel": "claw",
+		"toolPendingBg": "mantle",
+		"toolSuccessBg": "#0b2b25",
+		"toolErrorBg": "#321923",
+		"toolTitle": "shell",
+		"toolOutput": "mutedShell",
+		"mdHeading": "brandBlue",
+		"mdLink": "azure",
+		"mdLinkUrl": "dimShell",
+		"mdCode": "sand",
+		"mdCodeBlock": "seafoam",
+		"mdCodeBlockBorder": "ocean",
+		"mdQuote": "mutedShell",
+		"mdQuoteBorder": "ocean",
+		"mdHr": "dimShell",
+		"mdListBullet": "claw",
+		"toolDiffAdded": "kelp",
+		"toolDiffRemoved": "diffRemovalRed",
+		"toolDiffContext": "mutedShell",
+		"link": "azure",
+		"syntaxComment": "dimShell",
+		"syntaxKeyword": "brandBlue",
+		"syntaxFunction": "sand",
+		"syntaxVariable": "foam",
+		"syntaxString": "seafoam",
+		"syntaxNumber": "azure",
+		"syntaxType": "claw",
+		"syntaxOperator": "mutedShell",
+		"syntaxPunctuation": "dimShell",
+		"thinkingOff": "dimShell",
+		"thinkingMinimal": "mutedShell",
+		"thinkingLow": "azure",
+		"thinkingMedium": "claw",
+		"thinkingHigh": "brandBlue",
+		"thinkingXhigh": "coral",
+		"bashMode": "claw",
+		"statusLineBg": "ocean",
+		"statusLineSep": "dimShell",
+		"statusLineModel": "claw",
+		"statusLinePath": "azure",
+		"statusLineGitClean": "kelp",
+		"statusLineGitDirty": "sand",
+		"statusLineContext": "seafoam",
+		"statusLineSpend": "sand",
+		"statusLineStaged": "kelp",
+		"statusLineDirty": "sand",
+		"statusLineUntracked": "diffRemovalRed",
+		"statusLineOutput": "foam",
+		"statusLineCost": "claw",
+		"statusLineSubagents": "brandBlue",
+		"pythonMode": "sand"
+	},
+	"export": {
+		"pageBg": "#020812",
+		"cardBg": "#061321",
+		"infoBg": "#0a1d31"
+	},
+	"symbols": {
+		"preset": "unicode",
+		"overrides": {
+			"icon.pi": "🦀",
+			"icon.agents": "🦞",
+			"status.running": "🌊",
+			"md.bullet": "▸"
+		}
+	}
+}