@nghyane/arcane 0.1.10 → 0.1.11

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@nghyane/arcane",
-	"version": "0.1.10",
+	"version": "0.1.11",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/nghyane/arcane",
 	"author": "Can Bölük",
@@ -45,11 +45,11 @@
 	"dependencies": {
 		"@mozilla/readability": "0.6.0",
 		"@nghyane/arcane-stats": "^0.1.8",
-		"@nghyane/arcane-agent": "^0.1.8",
-		"@nghyane/arcane-codemode": "^0.1.9",
+		"@nghyane/arcane-agent": "^0.1.9",
+		"@nghyane/arcane-codemode": "^0.1.10",
 		"@nghyane/arcane-ai": "^0.1.8",
 		"@nghyane/arcane-natives": "^0.1.7",
-		"@nghyane/arcane-tui": "^0.1.8",
+		"@nghyane/arcane-tui": "^0.1.9",
 		"@nghyane/arcane-utils": "^0.1.6",
 		"@sinclair/typebox": "^0.34.48",
 		"@xterm/headless": "^6.0.0",

package/src/main.ts

@@ -11,6 +11,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
 import { type ImageContent, supportsXhigh } from "@nghyane/arcane-ai";
+import { queryTerminalBackground } from "@nghyane/arcane-tui";
 import { $env, postmortem } from "@nghyane/arcane-utils";
 import { getProjectDir, setProjectDir } from "@nghyane/arcane-utils/dirs";
 import chalk from "chalk";
@@ -591,12 +592,14 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		});
 	}
 
+	const terminalBg = isInteractive ? await queryTerminalBackground() : null;
 	await initTheme(
 		isInteractive,
 		settings.get("symbolPreset"),
 		settings.get("colorBlindMode"),
 		settings.get("theme.dark"),
 		settings.get("theme.light"),
+		terminalBg ?? undefined,
 	);
 	time("initTheme:final");
 

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

@@ -21,7 +21,7 @@ import { DynamicBorder } from "./dynamic-border";
 function makeInvertedBadge(label: string, color: ThemeColor): string {
 	const fgAnsi = theme.getFgAnsi(color);
 	const bgAnsi = fgAnsi.replace(/\x1b\[38;/g, "\x1b[48;");
-	return `${bgAnsi}\x1b[30m ${label} \x1b[39m\x1b[49m`;
+	return `${bgAnsi}\x1b[30m ${label} \x1b[39m${theme.getAppBgAnsi()}`;
 }
 
 interface ModelItem {

package/src/modes/components/status-line.ts

@@ -309,78 +309,53 @@ export class StatusLineComponent implements Component {
 		const ctx = this.#buildSegmentContext(width);
 		const effectiveSettings = this.#resolveSettings();
 		const separatorDef = getSeparator(effectiveSettings.separator ?? "powerline-thin", theme);
-
-		const bgAnsi = theme.getBgAnsi("statusLineBg");
 		const fgAnsi = theme.getFgAnsi("text");
 		const sepAnsi = theme.getFgAnsi("statusLineSep");
+		const leftSepWidth = visibleWidth(separatorDef.left);
+		const rightSepWidth = visibleWidth(separatorDef.right);
 
-		// Collect visible segment contents
 		const leftParts: string[] = [];
-		for (const segId of effectiveSettings.leftSegments) {
+		for (const segId of this.#resolveSettings().leftSegments) {
 			const rendered = renderSegment(segId, ctx);
-			if (rendered.visible && rendered.content) {
-				leftParts.push(rendered.content);
-			}
+			if (rendered.visible && rendered.content) leftParts.push(rendered.content);
 		}
 
 		const rightParts: string[] = [];
-		for (const segId of effectiveSettings.rightSegments) {
+		for (const segId of this.#resolveSettings().rightSegments) {
 			const rendered = renderSegment(segId, ctx);
-			if (rendered.visible && rendered.content) {
-				rightParts.push(rendered.content);
-			}
+			if (rendered.visible && rendered.content) rightParts.push(rendered.content);
 		}
 
 		const topFillWidth = width > 0 ? Math.max(0, width - 4) : 0;
 		const left = [...leftParts];
 		const right = [...rightParts];
 
-		const leftSepWidth = visibleWidth(separatorDef.left);
-		const rightSepWidth = visibleWidth(separatorDef.right);
-		const leftCapWidth = separatorDef.endCaps ? visibleWidth(separatorDef.endCaps.right) : 0;
-		const rightCapWidth = separatorDef.endCaps ? visibleWidth(separatorDef.endCaps.left) : 0;
-
-		const groupWidth = (parts: string[], capWidth: number, sepWidth: number): number => {
+		const groupWidth = (parts: string[], sepWidth: number): number => {
 			if (parts.length === 0) return 0;
 			const partsWidth = parts.reduce((sum, part) => sum + visibleWidth(part), 0);
 			const sepTotal = Math.max(0, parts.length - 1) * (sepWidth + 2);
-			return partsWidth + sepTotal + 2 + capWidth;
+			return partsWidth + sepTotal + 2;
 		};
 
-		let leftWidth = groupWidth(left, leftCapWidth, leftSepWidth);
-		let rightWidth = groupWidth(right, rightCapWidth, rightSepWidth);
+		let leftWidth = groupWidth(left, leftSepWidth);
+		let rightWidth = groupWidth(right, rightSepWidth);
 		const totalWidth = () => leftWidth + rightWidth + (left.length > 0 && right.length > 0 ? 1 : 0);
 
 		if (topFillWidth > 0) {
 			while (totalWidth() > topFillWidth && right.length > 0) {
 				right.pop();
-				rightWidth = groupWidth(right, rightCapWidth, rightSepWidth);
+				rightWidth = groupWidth(right, rightSepWidth);
 			}
 			while (totalWidth() > topFillWidth && left.length > 0) {
 				left.pop();
-				leftWidth = groupWidth(left, leftCapWidth, leftSepWidth);
+				leftWidth = groupWidth(left, leftSepWidth);
 			}
 		}
 
 		const renderGroup = (parts: string[], direction: "left" | "right"): string => {
 			if (parts.length === 0) return "";
 			const sep = direction === "left" ? separatorDef.left : separatorDef.right;
-			const cap = separatorDef.endCaps
-				? direction === "left"
-					? separatorDef.endCaps.right
-					: separatorDef.endCaps.left
-				: "";
-			const capPrefix = separatorDef.endCaps?.useBgAsFg ? bgAnsi.replace("\x1b[48;", "\x1b[38;") : bgAnsi + sepAnsi;
-			const capText = cap ? `${capPrefix}${cap}\x1b[0m` : "";
-
-			let content = bgAnsi + fgAnsi;
-			content += ` ${parts.join(` ${sepAnsi}${sep}${fgAnsi} `)} `;
-			content += "\x1b[0m";
-
-			if (capText) {
-				return direction === "right" ? capText + content : content + capText;
-			}
-			return content;
+			return `${fgAnsi} ${parts.join(` ${sepAnsi}${sep}${fgAnsi} `)} \x1b[0m`;
 		};
 
 		const leftGroup = renderGroup(left, "left");
@@ -391,8 +366,8 @@ export class StatusLineComponent implements Component {
 			return leftGroup + (leftGroup && rightGroup ? " " : "") + rightGroup;
 		}
 
-		leftWidth = groupWidth(left, leftCapWidth, leftSepWidth);
-		rightWidth = groupWidth(right, rightCapWidth, rightSepWidth);
+		leftWidth = groupWidth(left, leftSepWidth);
+		rightWidth = groupWidth(right, rightSepWidth);
 		const gapWidth = Math.max(1, topFillWidth - leftWidth - rightWidth);
 		return leftGroup + padding(gapWidth) + rightGroup;
 	}

package/src/modes/components/user-message.ts

@@ -8,6 +8,7 @@ export class UserMessageComponent extends Container {
 	constructor(text: string, synthetic = false) {
 		super();
 		const bgColor = (value: string) => theme.bg("userMessageBg", value);
+		const leftBorder = theme.fg("accent", "▎");
 		const color = synthetic
 			? (value: string) => theme.fg("dim", value)
 			: (value: string) => theme.fg("userMessageText", value);
@@ -16,6 +17,7 @@ export class UserMessageComponent extends Container {
 			new Markdown(text, 1, 1, getMarkdownTheme(), {
 				bgColor,
 				color,
+				leftBorder,
 			}),
 		);
 	}

package/src/modes/components/welcome.ts

@@ -82,7 +82,7 @@ export class WelcomeComponent implements Component {
 			...logoColored.map(l => this.#centerText(l, leftCol)),
 			"",
 			this.#centerText(theme.fg("muted", this.modelName), leftCol),
-			this.#centerText(theme.fg("borderMuted", this.providerName), leftCol),
+			this.#centerText(theme.fg("dim", this.providerName), leftCol),
 		];
 
 		// Right column separator

package/src/modes/interactive-mode.ts

@@ -175,6 +175,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		this.ui = new TUI(new ProcessTerminal(), settings.get("showHardwareCursor"));
 		this.ui.setClearOnShrink(settings.get("clearOnShrink"));
+		this.ui.setAppBg(theme.getAppBgPackedRgb());
 		setMermaidRenderCallback(() => this.ui.requestRender());
 		this.chatContainer = new Container();
 		this.pendingMessagesContainer = new Container();
@@ -344,6 +345,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		// Set up theme file watcher
 		onThemeChange(() => {
 			this.ui.invalidate();
+			this.ui.setAppBg(theme.getAppBgPackedRgb());
 			this.updateEditorBorderColor();
 			this.ui.requestRender();
 		});

package/src/modes/theme/dark.json

@@ -2,26 +2,22 @@
 	"$schema": "https://raw.githubusercontent.com/nghyane/arcane/main/packages/coding-agent/theme-schema.json",
 	"name": "dark",
 	"vars": {
-		"cyan": "#0088fa",
-		"blue": "#178fb9",
-		"green": "#89d281",
-		"red": "#fc3a4b",
-		"yellow": "#e4c00f",
-		"gray": "#777d88",
-		"dimGray": "#5f6673",
-		"darkGray": "#3d424a",
-		"accent": "#febc38",
-		"selectedBg": "#31363f",
-		"userMsgBg": "#221d1a",
-		"toolPendingBg": "#1d2129",
-		"toolSuccessBg": "#161a1f",
-		"toolErrorBg": "#291d1d",
-		"customMsgBg": "#2a2530"
+		"cyan": "#8fbcbb",
+		"blue": "#88c0d0",
+		"lightBlue": "#81a1c1",
+		"green": "#a3be8c",
+		"red": "#d06050",
+		"yellow": "#ebcb8b",
+		"gray": "#7b88a1",
+		"dimGray": "#4c566a",
+		"darkGray": "#434c5e",
+		"accent": "#d08770",
+		"darkGrayBg": "#434c5e"
 	},
 	"colors": {
 		"accent": "accent",
 		"border": "blue",
-		"borderAccent": "cyan",
+		"borderAccent": "accent",
 		"borderMuted": "darkGray",
 		"success": "green",
 		"error": "red",
@@ -30,22 +26,22 @@
 		"dim": "dimGray",
 		"text": "",
 		"thinkingText": "gray",
-		"selectedBg": "selectedBg",
-		"userMessageBg": "userMsgBg",
+		"selectedBg": "^2",
+		"userMessageBg": "^2",
 		"userMessageText": "",
-		"customMessageBg": "customMsgBg",
+		"customMessageBg": "^2",
 		"customMessageText": "",
-		"customMessageLabel": "#b281d6",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
+		"customMessageLabel": "accent",
+		"toolPendingBg": "^3",
+		"toolSuccessBg": "^2",
+		"toolErrorBg": "^3",
 		"toolTitle": "",
 		"toolOutput": "gray",
-		"mdHeading": "#febc38",
-		"mdLink": "#0088fa",
+		"mdHeading": "accent",
+		"mdLink": "blue",
 		"mdLinkUrl": "dimGray",
-		"mdCode": "#e5c1ff",
-		"mdCodeBlock": "#9CDCFE",
+		"mdCode": "yellow",
+		"mdCodeBlock": "green",
 		"mdCodeBlockBorder": "darkGray",
 		"mdQuote": "gray",
 		"mdQuoteBorder": "darkGray",
@@ -54,42 +50,43 @@
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
 		"toolDiffContext": "gray",
-		"link": "#0088fa",
-		"syntaxComment": "#6A9955",
-		"syntaxKeyword": "#569CD6",
-		"syntaxFunction": "#DCDCAA",
-		"syntaxVariable": "#9CDCFE",
-		"syntaxString": "#CE9178",
-		"syntaxNumber": "#B5CEA8",
-		"syntaxType": "#4EC9B0",
-		"syntaxOperator": "#D4D4D4",
-		"syntaxPunctuation": "#D4D4D4",
+		"link": "blue",
+		"syntaxComment": "gray",
+		"syntaxKeyword": "lightBlue",
+		"syntaxFunction": "blue",
+		"syntaxVariable": "cyan",
+		"syntaxString": "green",
+		"syntaxNumber": "#b48ead",
+		"syntaxType": "yellow",
+		"syntaxOperator": "gray",
+		"syntaxPunctuation": "gray",
 		"thinkingOff": "darkGray",
 		"thinkingMinimal": "dimGray",
-		"thinkingLow": "#178fb9",
-		"thinkingMedium": "#0088fa",
-		"thinkingHigh": "#b281d6",
-		"thinkingXhigh": "#e5c1ff",
-		"bashMode": "cyan",
-		"statusLineBg": "#121212",
-		"statusLineSep": 244,
-		"statusLineModel": "#d787af",
-		"statusLinePath": "#00afaf",
-		"statusLineGitClean": "#5faf5f",
-		"statusLineGitDirty": "#d7af5f",
-		"statusLineContext": "#8787af",
-		"statusLineSpend": "#5fafaf",
-		"statusLineStaged": 70,
-		"statusLineDirty": 178,
-		"statusLineUntracked": 39,
-		"statusLineOutput": 205,
-		"statusLineCost": 205,
+		"thinkingLow": "blue",
+		"thinkingMedium": "cyan",
+		"thinkingHigh": "accent",
+		"thinkingXhigh": "#c87558",
+		"bashMode": "accent",
+		"statusLineBg": "^-2",
+		"statusLineSep": "dimGray",
+		"statusLineModel": "accent",
+		"statusLinePath": "blue",
+		"statusLineGitClean": "green",
+		"statusLineGitDirty": "yellow",
+		"statusLineContext": "gray",
+		"statusLineSpend": "cyan",
+		"statusLineStaged": 179,
+		"statusLineDirty": 173,
+		"statusLineUntracked": 180,
+		"statusLineOutput": 180,
+		"statusLineCost": 173,
 		"statusLineSubagents": "accent",
-		"pythonMode": "yellow"
+		"pythonMode": "yellow",
+		"appBg": "^0"
 	},
 	"export": {
-		"pageBg": "#18181e",
-		"cardBg": "#1e1e24",
-		"infoBg": "#3c3728"
+		"pageBg": "#242933",
+		"cardBg": "#323846",
+		"infoBg": "#2d333b"
 	}
 }

package/src/modes/theme/defaults/dark-catppuccin.json

@@ -12,96 +12,87 @@
 		"yellow": "#f9e2af",
 		"green": "#a6e3a1",
 		"teal": "#94e2d5",
-		"sky": "#89dceb",
 		"sapphire": "#74c7ec",
 		"blue": "#89b4fa",
 		"lavender": "#b4befe",
-		"text": "#cdd6f4",
-		"subtext1": "#bac2de",
 		"subtext0": "#a6adc8",
-		"overlay2": "#9399b2",
-		"overlay1": "#7f849c",
 		"overlay0": "#6c7086",
-		"surface2": "#585b70",
 		"surface1": "#45475a",
-		"surface0": "#313244",
-		"base": "#1e1e2e",
-		"mantle": "#181825",
-		"crust": "#11111b"
+		"surface0": "#313244"
 	},
 	"colors": {
-		"accent": "peach",
-		"border": "blue",
-		"borderAccent": "lavender",
-		"borderMuted": "surface0",
+		"accent": "mauve",
+		"border": "lavender",
+		"borderAccent": "mauve",
+		"borderMuted": "surface1",
 		"success": "green",
 		"error": "red",
 		"warning": "yellow",
-		"muted": "overlay1",
-		"dim": "overlay0",
+		"muted": "overlay0",
+		"dim": "surface1",
 		"text": "",
-		"thinkingText": "overlay1",
-		"selectedBg": "surface0",
-		"userMessageBg": "mantle",
+		"thinkingText": "overlay0",
+		"selectedBg": "^2",
+		"userMessageBg": "^2",
 		"userMessageText": "",
-		"customMessageBg": "crust",
+		"customMessageBg": "^2",
 		"customMessageText": "",
 		"customMessageLabel": "mauve",
-		"toolPendingBg": "surface0",
-		"toolSuccessBg": "mantle",
-		"toolErrorBg": "crust",
-		"toolText": "",
-		"toolTitle": "lavender",
-		"toolOutput": "overlay1",
-		"mdHeading": "peach",
+		"toolPendingBg": "^3",
+		"toolSuccessBg": "^2",
+		"toolErrorBg": "^3",
+		"toolTitle": "",
+		"toolOutput": "overlay0",
+		"mdHeading": "mauve",
 		"mdLink": "blue",
 		"mdLinkUrl": "overlay0",
-		"mdCode": "rosewater",
-		"mdCodeBlock": "text",
-		"mdCodeBlockBorder": "surface0",
-		"mdQuote": "overlay1",
+		"mdCode": "peach",
+		"mdCodeBlock": "green",
+		"mdCodeBlockBorder": "surface1",
+		"mdQuote": "overlay0",
 		"mdQuoteBorder": "surface0",
-		"mdHr": "surface0",
-		"mdListBullet": "peach",
+		"mdHr": "surface1",
+		"mdListBullet": "mauve",
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
-		"toolDiffContext": "overlay1",
+		"toolDiffContext": "overlay0",
 		"link": "blue",
 		"syntaxComment": "overlay0",
 		"syntaxKeyword": "mauve",
 		"syntaxFunction": "blue",
-		"syntaxVariable": "text",
+		"syntaxVariable": "teal",
 		"syntaxString": "green",
 		"syntaxNumber": "peach",
 		"syntaxType": "yellow",
-		"syntaxOperator": "sky",
-		"syntaxPunctuation": "overlay2",
+		"syntaxOperator": "subtext0",
+		"syntaxPunctuation": "subtext0",
 		"thinkingOff": "surface0",
 		"thinkingMinimal": "overlay0",
-		"thinkingLow": "blue",
-		"thinkingMedium": "sapphire",
+		"thinkingLow": "sapphire",
+		"thinkingMedium": "blue",
 		"thinkingHigh": "mauve",
 		"thinkingXhigh": "pink",
-		"bashMode": "teal",
-		"statusLineBg": "crust",
+		"bashMode": "green",
+		"statusLineBg": "^-2",
 		"statusLineSep": "surface1",
-		"statusLineModel": "pink",
-		"statusLinePath": "teal",
+		"statusLineModel": "mauve",
+		"statusLinePath": "blue",
 		"statusLineGitClean": "green",
-		"statusLineGitDirty": "yellow",
-		"statusLineContext": "mauve",
-		"statusLineSpend": "sapphire",
-		"statusLineStaged": "green",
-		"statusLineDirty": "peach",
-		"statusLineUntracked": "sky",
-		"statusLineOutput": "maroon",
-		"statusLineCost": "maroon",
-		"statusLineSubagents": "peach",
-		"pythonMode": "yellow"
+		"statusLineGitDirty": "peach",
+		"statusLineContext": "overlay0",
+		"statusLineSpend": "teal",
+		"statusLineStaged": 107,
+		"statusLineDirty": 216,
+		"statusLineUntracked": 183,
+		"statusLineOutput": 183,
+		"statusLineCost": 107,
+		"statusLineSubagents": "mauve",
+		"pythonMode": "yellow",
+		"appBg": "^0"
 	},
 	"export": {
-		"pageBg": "base",
-		"cardBg": "mantle",
-		"infoBg": "surface0"
+		"pageBg": "#1e1e2e",
+		"cardBg": "#24243e",
+		"infoBg": "#313244"
 	}
 }

package/src/modes/theme/defaults/dark-dracula.json

@@ -2,23 +2,15 @@
 	"$schema": "https://raw.githubusercontent.com/nghyane/arcane/main/packages/coding-agent/theme-schema.json",
 	"name": "dark-dracula",
 	"vars": {
-		"background": "#282A36",
-		"currentLine": "#44475A",
-		"foreground": "#F8F8F2",
-		"comment": "#6272A4",
-		"cyan": "#8BE9FD",
-		"green": "#50FA7B",
+		"cyan": "#80d4e8",
+		"green": "#5af78e",
 		"orange": "#FFB86C",
-		"pink": "#FF79C6",
+		"pink": "#f286c4",
 		"purple": "#BD93F9",
-		"red": "#FF5555",
-		"yellow": "#F1FA8C",
-		"selectedBg": "#44475A",
-		"userMsgBg": "#1f2029",
-		"toolPendingBg": "#21222C",
-		"toolSuccessBg": "#1a1f1e",
-		"toolErrorBg": "#2a2028",
-		"customMsgBg": "#2b2640"
+		"red": "#f07178",
+		"yellow": "#e8d87a",
+		"comment": "#6272A4",
+		"currentLine": "#44475A"
 	},
 	"colors": {
 		"accent": "purple",
@@ -29,20 +21,19 @@
 		"error": "red",
 		"warning": "yellow",
 		"muted": "comment",
-		"dim": "currentLine",
+		"dim": "#5E6490",
 		"text": "",
 		"thinkingText": "comment",
-		"selectedBg": "selectedBg",
-		"userMessageBg": "userMsgBg",
+		"selectedBg": "^2",
+		"userMessageBg": "^2",
 		"userMessageText": "",
-		"customMessageBg": "customMsgBg",
+		"customMessageBg": "^2",
 		"customMessageText": "",
 		"customMessageLabel": "purple",
-		"toolPendingBg": "toolPendingBg",
-		"toolSuccessBg": "toolSuccessBg",
-		"toolErrorBg": "toolErrorBg",
-		"toolText": "",
-		"toolTitle": "cyan",
+		"toolPendingBg": "^3",
+		"toolSuccessBg": "^2",
+		"toolErrorBg": "^3",
+		"toolTitle": "",
 		"toolOutput": "comment",
 		"mdHeading": "purple",
 		"mdLink": "cyan",
@@ -66,7 +57,7 @@
 		"syntaxNumber": "purple",
 		"syntaxType": "cyan",
 		"syntaxOperator": "pink",
-		"syntaxPunctuation": "foreground",
+		"syntaxPunctuation": "#F8F8F2",
 		"thinkingOff": "currentLine",
 		"thinkingMinimal": "comment",
 		"thinkingLow": "cyan",
@@ -74,7 +65,7 @@
 		"thinkingHigh": "pink",
 		"thinkingXhigh": "orange",
 		"bashMode": "green",
-		"statusLineBg": "background",
+		"statusLineBg": "^-2",
 		"statusLineSep": "currentLine",
 		"statusLineModel": "purple",
 		"statusLinePath": "cyan",
@@ -82,13 +73,14 @@
 		"statusLineGitDirty": "orange",
 		"statusLineContext": "purple",
 		"statusLineSpend": "cyan",
-		"statusLineStaged": "green",
-		"statusLineDirty": "orange",
-		"statusLineUntracked": "pink",
-		"statusLineOutput": "pink",
-		"statusLineCost": "pink",
+		"statusLineStaged": 179,
+		"statusLineDirty": 173,
+		"statusLineUntracked": 180,
+		"statusLineOutput": 180,
+		"statusLineCost": 173,
 		"statusLineSubagents": "purple",
-		"pythonMode": "yellow"
+		"pythonMode": "yellow",
+		"appBg": "^0"
 	},
 	"export": {
 		"pageBg": "#1e1f29",