@nghyane/arcane 0.1.8 → 0.1.11

package/src/modes/theme/defaults/light-solarized.json

@@ -2,14 +2,11 @@
 	"$schema": "https://raw.githubusercontent.com/nghyane/arcane/main/packages/coding-agent/theme-schema.json",
 	"name": "light-solarized",
 	"vars": {
-		"base03": "#002b36",
-		"base02": "#073642",
-		"base01": "#586e75",
-		"base00": "#657b83",
-		"base0": "#839496",
-		"base1": "#93a1a1",
 		"base2": "#eee8d5",
 		"base3": "#fdf6e3",
+		"base00": "#657b83",
+		"base01": "#586e75",
+		"base1": "#93a1a1",
 		"yellow": "#b58900",
 		"orange": "#cb4b16",
 		"red": "#dc322f",
@@ -17,86 +14,81 @@
 		"violet": "#6c71c4",
 		"blue": "#268bd2",
 		"cyan": "#2aa198",
-		"green": "#859900",
-		"selectedBg": "#e3dcc8",
-		"userMsgBg": "#f5f0e6",
-		"toolPendingBg": "#eef4f9",
-		"toolSuccessBg": "#eff5ed",
-		"toolErrorBg": "#f9eeee",
-		"customMsgBg": "#f2eff7"
+		"green": "#859900"
 	},
 	"colors": {
-		"accent": "cyan",
-		"border": "blue",
-		"borderAccent": "cyan",
+		"accent": "blue",
+		"border": "cyan",
+		"borderAccent": "blue",
 		"borderMuted": "base1",
 		"success": "green",
 		"error": "red",
 		"warning": "yellow",
-		"muted": "base01",
+		"muted": "base00",
 		"dim": "base1",
 		"text": "",
-		"thinkingText": "base01",
-		"selectedBg": "selectedBg",
-		"userMessageBg": "userMsgBg",
+		"thinkingText": "base00",
+		"selectedBg": "^-2",
+		"userMessageBg": "^-2",
 		"userMessageText": "",
-		"customMessageBg": "customMsgBg",
+		"customMessageBg": "^-2",
 		"customMessageText": "",
-		"customMessageLabel": "violet",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
+		"customMessageLabel": "blue",
+		"toolPendingBg": "^-3",
+		"toolSuccessBg": "^-2",
+		"toolErrorBg": "^-3",
 		"toolTitle": "",
-		"toolOutput": "base01",
+		"toolOutput": "base00",
 		"mdHeading": "yellow",
 		"mdLink": "blue",
-		"mdLinkUrl": "base1",
+		"mdLinkUrl": "base00",
 		"mdCode": "cyan",
 		"mdCodeBlock": "green",
 		"mdCodeBlockBorder": "base1",
-		"mdQuote": "base01",
+		"mdQuote": "base00",
 		"mdQuoteBorder": "base1",
 		"mdHr": "base1",
-		"mdListBullet": "green",
+		"mdListBullet": "cyan",
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
-		"toolDiffContext": "base01",
+		"toolDiffContext": "base00",
 		"link": "blue",
 		"syntaxComment": "base1",
-		"syntaxKeyword": "green",
+		"syntaxKeyword": "orange",
 		"syntaxFunction": "blue",
 		"syntaxVariable": "cyan",
-		"syntaxString": "cyan",
+		"syntaxString": "green",
 		"syntaxNumber": "magenta",
 		"syntaxType": "yellow",
-		"syntaxOperator": "base00",
-		"syntaxPunctuation": "base00",
+		"syntaxOperator": "base01",
+		"syntaxPunctuation": "base01",
 		"thinkingOff": "base1",
-		"thinkingMinimal": "base01",
-		"thinkingLow": "blue",
-		"thinkingMedium": "cyan",
+		"thinkingMinimal": "base00",
+		"thinkingLow": "cyan",
+		"thinkingMedium": "blue",
 		"thinkingHigh": "violet",
 		"thinkingXhigh": "magenta",
 		"bashMode": "green",
-		"statusLineBg": "base3",
+		"statusLineBg": "^2",
 		"statusLineSep": "base1",
-		"statusLineModel": "magenta",
+		"statusLineModel": "blue",
 		"statusLinePath": "cyan",
 		"statusLineGitClean": "green",
 		"statusLineGitDirty": "yellow",
-		"statusLineContext": "violet",
+		"statusLineContext": "base00",
 		"statusLineSpend": "cyan",
-		"statusLineStaged": "green",
-		"statusLineDirty": "orange",
-		"statusLineUntracked": "blue",
-		"statusLineOutput": "magenta",
-		"statusLineCost": "red",
-		"statusLineSubagents": "cyan",
-		"pythonMode": "yellow"
+		"statusLineStaged": 64,
+		"statusLineDirty": 136,
+		"statusLineUntracked": 37,
+		"statusLineOutput": 37,
+		"statusLineCost": 64,
+		"statusLineSubagents": "blue",
+		"pythonMode": "yellow",
+		"appBg": "^0"
 	},
 	"export": {
-		"pageBg": "base3",
+		"pageBg": "#fdf6e3",
 		"cardBg": "#ffffff",
-		"infoBg": "base2"
+		"infoBg": "#eee8d5"
 	}
 }

package/src/modes/theme/light.json

@@ -2,7 +2,7 @@
 	"$schema": "https://raw.githubusercontent.com/nghyane/arcane/main/packages/coding-agent/theme-schema.json",
 	"name": "light",
 	"vars": {
-		"teal": "#5a8080",
+		"teal": "#3e8a8a",
 		"blue": "#547da7",
 		"green": "#588458",
 		"red": "#aa5555",
@@ -43,6 +43,7 @@
 		"mdHeading": "yellow",
 		"mdLink": "blue",
 		"mdLinkUrl": "dimGray",
+		"link": "blue",
 		"mdCode": "teal",
 		"mdCodeBlock": "green",
 		"mdCodeBlockBorder": "mediumGray",
@@ -53,17 +54,17 @@
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
 		"toolDiffContext": "mediumGray",
-		"syntaxComment": "#008000",
-		"syntaxKeyword": "#0000FF",
-		"syntaxFunction": "#795E26",
-		"syntaxVariable": "#001080",
-		"syntaxString": "#A31515",
-		"syntaxNumber": "#098658",
-		"syntaxType": "#267F99",
-		"syntaxOperator": "#000000",
-		"syntaxPunctuation": "#000000",
+		"syntaxComment": "#8a8a8a",
+		"syntaxKeyword": "#a626a4",
+		"syntaxFunction": "#4078f2",
+		"syntaxVariable": "#986801",
+		"syntaxString": "#50a14f",
+		"syntaxNumber": "#986801",
+		"syntaxType": "#c18401",
+		"syntaxOperator": "#4078f2",
+		"syntaxPunctuation": "#696c77",
 		"thinkingOff": "lightGray",
-		"thinkingMinimal": "#767676",
+		"thinkingMinimal": "dimGray",
 		"thinkingLow": "blue",
 		"thinkingMedium": "teal",
 		"thinkingHigh": "#875f87",
@@ -83,7 +84,8 @@
 		"statusLineOutput": 133,
 		"statusLineCost": 133,
 		"statusLineSubagents": "teal",
-		"pythonMode": "yellow"
+		"pythonMode": "yellow",
+		"appBg": "^0"
 	},
 	"export": {
 		"pageBg": "#f8f8f8",

package/src/modes/theme/theme-schema.json

@@ -315,6 +315,10 @@
 					"$ref": "#/$defs/colorValue",
 					"description": "Status line background"
 				},
+				"appBg": {
+					"$ref": "#/$defs/colorValue",
+					"description": "App-wide background color"
+				},
 				"statusLineSep": {
 					"$ref": "#/$defs/colorValue",
 					"description": "Status line separator color"

package/src/modes/theme/theme.ts

@@ -6,7 +6,7 @@ import {
 	supportsLanguage as nativeSupportsLanguage,
 } from "@nghyane/arcane-natives";
 import type { EditorTheme, MarkdownTheme, SelectListTheme, SymbolTheme } from "@nghyane/arcane-tui";
-import { adjustHsv, isEnoent, logger } from "@nghyane/arcane-utils";
+import { adjustHsv, hexToHsv, hsvToHex, isEnoent, logger } from "@nghyane/arcane-utils";
 import { getCustomThemesDir } from "@nghyane/arcane-utils/dirs";
 import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
@@ -959,7 +959,8 @@ export type ThemeBg =
 	| "toolPendingBg"
 	| "toolSuccessBg"
 	| "toolErrorBg"
-	| "statusLineBg";
+	| "statusLineBg"
+	| "appBg";
 
 type ColorMode = "truecolor" | "256color";
 
@@ -1015,7 +1016,7 @@ function resolveVarRefs(
 	vars: Record<string, ColorValue>,
 	visited = new Set<string>(),
 ): string | number {
-	if (typeof value === "number" || value === "" || value.startsWith("#")) {
+	if (typeof value === "number" || value === "" || value.startsWith("#") || value.startsWith("^")) {
 		return value;
 	}
 	if (visited.has(value)) {
@@ -1171,10 +1172,28 @@ export class Theme {
 		return `${ansi}${text}\x1b[39m`; // Reset only foreground color
 	}
 
-	bg(color: ThemeBg, text: string): string {
+	/**
+	 * Wrap text with a background color, stabilizing inner SGR resets.
+	 * When terminal bg is not detected, uses reverse video as fallback.
+	 * This is the single source of truth for bg wrapping — all bg rendering goes through here.
+	 */
+	wrapBg(color: ThemeBg, text: string): string {
 		const ansi = this.#bgColors[color];
 		if (!ansi) throw new Error(`Unknown theme background color: ${color}`);
-		return `${ansi}${text}\x1b[49m`; // Reset only background color
+		if (ansi === "\x1b[49m") {
+			// Transparent fallback: reverse video with fg color preservation
+			const stabilized = text
+				.replace(/\x1b\[(?:0)?m/g, m => `${m}\x1b[7m`)
+				.replace(/\x1b\[(?:3[0-9]m|38;)/g, m => `\x1b[27m${m}`);
+			return `\x1b[7m${stabilized}\x1b[27m`;
+		}
+		// Real bg: stabilize inner resets by re-applying bg after them
+		const stabilized = text.replace(/\x1b\[(?:0)?m/g, m => `${m}${ansi}`).replace(/\x1b\[49m/g, m => `${m}${ansi}`);
+		return `${ansi}${stabilized}${this.#bgColors.appBg}`;
+	}
+
+	bg(color: ThemeBg, text: string): string {
+		return this.wrapBg(color, text);
 	}
 
 	bold(text: string): string {
@@ -1209,6 +1228,19 @@ export class Theme {
 		return ansi;
 	}
 
+	getAppBgAnsi(): string {
+		return this.#bgColors.appBg;
+	}
+
+	getAppBgPackedRgb(): number {
+		const ansi = this.#bgColors.appBg;
+		const match = ansi.match(/\x1b\[48;2;(\d+);(\d+);(\d+)m/);
+		if (!match) return 0;
+		return (
+			((Number(match[1]) & 0xff) << 16) | ((Number(match[2]) & 0xff) << 8) | (Number(match[3]) & 0xff) | 0x01000000
+		);
+	}
+
 	getColorMode(): ColorMode {
 		return this.mode;
 	}
@@ -1563,11 +1595,48 @@ interface CreateThemeOptions {
 	mode?: ColorMode;
 	symbolPresetOverride?: SymbolPreset;
 	colorBlindMode?: boolean;
+	terminalBg?: string;
 }
 
 /** HSV adjustment to shift green toward blue for colorblind mode (red-green colorblindness) */
 const COLORBLIND_ADJUSTMENT = { h: 60, s: 0.71 };
 
+/**
+ * Resolve a relative bg color value against the terminal background.
+ * Format: "^N" where N is a brightness adjustment percentage.
+ * Positive = lighter, negative = darker. E.g., "^5" or "^-3".
+ * Returns the resolved hex color, or the original value if not relative.
+ */
+function resolveRelativeBg(value: string | number, terminalBg: string): string | number {
+	if (typeof value !== "string" || !value.startsWith("^")) return value;
+	const delta = parseFloat(value.slice(1));
+	if (Number.isNaN(delta)) return value;
+	const hsv = hexToHsv(terminalBg);
+	hsv.v = Math.max(0, Math.min(1, hsv.v + delta / 100));
+	return hsvToHex(hsv);
+}
+
+function detectDefaultSymbolPreset(): SymbolPreset {
+	const termProgram = Bun.env.TERM_PROGRAM ?? "";
+	const term = Bun.env.TERM ?? "";
+
+	// Terminals with known Nerd Font fallback support
+	const nerdFontTerminals = new Set([
+		"iTerm.app",
+		"WezTerm",
+		"Hyper",
+		"vscode",
+		"Termius",
+		"WarpTerminal",
+		"ghostty",
+		"Tabby",
+	]);
+	if (nerdFontTerminals.has(termProgram)) return "nerd";
+	if (term === "xterm-kitty") return "nerd";
+
+	return "unicode";
+}
+
 function createTheme(themeJson: ThemeJson, options: CreateThemeOptions = {}): Theme {
 	const { mode, symbolPresetOverride, colorBlindMode } = options;
 	const colorMode = mode ?? detectColorMode();
@@ -1580,6 +1649,15 @@ function createTheme(themeJson: ThemeJson, options: CreateThemeOptions = {}): Th
 		}
 	}
 
+	// Resolve relative bg colors (^N format) against terminal background
+	const termBg = options.terminalBg;
+	for (const key of Object.keys(resolvedColors) as Array<keyof typeof resolvedColors>) {
+		const value = resolvedColors[key];
+		if (typeof value === "string" && value.startsWith("^")) {
+			resolvedColors[key] = termBg ? resolveRelativeBg(value, termBg) : "";
+		}
+	}
+
 	const fgColors: Record<ThemeColor, string | number> = {} as Record<ThemeColor, string | number>;
 	const bgColors: Record<ThemeBg, string | number> = {} as Record<ThemeBg, string | number>;
 	const bgColorKeys: Set<string> = new Set([
@@ -1590,6 +1668,7 @@ function createTheme(themeJson: ThemeJson, options: CreateThemeOptions = {}): Th
 		"toolSuccessBg",
 		"toolErrorBg",
 		"statusLineBg",
+		"appBg",
 	]);
 	for (const [key, value] of Object.entries(resolvedColors)) {
 		if (bgColorKeys.has(key)) {
@@ -1599,7 +1678,7 @@ function createTheme(themeJson: ThemeJson, options: CreateThemeOptions = {}): Th
 		}
 	}
 	// Extract symbol configuration - settings override takes precedence over theme
-	const symbolPreset: SymbolPreset = symbolPresetOverride ?? themeJson.symbols?.preset ?? "unicode";
+	const symbolPreset: SymbolPreset = symbolPresetOverride ?? themeJson.symbols?.preset ?? detectDefaultSymbolPreset();
 	const symbolOverrides = themeJson.symbols?.overrides ?? {};
 	return new Theme(fgColors, bgColors, colorMode, symbolPreset, symbolOverrides);
 }
@@ -1650,6 +1729,7 @@ export function getCurrentThemeName(): string | undefined {
 }
 var currentSymbolPresetOverride: SymbolPreset | undefined;
 var currentColorBlindMode: boolean = false;
+var currentTerminalBg: string | undefined;
 var themeWatcher: fs.FSWatcher | undefined;
 var sigwinchHandler: (() => void) | undefined;
 var autoDetectedTheme: boolean = false;
@@ -1662,6 +1742,7 @@ function getCurrentThemeOptions(): CreateThemeOptions {
 	return {
 		symbolPresetOverride: currentSymbolPresetOverride,
 		colorBlindMode: currentColorBlindMode,
+		terminalBg: currentTerminalBg,
 	};
 }
 
@@ -1671,6 +1752,7 @@ export async function initTheme(
 	colorBlindMode?: boolean,
 	darkTheme?: string,
 	lightTheme?: string,
+	terminalBg?: string,
 ): Promise<void> {
 	autoDetectedTheme = true;
 	autoDarkTheme = darkTheme ?? "dark";
@@ -1679,6 +1761,7 @@ export async function initTheme(
 	currentThemeName = name;
 	currentSymbolPresetOverride = symbolPreset;
 	currentColorBlindMode = colorBlindMode ?? false;
+	currentTerminalBg = terminalBg;
 	try {
 		theme = await loadTheme(name, getCurrentThemeOptions());
 		if (enableWatcher) {

package/src/patch/applicator.ts

@@ -890,10 +890,11 @@ function applyCharacterMatch(
 	const adjustedNewText = adjustIndentation(normalizedOldText, matchOutcome.match.actualText, newText);
 
 	const warnings: string[] = [];
-	if (matchOutcome.dominantFuzzy && matchOutcome.match) {
+	if (matchOutcome.match && matchOutcome.match.confidence < 0.97) {
 		const similarity = Math.round(matchOutcome.match.confidence * 100);
+		const qualifier = matchOutcome.dominantFuzzy ? "Dominant fuzzy" : "Fuzzy";
 		warnings.push(
-			`Dominant fuzzy match selected in ${path} near line ${matchOutcome.match.startLine} (${similarity}% similar).`,
+			`${qualifier} match applied in ${path} near line ${matchOutcome.match.startLine} (${similarity}% similar).`,
 		);
 	}
 
@@ -1152,9 +1153,16 @@ function computeReplacements(
 
 		const found = searchResult.index;
 
-		if (searchResult.strategy === "fuzzy-dominant") {
+		if (
+			searchResult.strategy === "prefix" ||
+			searchResult.strategy === "substring" ||
+			searchResult.strategy === "fuzzy" ||
+			searchResult.strategy === "fuzzy-dominant"
+		) {
 			const similarity = Math.round(searchResult.confidence * 100);
-			warnings.push(`Dominant fuzzy match selected in ${path} near line ${found + 1} (${similarity}% similar).`);
+			warnings.push(
+				`Non-exact match applied in ${path} near line ${found + 1} (${similarity}% similar, strategy: ${searchResult.strategy}).`,
+			);
 		}
 
 		// Reject if match is ambiguous (prefix/substring matching found multiple matches)

package/src/prompts/agents/task.md

@@ -8,7 +8,7 @@ Finish only the assigned work and return the minimum useful result.
 - Avoid full-file reads unless necessary.
 - Prefer edits to existing files over creating new ones.
 - NEVER create documentation files (*.md) unless explicitly requested.
-- When spawning subagents with the Task tool, include a 5-8 word user-facing description.
+- When done, write a concise summary of what you did as your final response. This is your output.
 - Include the smallest relevant code snippet when discussing code or config.
 - Follow the main agent's instructions.
 </directives>

package/src/prompts/system/subagent-system-prompt.md

@@ -11,20 +11,8 @@ For additional parent conversation context, check {{contextFile}} (`tail -100` o
 {{/if}}
 
 <critical>
-- MUST call `submit_result` exactly once when finished. No JSON in text. No plain-text summary. Pass result via `data` parameter.
-- Todo tracking is parent-owned. Do not create or maintain a separate todo list in this subagent.
-{{#if outputSchema}}
-- If cannot complete, call `submit_result` with `status="aborted"` and error message. Do not provide success result or pretend completion.
-{{else}}
-- If cannot complete, call `submit_result` with `status="aborted"` and error message. Do not claim success.
-{{/if}}
-{{#if outputSchema}}
-- `data` parameter MUST be valid JSON matching TypeScript interface:
-```ts
-{{jtdToTypeScript outputSchema}}
-```
-{{/if}}
-- If cannot complete, call `submit_result` exactly once with result indicating failure/abort status (use failure/notes field if available). Do not claim success.
+- When done, stop. Your final text response is your output — the parent receives it as the task result.
+- If cannot complete, report failure clearly in your final response. Do not claim success.
 - Do NOT abort due to uncertainty or missing info that can be obtained via tools or repo context. Use `find`/`grep`/`read` first, then proceed with reasonable defaults if multiple options are acceptable.
 - Aborting is only acceptable when truly blocked after exhausting tools and reasonable attempts. If you abort, include what you tried and the exact blocker in the result.
 - Keep going until request is fully fulfilled. This matters.

package/src/prompts/system/system-prompt.md

@@ -115,8 +115,17 @@ The question is not "does this work?" but "under what conditions? What happens o
 - Skip entirely for single-step or trivial requests.
 
 {{#has tools "task"}}
-### Parallel Execution
-Use the Task tool when work genuinely forks into independent streams:
+### Delegation
+You have subagents. Pick the right one:
+- "I need to think through architecture/plan" → **Oracle**
+- "I need to understand unfamiliar code" → **Explore / Librarian**
+- "I know what to do, need parallel execution" → **Task tool**
+
+Workflow for complex work: Oracle (plan) → Explore (validate scope) → Task (execute).
+
+Task tool is a fire-and-forget executor — a productive junior engineer who cannot ask follow-ups once started. Prompt it with detailed instructions, enumerate deliverables, include constraints and verification steps.
+
+Use Task tool when work genuinely forks into independent streams:
 - Editing 4+ files with no dependencies between edits
 - Investigating 2+ independent subsystems
 - Work that decomposes into pieces not needing each other's results
@@ -231,18 +240,7 @@ Current date: {{date}}
 
 {{#has tools "task"}}
 <parallel_reflex>
-When work forks, you fork.
-
-Notice the sequential habit:
-- Comfort in doing one thing at a time
-- Illusion that order = correctness
-- Assumption that B depends on A
-  **Use Task tool when:**
-- Editing 4+ files with no dependencies between edits
-- Investigating 2+ independent subsystems
-- Work decomposes into pieces not needing each other's results
-
-Sequential work requires justification. If you cannot articulate why B depends on A → parallelize.
+When work forks, you fork. Sequential work requires justification — if you cannot articulate why B depends on A, parallelize via Task tool.
 </parallel_reflex>
 {{/has}}