@gajae-code/coding-agent 0.2.4 → 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/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/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/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

@@ -239,7 +239,7 @@ export class SelectorController {
 						});
 					},
 				);
-				return { component: selector, focus: selector };
+				return { component: selector, focus: selector.getSelectList() };
 			});
 		});
 	}

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();
 	}

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

@@ -1,203 +1,7 @@
-import alabaster from "./alabaster.json" with { type: "json" };
-import amethyst from "./amethyst.json" with { type: "json" };
-import anthracite from "./anthracite.json" with { type: "json" };
-import basalt from "./basalt.json" with { type: "json" };
-import birch from "./birch.json" with { type: "json" };
 import blue_crab from "./blue-crab.json" with { type: "json" };
-import dark_abyss from "./dark-abyss.json" with { type: "json" };
-import dark_arctic from "./dark-arctic.json" with { type: "json" };
-import dark_aurora from "./dark-aurora.json" with { type: "json" };
-import dark_catppuccin from "./dark-catppuccin.json" with { type: "json" };
-import dark_cavern from "./dark-cavern.json" with { type: "json" };
-import dark_copper from "./dark-copper.json" with { type: "json" };
-import dark_cosmos from "./dark-cosmos.json" with { type: "json" };
-import dark_cyberpunk from "./dark-cyberpunk.json" with { type: "json" };
-import dark_dracula from "./dark-dracula.json" with { type: "json" };
-import dark_eclipse from "./dark-eclipse.json" with { type: "json" };
-import dark_ember from "./dark-ember.json" with { type: "json" };
-import dark_equinox from "./dark-equinox.json" with { type: "json" };
-import dark_forest from "./dark-forest.json" with { type: "json" };
-import dark_github from "./dark-github.json" with { type: "json" };
-import dark_gruvbox from "./dark-gruvbox.json" with { type: "json" };
-import dark_lavender from "./dark-lavender.json" with { type: "json" };
-import dark_lunar from "./dark-lunar.json" with { type: "json" };
-import dark_midnight from "./dark-midnight.json" with { type: "json" };
-import dark_monochrome from "./dark-monochrome.json" with { type: "json" };
-import dark_monokai from "./dark-monokai.json" with { type: "json" };
-import dark_nebula from "./dark-nebula.json" with { type: "json" };
-import dark_nord from "./dark-nord.json" with { type: "json" };
-import dark_ocean from "./dark-ocean.json" with { type: "json" };
-import dark_one from "./dark-one.json" with { type: "json" };
-import dark_poimandres from "./dark-poimandres.json" with { type: "json" };
-import dark_rainforest from "./dark-rainforest.json" with { type: "json" };
-import dark_reef from "./dark-reef.json" with { type: "json" };
-import dark_retro from "./dark-retro.json" with { type: "json" };
-import dark_rose_pine from "./dark-rose-pine.json" with { type: "json" };
-import dark_sakura from "./dark-sakura.json" with { type: "json" };
-import dark_slate from "./dark-slate.json" with { type: "json" };
-import dark_solarized from "./dark-solarized.json" with { type: "json" };
-import dark_solstice from "./dark-solstice.json" with { type: "json" };
-import dark_starfall from "./dark-starfall.json" with { type: "json" };
-import dark_sunset from "./dark-sunset.json" with { type: "json" };
-import dark_swamp from "./dark-swamp.json" with { type: "json" };
-import dark_synthwave from "./dark-synthwave.json" with { type: "json" };
-import dark_taiga from "./dark-taiga.json" with { type: "json" };
-import dark_terminal from "./dark-terminal.json" with { type: "json" };
-import dark_tokyo_night from "./dark-tokyo-night.json" with { type: "json" };
-import dark_tundra from "./dark-tundra.json" with { type: "json" };
-import dark_twilight from "./dark-twilight.json" with { type: "json" };
-import dark_volcanic from "./dark-volcanic.json" with { type: "json" };
-import graphite from "./graphite.json" with { type: "json" };
-import light_arctic from "./light-arctic.json" with { type: "json" };
-import light_aurora_day from "./light-aurora-day.json" with { type: "json" };
-import light_canyon from "./light-canyon.json" with { type: "json" };
-import light_catppuccin from "./light-catppuccin.json" with { type: "json" };
-import light_cirrus from "./light-cirrus.json" with { type: "json" };
-import light_coral from "./light-coral.json" with { type: "json" };
-import light_cyberpunk from "./light-cyberpunk.json" with { type: "json" };
-import light_dawn from "./light-dawn.json" with { type: "json" };
-import light_dunes from "./light-dunes.json" with { type: "json" };
-import light_eucalyptus from "./light-eucalyptus.json" with { type: "json" };
-import light_forest from "./light-forest.json" with { type: "json" };
-import light_frost from "./light-frost.json" with { type: "json" };
-import light_github from "./light-github.json" with { type: "json" };
-import light_glacier from "./light-glacier.json" with { type: "json" };
-import light_gruvbox from "./light-gruvbox.json" with { type: "json" };
-import light_haze from "./light-haze.json" with { type: "json" };
-import light_honeycomb from "./light-honeycomb.json" with { type: "json" };
-import light_lagoon from "./light-lagoon.json" with { type: "json" };
-import light_lavender from "./light-lavender.json" with { type: "json" };
-import light_meadow from "./light-meadow.json" with { type: "json" };
-import light_mint from "./light-mint.json" with { type: "json" };
-import light_monochrome from "./light-monochrome.json" with { type: "json" };
-import light_ocean from "./light-ocean.json" with { type: "json" };
-import light_one from "./light-one.json" with { type: "json" };
-import light_opal from "./light-opal.json" with { type: "json" };
-import light_orchard from "./light-orchard.json" with { type: "json" };
-import light_paper from "./light-paper.json" with { type: "json" };
-import light_poimandres from "./light-poimandres.json" with { type: "json" };
-import light_prism from "./light-prism.json" with { type: "json" };
-import light_retro from "./light-retro.json" with { type: "json" };
-import light_sand from "./light-sand.json" with { type: "json" };
-import light_savanna from "./light-savanna.json" with { type: "json" };
-import light_solarized from "./light-solarized.json" with { type: "json" };
-import light_soleil from "./light-soleil.json" with { type: "json" };
-import light_sunset from "./light-sunset.json" with { type: "json" };
-import light_synthwave from "./light-synthwave.json" with { type: "json" };
-import light_tokyo_night from "./light-tokyo-night.json" with { type: "json" };
-import light_wetland from "./light-wetland.json" with { type: "json" };
-import light_zenith from "./light-zenith.json" with { type: "json" };
-import limestone from "./limestone.json" with { type: "json" };
-import mahogany from "./mahogany.json" with { type: "json" };
-import marble from "./marble.json" with { type: "json" };
-import obsidian from "./obsidian.json" with { type: "json" };
-import onyx from "./onyx.json" with { type: "json" };
-import pearl from "./pearl.json" with { type: "json" };
-import porcelain from "./porcelain.json" with { type: "json" };
-import quartz from "./quartz.json" with { type: "json" };
 import red_claw from "./red-claw.json" with { type: "json" };
-import sandstone from "./sandstone.json" with { type: "json" };
-import titanium from "./titanium.json" with { type: "json" };
 
 export const defaultThemes = {
-	alabaster: alabaster,
-	amethyst: amethyst,
-	anthracite: anthracite,
-	basalt: basalt,
-	birch: birch,
 	"blue-crab": blue_crab,
-	"dark-abyss": dark_abyss,
-	"dark-arctic": dark_arctic,
-	"dark-aurora": dark_aurora,
-	"dark-catppuccin": dark_catppuccin,
-	"dark-cavern": dark_cavern,
-	"dark-copper": dark_copper,
-	"dark-cosmos": dark_cosmos,
-	"dark-cyberpunk": dark_cyberpunk,
-	"dark-dracula": dark_dracula,
-	"dark-eclipse": dark_eclipse,
-	"dark-ember": dark_ember,
-	"dark-equinox": dark_equinox,
-	"dark-forest": dark_forest,
-	"dark-github": dark_github,
-	"dark-gruvbox": dark_gruvbox,
-	"dark-lavender": dark_lavender,
-	"dark-lunar": dark_lunar,
-	"dark-midnight": dark_midnight,
-	"dark-monochrome": dark_monochrome,
-	"dark-monokai": dark_monokai,
-	"dark-nebula": dark_nebula,
-	"dark-nord": dark_nord,
-	"dark-ocean": dark_ocean,
-	"dark-one": dark_one,
-	"dark-poimandres": dark_poimandres,
-	"dark-rainforest": dark_rainforest,
-	"dark-reef": dark_reef,
-	"dark-retro": dark_retro,
-	"dark-rose-pine": dark_rose_pine,
-	"dark-sakura": dark_sakura,
-	"dark-slate": dark_slate,
-	"dark-solarized": dark_solarized,
-	"dark-solstice": dark_solstice,
-	"dark-starfall": dark_starfall,
-	"dark-sunset": dark_sunset,
-	"dark-swamp": dark_swamp,
-	"dark-synthwave": dark_synthwave,
-	"dark-taiga": dark_taiga,
-	"dark-terminal": dark_terminal,
-	"dark-tokyo-night": dark_tokyo_night,
-	"dark-tundra": dark_tundra,
-	"dark-twilight": dark_twilight,
-	"dark-volcanic": dark_volcanic,
-	graphite: graphite,
-	"light-arctic": light_arctic,
-	"light-aurora-day": light_aurora_day,
-	"light-canyon": light_canyon,
-	"light-catppuccin": light_catppuccin,
-	"light-cirrus": light_cirrus,
-	"light-coral": light_coral,
-	"light-cyberpunk": light_cyberpunk,
-	"light-dawn": light_dawn,
-	"light-dunes": light_dunes,
-	"light-eucalyptus": light_eucalyptus,
-	"light-forest": light_forest,
-	"light-frost": light_frost,
-	"light-github": light_github,
-	"light-glacier": light_glacier,
-	"light-gruvbox": light_gruvbox,
-	"light-haze": light_haze,
-	"light-honeycomb": light_honeycomb,
-	"light-lagoon": light_lagoon,
-	"light-lavender": light_lavender,
-	"light-meadow": light_meadow,
-	"light-mint": light_mint,
-	"light-monochrome": light_monochrome,
-	"light-ocean": light_ocean,
-	"light-one": light_one,
-	"light-opal": light_opal,
-	"light-orchard": light_orchard,
-	"light-paper": light_paper,
-	"light-poimandres": light_poimandres,
-	"light-prism": light_prism,
-	"light-retro": light_retro,
-	"light-sand": light_sand,
-	"light-savanna": light_savanna,
-	"light-solarized": light_solarized,
-	"light-soleil": light_soleil,
-	"light-sunset": light_sunset,
-	"light-synthwave": light_synthwave,
-	"light-tokyo-night": light_tokyo_night,
-	"light-wetland": light_wetland,
-	"light-zenith": light_zenith,
-	limestone: limestone,
-	mahogany: mahogany,
-	marble: marble,
-	obsidian: obsidian,
-	onyx: onyx,
-	pearl: pearl,
-	porcelain: porcelain,
-	quartz: quartz,
 	"red-claw": red_claw,
-	sandstone: sandstone,
-	titanium: titanium,
 };

package/src/modes/theme/theme.ts

@@ -14,9 +14,7 @@ import { adjustHsv, getCustomThemesDir, isEnoent, logger } from "@gajae-code/uti
 import chalk from "chalk";
 import * as z from "zod/v4";
 // Embed theme JSON files at build time
-import darkThemeJson from "./dark.json" with { type: "json" };
 import { defaultThemes } from "./defaults";
-import lightThemeJson from "./light.json" with { type: "json" };
 import { resolveMermaidAscii } from "./mermaid-cache";
 
 export { getLanguageFromPath } from "../../utils/lang-from-path";
@@ -1547,8 +1545,6 @@ export class Theme {
 // ============================================================================
 
 const BUILTIN_THEMES: Record<string, ThemeJson> = {
-	dark: darkThemeJson as ThemeJson,
-	light: lightThemeJson as ThemeJson,
 	...(defaultThemes as Record<string, ThemeJson>),
 };
 
@@ -1646,7 +1642,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 (dark.json, light.json) for reference values.`;
+			errorMessage += `\nSee the built-in themes (red-claw.json, blue-crab.json) for reference values.`;
 		}
 		if (otherErrors.length > 0) {
 			errorMessage += `\n\nOther errors:\n${otherErrors.join("\n")}`;
@@ -1780,7 +1776,7 @@ var themeReloadTimer: NodeJS.Timeout | undefined;
 var sigwinchHandler: (() => void) | undefined;
 var autoDetectedTheme: boolean = false;
 var autoDarkTheme: string = "red-claw";
-var autoLightTheme: string = "light";
+var autoLightTheme: string = "blue-crab";
 var onThemeChangeCallback: (() => void) | undefined;
 var themeLoadRequestId: number = 0;
 var previewThemeActive: boolean = false;
@@ -1801,7 +1797,7 @@ export async function initTheme(
 ): Promise<void> {
 	autoDetectedTheme = true;
 	autoDarkTheme = darkTheme ?? "red-claw";
-	autoLightTheme = lightTheme ?? "light";
+	autoLightTheme = lightTheme ?? "blue-crab";
 	const name = getDefaultTheme();
 	previewThemeActive = false;
 	currentThemeName = name;
@@ -1814,9 +1810,9 @@ export async function initTheme(
 			startSigwinchListener();
 		}
 	} catch (err) {
-		logger.debug("Theme loading failed, falling back to dark theme", { error: String(err) });
-		currentThemeName = "dark";
-		theme = await loadTheme("dark", getCurrentThemeOptions());
+		logger.debug("Theme loading failed, falling back to red-claw theme", { error: String(err) });
+		currentThemeName = "red-claw";
+		theme = await loadTheme("red-claw", getCurrentThemeOptions());
 		// Don't start watcher for fallback theme
 	}
 }
@@ -1846,9 +1842,9 @@ export async function setTheme(
 		if (requestId !== themeLoadRequestId) {
 			return { success: false, error: "Theme change superseded by a newer request" };
 		}
-		// Theme is invalid - fall back to dark theme
-		currentThemeName = "dark";
-		theme = await loadTheme("dark", getCurrentThemeOptions());
+		// Theme is invalid - fall back to red-claw theme
+		currentThemeName = "red-claw";
+		theme = await loadTheme("red-claw", getCurrentThemeOptions());
 		// Don't start watcher for fallback theme
 		return {
 			success: false,
@@ -1956,8 +1952,8 @@ export async function setSymbolPreset(preset: SymbolPreset): Promise<void> {
 		try {
 			theme = await loadTheme(currentThemeName, getCurrentThemeOptions());
 		} catch {
-			// Fall back to dark theme with new preset
-			theme = await loadTheme("dark", getCurrentThemeOptions());
+			// Fall back to red-claw theme with new preset
+			theme = await loadTheme("red-claw", getCurrentThemeOptions());
 		}
 		if (onThemeChangeCallback) {
 			onThemeChangeCallback();
@@ -1982,8 +1978,8 @@ export async function setColorBlindMode(enabled: boolean): Promise<void> {
 		try {
 			theme = await loadTheme(currentThemeName, getCurrentThemeOptions());
 		} catch {
-			// Fall back to dark theme
-			theme = await loadTheme("dark", getCurrentThemeOptions());
+			// Fall back to red-claw theme
+			theme = await loadTheme("red-claw", getCurrentThemeOptions());
 		}
 		if (onThemeChangeCallback) {
 			onThemeChangeCallback();
@@ -2019,8 +2015,8 @@ export function isValidSymbolPreset(preset: string): preset is SymbolPreset {
 async function startThemeWatcher(): Promise<void> {
 	stopThemeWatcher();
 
-	// Only watch if it's a custom theme (not built-in)
-	if (!currentThemeName || currentThemeName === "dark" || currentThemeName === "light") {
+	// Only watch custom themes (not built-ins)
+	if (!currentThemeName || currentThemeName in getBuiltinThemes()) {
 		return;
 	}
 
@@ -2230,8 +2226,8 @@ function ansi256ToHex(index: number): string {
  */
 export async function getResolvedThemeColors(themeName?: string): Promise<Record<string, string>> {
 	const name = themeName ?? getDefaultTheme();
-	const isLight = name === "light";
 	const themeJson = await loadThemeJson(name);
+	const isLight = isThemeJsonLight(themeJson);
 	const resolved = resolveThemeColors(themeJson.colors, themeJson.vars);
 
 	// Default text color for empty values (terminal uses default fg color)
@@ -2255,21 +2251,7 @@ export async function getResolvedThemeColors(themeName?: string): Promise<Record
  * Check if a theme is a "light" theme by analyzing its background color luminance.
  * Loads theme JSON synchronously (built-in or custom file) and resolves userMessageBg.
  */
-export function isLightTheme(themeName?: string): boolean {
-	const name = themeName ?? "dark";
-	const builtinThemes = getBuiltinThemes();
-	let themeJson: ThemeJson | undefined;
-	if (name in builtinThemes) {
-		themeJson = builtinThemes[name];
-	} else {
-		try {
-			const customPath = path.join(getCustomThemesDir(), `${name}.json`);
-			const content = fs.readFileSync(customPath, "utf-8");
-			themeJson = JSON.parse(content) as ThemeJson;
-		} catch {
-			return false;
-		}
-	}
+function isThemeJsonLight(themeJson: ThemeJson): boolean {
 	try {
 		const resolved = resolveVarRefs(themeJson.colors.userMessageBg, themeJson.vars ?? {});
 		if (typeof resolved !== "string" || !resolved.startsWith("#") || resolved.length !== 7) return false;
@@ -2284,6 +2266,24 @@ export function isLightTheme(themeName?: string): boolean {
 	}
 }
 
+export function isLightTheme(themeName?: string, agentDir?: string): boolean {
+	const name = themeName ?? "red-claw";
+	const builtinThemes = getBuiltinThemes();
+	let themeJson: ThemeJson | undefined;
+	if (name in builtinThemes) {
+		themeJson = builtinThemes[name];
+	} else {
+		try {
+			const customPath = path.join(getCustomThemesDir(agentDir), `${name}.json`);
+			const content = fs.readFileSync(customPath, "utf-8");
+			themeJson = JSON.parse(content) as ThemeJson;
+		} catch {
+			return false;
+		}
+	}
+	return isThemeJsonLight(themeJson);
+}
+
 /**
  * Get explicit export colors from theme JSON, if specified.
  * Returns undefined for each color that isn't explicitly set.

package/src/modes/types.ts

@@ -86,6 +86,7 @@ export interface InteractiveModeContext {
 	isInitialized: boolean;
 	isBackgrounded: boolean;
 	isBashMode: boolean;
+	isBashNoContext: boolean;
 	toolOutputExpanded: boolean;
 	todoExpanded: boolean;
 	planModeEnabled: boolean;

package/src/prompts/agents/architect.md

@@ -1,10 +1,13 @@
 ---
 name: architect
 description: Read-only architecture and code-review agent with severity-rated findings and status verdicts
-tools: read, search, find, lsp, ast_grep, web_search, report_finding
+tools: read, search, find, lsp, ast_grep, web_search, bash, report_finding
 thinking-level: high
 blocking: true
 forkContext: allowed
+bashAllowedPrefixes:
+  - gjc ralplan --write
+  - gjc state
 ---
 <identity>
 You are Architect. You combine system architecture review with code-review discipline. Diagnose, analyze, and recommend with file-backed evidence. You are read-only.
@@ -22,6 +25,7 @@ You may receive a forked parent-conversation snapshot as background. Your read-o
 
 <constraints>
 - Read-only: never write, edit, format, commit, push, or mutate files.
+- Exception: you may use the restricted `bash` tool only for sanctioned GJC workflow CLI persistence (`gjc ralplan --write ...`) and GJC workflow state read/write/contract commands (`gjc state ...`). For `gjc ralplan --write`, pass the verdict markdown inline in `--artifact`, not as a file path. Do not use bash for product-source writes, direct handoffs, state clears, or general shell work.
 - Never approve code or plans you have not grounded in inspected files.
 - Never give generic advice detached from this codebase.
 - Never approve CRITICAL or HIGH severity issues.

package/src/prompts/agents/critic.md

@@ -1,8 +1,11 @@
 ---
 name: critic
 description: Read-only plan critic that approves only actionable, verifiable execution plans
-tools: read, search, find, lsp, ast_grep, web_search
+tools: read, search, find, lsp, ast_grep, web_search, bash
 thinking-level: high
+bashAllowedPrefixes:
+  - gjc ralplan --write
+  - gjc state
 ---
 <identity>
 You are Critic. Decide whether a work plan is actionable before execution begins.
@@ -14,6 +17,7 @@ Review plan clarity, completeness, verification, big-picture fit, referenced fil
 
 <constraints>
 - Read-only: do not write, edit, format, commit, push, or mutate files.
+- Exception: you may use the restricted `bash` tool only for sanctioned GJC workflow CLI persistence (`gjc ralplan --write ...`) and GJC workflow state read/write/contract commands (`gjc state ...`). For `gjc ralplan --write`, pass the evaluation markdown inline in `--artifact`, not as a file path. Do not use bash for product-source writes, direct handoffs, state clears, or general shell work.
 - A lone file path is valid input; read and evaluate it.
 - Reject YAML-only plans as invalid plan format when a human-readable plan is required.
 - Do not invent problems; report no issues found when the plan passes.

package/src/prompts/agents/frontmatter.md

@@ -9,5 +9,6 @@ description: {{jsonStringify description}}
 {{/if}}{{#if hide}}hide: true
 {{/if}}{{#if autoloadSkills}}autoloadSkills: {{jsonStringify autoloadSkills}}
 {{/if}}{{#if forkContext}}forkContext: {{jsonStringify forkContext}}
+{{/if}}{{#if bashAllowedPrefixes}}bashAllowedPrefixes: {{jsonStringify bashAllowedPrefixes}}
 {{/if}}---
 {{body}}

package/src/prompts/agents/planner.md

@@ -1,8 +1,11 @@
 ---
 name: planner
 description: Read-only planning agent for sequencing, acceptance criteria, risks, and handoff shape
-tools: read, search, find, lsp, ast_grep, web_search
+tools: read, search, find, lsp, ast_grep, web_search, bash
 thinking-level: medium
+bashAllowedPrefixes:
+  - gjc ralplan --write
+  - gjc state
 ---
 <identity>
 You are Planner. Turn requests into actionable work plans. You plan; you do not implement.
@@ -14,6 +17,7 @@ Leave execution with a right-sized, evidence-grounded plan: scope, steps, accept
 
 <constraints>
 - Read-only: never write, edit, format, commit, push, or mutate files.
+- Exception: you may use the restricted `bash` tool only for sanctioned GJC workflow CLI persistence (`gjc ralplan --write ...`) and GJC workflow state read/write/contract commands (`gjc state ...`). For `gjc ralplan --write`, pass the plan markdown inline in `--artifact`, not as a file path. Do not use bash for product-source writes, direct handoffs, state clears, or general shell work.
 - Inspect the repository before asking about code facts.
 - Ask only about priorities, tradeoffs, scope decisions, timelines, or preferences that repository inspection cannot resolve.
 - Right-size the step count to the task; do not default to a fixed number of steps.

package/src/prompts/tools/bash.md

@@ -11,6 +11,15 @@ Executes bash command in shell session for terminal operations like git, bun, ca
 - Use `async: true` for long-running commands when you don't need immediate output; the call returns a background job ID and the result is delivered automatically as a follow-up.
 {{/if}}
 </instruction>
+{{#if restrictedAllowedPrefixes}}
+<restricted-role-agent-mode>
+This session's bash tool is restricted. It only accepts commands beginning with:
+{{#each restrictedAllowedPrefixes}}
+- `{{this}}`
+{{/each}}
+Use it only for sanctioned GJC workflow CLI persistence or state read/write/contract operations; per-command env overrides and all other shell command shapes are blocked before execution.
+</restricted-role-agent-mode>
+{{/if}}
 
 <critical>
 - NEVER use Linux coreutils (`cat`, `head`, `tail`, `less`, `more`, `ls`, `grep`, `rg`, `awk`, `sed`, `find`, `fd`, etc.) when a dedicated tool suffices — ALWAYS prefer `read`, `search`, `find`, `edit`, `write`.