@ghyper9023/pi-dev-workflow 0.4.1 → 0.4.3

package/extensions/workflow-engine.ts

@@ -31,6 +31,7 @@ import {
 	updateWorkflowWidget,
 	buildWidgetState,
 	sendWorkflowResult,
+	formatTimeout,
 	setWorkflowCancelCallback,
 	cancelWorkflow,
 	BACK_MARKER,
@@ -55,6 +56,8 @@ export interface WorkflowStepDef {
 	reviewAgentName?: string;
 	maxLoops?: number;
 	timeoutMs: number;
+	/** 独立于 loopAgent 的 reviewer 超时时间（ms），默认使用 timeoutMs */
+	reviewTimeoutMs?: number;
 }
 
 interface WorkflowStepState {
@@ -291,38 +294,52 @@ function getGitDiffChanges(cwd: string): GitFileChange[] {
 
 	try {
 		// 1. `git diff --name-status` — shows modified (M) and deleted (D) vs HEAD
+		// Format: "M\tpath/to/file" (tab-separated) or "M       path/to/file" (spaces)
 		const diffOutput = execSync("git diff --name-status", { cwd, encoding: "utf8", timeout: 5000 }).trim();
 		if (diffOutput) {
 			for (const line of diffOutput.split("\n")) {
 				const trimmed = line.trim();
 				if (!trimmed) continue;
-				// Format: "M\tpath/to/file" or "D\tpath/to/file"
-				const match = trimmed.match(/^([MAD])\s+(.+)$/);
-				if (match) {
-					const status = match[1]! as "M" | "A" | "D";
-					const path = match[2]!.trim();
-					if (path && !seen.has(path)) {
-						seen.add(path);
-						changes.push({ status, path });
+				// 使用正则解析：支持 tab 分隔（"M\tpath"）和空格填充（"M       path"）两种格式
+				const statusMatch = trimmed.match(/^([MAD])\s+(.+)$/);
+				if (statusMatch) {
+					const status = statusMatch[1]!.trim();
+					const filePath = statusMatch[2]!.trim();
+					if (filePath && !seen.has(filePath) && (status === "M" || status === "A" || status === "D")) {
+						seen.add(filePath);
+						changes.push({ status: status as "M" | "A" | "D", path: filePath });
+					}
+				}
+				// 后备：tab split（兼容部分 git 版本输出的 tab 格式）
+				else if (trimmed.includes("\t")) {
+					const parts = trimmed.split("\t");
+					if (parts.length === 2) {
+						const status = parts[0]!.trim();
+						const filePath = parts[1]!.trim();
+						if (filePath && !seen.has(filePath) && (status === "M" || status === "A" || status === "D")) {
+							seen.add(filePath);
+							changes.push({ status: status as "M" | "A" | "D", path: filePath });
+						}
 					}
 				}
 			}
 		}
 
 		// 2. `git status --porcelain` — find untracked files (??) missing from git diff
+		// Format: "XY filepath" (e.g., " M .gitignore", "?? newfile.ts", "A  filepath")
 		const statusOutput = execSync("git status --porcelain", { cwd, encoding: "utf8", timeout: 5000 }).trim();
 		if (statusOutput) {
 			for (const line of statusOutput.split("\n")) {
 				const trimmed = line.trim();
 				if (!trimmed) continue;
-				// "?? path" means untracked/new
-				// Also catch "A  path" for staged new files
-				const match = trimmed.match(/^(\?\?|A\s)\s+(.+)$/);
-				if (match) {
-					const path = match[2]!.trim();
-					if (path && !seen.has(path)) {
-						seen.add(path);
-						changes.push({ status: "A", path });
+				// 使用正则解析 --porcelain 格式：前 2 字符状态码 + 空格 + 路径
+				const statusMatch2 = trimmed.match(/^(..)\s+(.+)$/);
+				if (statusMatch2) {
+					const statusPrefix = statusMatch2[1]!.trim();
+					const filePath = statusMatch2[2]!.trim();
+					if (filePath && !seen.has(filePath) && (statusPrefix === "??" || statusPrefix === "A " || statusPrefix.startsWith("A"))) {
+						seen.add(filePath);
+						changes.push({ status: "A", path: filePath });
 					}
 				}
 			}
@@ -778,13 +795,13 @@ function addWidgetSubStepOutput(stepIndex: number, agentName: string, output: st
 }
 
 function setWidgetSubStepStatus(stepIndex: number, agentName: string, status: WorkflowSubStepWidgetState["status"]): void {
-	const step = _widgetSteps[stepIndex];
-	if (!step) return;
-	const sub = step.subSteps?.find(s => s.agent === agentName);
-	if (sub) {
+    const step = _widgetSteps[stepIndex];
+    if (!step) return;
+    const sub = step.subSteps?.find(s => s.agent === agentName);
+    if (sub) {
 		sub.status = status;
-		refreshWidget();
-	}
+        refreshWidget();
+    }
 }
 
 function setWidgetCurrentStep(index: number): void {
@@ -929,12 +946,14 @@ async function runAgentWithProgress(
 				tools: [],
 				outputs: [],
 				startedAt: agentStartTime,
+				detail: `超时时间${formatTimeout(timeoutMs)}`,
 			});
 			refreshWidget();
 		} else {
-			// Update existing sub-step status and startedAt
+			// Update existing sub-step status, startedAt, and detail
 			existing.status = "running";
 			existing.startedAt = agentStartTime;
+			existing.detail = `超时时间${formatTimeout(timeoutMs)}`;
 			refreshWidget();
 		}
 	}
@@ -1015,6 +1034,10 @@ async function runAgentWithProgress(
 				if (filePath.startsWith("http")) continue;
 				if (filePath.length < 6 && !filePath.includes("/")) continue;
 
+				// 额外过滤器：排除明显不是文件路径的脏数据
+				if (filePath.includes("${") || filePath.includes("\\n") || filePath.includes("\\t")) continue;  // 排除模板字符串和转义字符
+				if (filePath.includes("[]") || filePath.includes("{}")) continue;  // 排除数组/对象字面量
+				if (filePath.match(/^[\s,;)\]}]+$/)) continue;  // 排除纯符号
 				seenTools.add(filePath);
 				const fullMatch = m[0]!.toLowerCase();
 				// Determine operation type and convert to git status
@@ -1178,8 +1201,21 @@ async function executeLoopGroup(
 	const maxLoops = step.maxLoops ?? 3;
 	let loopCount = loopCounts[step.id] ?? 0;
 	let contextPrompt = prompt;
+	const reviewTimeoutMs = step.reviewTimeoutMs ?? step.timeoutMs;
 
 	while (loopCount < maxLoops) {
+		loopCount++;
+		// 立即更新 UI 显示当前循环次数
+		state.loopCount = loopCount;
+		updateWidgetStep(stepIndex, step.label, "running", {
+			loopCount,
+			maxLoops: step.maxLoops,
+			startedAt: _widgetSteps[stepIndex]?.startedAt || Date.now(),
+		});
+
+		// 每次循环开始时重置 sub-step 状态
+		setWidgetSubStepStatus(stepIndex, step.loopAgentName!, "pending");
+		setWidgetSubStepStatus(stepIndex, step.reviewAgentName!, "pending");
 		const loopStartTime = Date.now();
 
 		// Run loop agent
@@ -1227,7 +1263,7 @@ async function executeLoopGroup(
 			? contextPrompt
 			: buildReviewTask(contextPrompt, planFileRelPath, _workflowCwd);
 
-		const reviewResult = await runAgentWithProgress(reviewAgent, reviewTask, stepIndex, step.reviewAgentName!, step.timeoutMs);
+		const reviewResult = await runAgentWithProgress(reviewAgent, reviewTask, stepIndex, step.reviewAgentName!, reviewTimeoutMs);
 
 		const extractedOutput = extractFinalOutput(reviewResult.output) || reviewResult.output;
 		const combinedOutput = extractedOutput + "\n" + reviewResult.stderr;
@@ -1240,8 +1276,6 @@ async function executeLoopGroup(
 			}
 		}
 
-		loopCount++;
-
 		if (reviewSummary?.maxSeverity === "critical" && loopCount < maxLoops) {
 			if (mode === "full-auto") {
 				contextPrompt = [prompt, "", "## 上次审查发现的问题",
@@ -1402,7 +1436,11 @@ async function executeWorkflowBackground(
 		// ── Execute (timer starts NOW, after all user confirmations) ──
 		state.status = "running";
 		const stepStartTime = Date.now();
-		updateWidgetStep(currentStepIndex, step.label, "running", { timeoutMs: step.timeoutMs, maxLoops: step.maxLoops, startedAt: stepStartTime });
+		updateWidgetStep(currentStepIndex, step.label, "running", {
+			timeoutMs: step.type === "loop-group" ? undefined : step.timeoutMs,
+			maxLoops: step.maxLoops,
+			startedAt: stepStartTime,
+		});
 
 		try {
 			if (step.type === "loop-group") {
@@ -1419,7 +1457,7 @@ async function executeWorkflowBackground(
 				durationMs: state.durationMs,
 				loopCount: state.loopCount,
 				maxLoops: step.maxLoops,
-				timeoutMs: step.timeoutMs,
+				timeoutMs: step.type === "loop-group" ? undefined : step.timeoutMs,
 			});
 		} catch (err) {
 			state.status = "failed";
@@ -1617,7 +1655,7 @@ export async function runWorkflow(
 		const isDoneState = stepStates[i]?.status === "done";
 		updateWidgetStep(i, steps[i]!.label, isDoneState ? "done" : "pending", {
 			maxLoops: steps[i]!.maxLoops,
-			timeoutMs: steps[i]!.timeoutMs,
+			timeoutMs: steps[i]!.type === "loop-group" ? undefined : steps[i]!.timeoutMs,
 		});
 		// Pre-populate sub-steps for all steps (shows queued agents)
 		populatePredefinedSubSteps(i);
@@ -1684,13 +1722,23 @@ export async function runWorkflow(
 	// Collapse tools to show widget
 	ctx.ui.setToolsExpanded(false);
 
-	// ── Register terminal input handler (Esc to cancel) ──
+	// ── Register terminal input handler (Esc to cancel, with double-press confirmation) ──
 	if (ctx.hasUI) {
+		let _lastEscPressTime = 0;
 		_terminalInputUnsubscribe = ctx.ui.onTerminalInput((data) => {
 			if (!matchesKey(data, Key.escape)) return undefined;
 			if (_workflowRunning && _workflowAbortController && !_workflowAbortController.signal.aborted) {
-				ctx.ui.notify("⏹️ 用户取消工作流", "warning");
-				cancelWorkflow();
+				const now = Date.now();
+				if (_lastEscPressTime > 0 && now - _lastEscPressTime < 3000) {
+					// Second Esc press within 5s → confirm cancel
+					ctx.ui.notify("⏹️ 正在停止工作流...", "warning");
+					cancelWorkflow();
+					_lastEscPressTime = 0;
+					return { consume: true };
+				}
+				// First Esc press (or expired) → show hint
+				_lastEscPressTime = now;
+				ctx.ui.notify("再次按下 Esc 键，停止 Workflow - 3秒内按下有效", "warning");
 				return { consume: true };
 			}
 			return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghyper9023/pi-dev-workflow",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "keywords": [
     "pi-package"
   ],

package/tests/test-loopcount-timeout-fix.mjs

@@ -0,0 +1,336 @@
+/**
+ * test-loopcount-timeout-fix.mjs
+ *
+ * 测试 loopCount UI 同步、reviewer 独立超时、默认超时值修改
+ *
+ * 测试范围：
+ *   1. loopCount 在每次循环后通过 updateWidgetStep 同步到 widget
+ *   2. reviewer 使用 reviewTimeoutMs（独立超时）
+ *   3. 默认超时值 worker=30min (1_800_000), trimmer=20min (1_200_000), reviewer=15min (900_000)
+ *   4. loop-group 行不显示 timeoutMs（通过静态分析 updateWidgetStep 参数）
+ *   5. sub-step 在 runAgentWithProgress 中写入 detail（超时信息）
+ *   6. 回归：非 loop-group 步骤仍正常显示超时
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const EXT_DIR = path.resolve(__dirname, "..", "extensions");
+
+// ── Test helpers ──
+
+let passed = 0;
+let failed = 0;
+const results = [];
+
+function assert(label, condition, detail = "") {
+	if (condition) {
+		passed++;
+		results.push({ label, ok: true });
+	} else {
+		failed++;
+		results.push({ label, ok: false, detail });
+		console.error(`  ❌ ${label}${detail ? " — " + detail : ""}`);
+	}
+}
+
+function assertIncludes(label, text, pattern, detail = "") {
+	assert(label, text.includes(pattern), detail);
+}
+
+function assertNotIncludes(label, text, pattern, detail = "") {
+	assert(label, !text.includes(pattern), detail);
+}
+
+// ── Read source files ──
+
+const weContent = fs.readFileSync(path.join(EXT_DIR, "workflow-engine.ts"), "utf8");
+const dpContent = fs.readFileSync(path.join(EXT_DIR, "dev-prompts.ts"), "utf8");
+const uhContent = fs.readFileSync(path.join(EXT_DIR, "ui-helpers.ts"), "utf8");
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 1: loopCount UI sync
+//  验证 executeLoopGroup 中 loopCount++ 后调用 updateWidgetStep
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 1: loopCount UI 同步");
+
+assertIncludes(
+	"1.1 executeLoopGroup 中有 loopCount++ 后立即更新 UI",
+	weContent,
+	"// 立即更新 UI 显示当前循环次数",
+);
+
+assertIncludes(
+	"1.2 updateWidgetStep 调用中传入 loopCount",
+	weContent,
+	"loopCount,",
+);
+
+assertIncludes(
+	"1.3 updateWidgetStep 调用中包含 loopCount 参数名",
+	weContent,
+	"loopCount,", // 在 extra 对象中
+);
+
+assertIncludes(
+	"1.4 updateWidgetStep 调用中包含 maxLoops",
+	weContent,
+	"maxLoops: step.maxLoops",
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 2: Reviewer 独立超时
+//  验证 reviewer 使用 reviewTimeoutMs 而非 step.timeoutMs
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 2: Reviewer 独立超时");
+
+assertIncludes(
+	"2.1 executeLoopGroup 中定义了 reviewTimeoutMs 变量",
+	weContent,
+	"const reviewTimeoutMs = step.reviewTimeoutMs ?? step.timeoutMs;",
+);
+
+assertIncludes(
+	"2.2 reviewer 的 runAgentWithProgress 使用 reviewTimeoutMs",
+	weContent,
+	"step.reviewAgentName!, reviewTimeoutMs);",
+);
+
+assert(
+	"2.3 reviewer 调用不再使用 step.timeoutMs",
+	!weContent.includes("step.reviewAgentName!, step.timeoutMs)"),
+	"reviewer 的 runAgentWithProgress 不应该使用 step.timeoutMs",
+);
+
+assertIncludes(
+	"2.4 Worker 仍使用 step.timeoutMs（未受 reviewer 变更影响）",
+	weContent,
+	"step.loopAgentName!, step.timeoutMs)",
+	"注意：worker 的 runAgentWithProgress 仍使用 step.timeoutMs",
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 3: 默认超时值验证（读取 dev-prompts.ts）
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 3: 默认超时值验证");
+
+// Helper: extract all loop-group config blocks
+function extractLoopGroups(source) {
+	const lines = source.split("\n");
+	const groups = [];
+	let currentBlock = null;
+	let braceDepth = 0;
+
+	for (const line of lines) {
+		if (line.includes("type: \"loop-group\"")) {
+			currentBlock = { start: lines.indexOf(line), lines: [line], loopAgent: "", reviewAgent: "", timeoutMs: 0, reviewTimeoutMs: 0 };
+			braceDepth = 0;
+			continue;
+		}
+		if (currentBlock) {
+			currentBlock.lines.push(line);
+			if (line.includes("loopAgentName:")) {
+				const m = line.match(/loopAgentName:\s*"(\w+)"/);
+				if (m) currentBlock.loopAgent = m[1];
+			}
+			if (line.includes("reviewAgentName:")) {
+				const m = line.match(/reviewAgentName:\s*"(\w+)"/);
+				if (m) currentBlock.reviewAgent = m[1];
+			}
+			if (line.includes("timeoutMs:")) {
+				const m = line.match(/timeoutMs:\s*(\d[\d_]*)/);
+				if (m) currentBlock.timeoutMs = parseInt(m[1].replace(/_/g, ""), 10);
+			}
+			if (line.includes("reviewTimeoutMs:")) {
+				const m = line.match(/reviewTimeoutMs:\s*(\d[\d_]*)/);
+				if (m) currentBlock.reviewTimeoutMs = parseInt(m[1].replace(/_/g, ""), 10);
+			}
+			if (line.includes("},") || line.includes("} ;") || line.includes("};")) {
+				braceDepth++;
+				if (braceDepth >= 1) {
+					groups.push(currentBlock);
+					currentBlock = null;
+				}
+			}
+		}
+	}
+	return groups;
+}
+
+const loopGroups = extractLoopGroups(dpContent);
+
+assert("3.0 找到至少 6 个 loop-group 配置", loopGroups.length >= 6, `找到 ${loopGroups.length} 个`);
+
+// worker 相关：timeoutMs 应为 1_800_000 (30min)
+const workerGroups = loopGroups.filter(g => g.loopAgent === "worker");
+for (const g of workerGroups) {
+	assert(
+		`3.1 Worker loop-group 超时=30min: ${g.loopAgent} → ${g.timeoutMs}`,
+		g.timeoutMs === 1_800_000,
+		`期望 1_800_000，实际 ${g.timeoutMs}`,
+	);
+	assert(
+		`3.2 Worker loop-group reviewTimeoutMs=15min: ${g.loopAgent} → ${g.reviewTimeoutMs}`,
+		g.reviewTimeoutMs === 900_000,
+		`期望 900_000，实际 ${g.reviewTimeoutMs}`,
+	);
+}
+
+// trimmer 相关：timeoutMs 应为 1_200_000 (20min)
+const trimmerGroups = loopGroups.filter(g => g.loopAgent === "trimmer");
+for (const g of trimmerGroups) {
+	assert(
+		`3.3 Trimmer loop-group 超时=20min: ${g.loopAgent} → ${g.timeoutMs}`,
+		g.timeoutMs === 1_200_000,
+		`期望 1_200_000，实际 ${g.timeoutMs}`,
+	);
+	assert(
+		`3.4 Trimmer loop-group reviewTimeoutMs=15min: ${g.loopAgent} → ${g.reviewTimeoutMs}`,
+		g.reviewTimeoutMs === 900_000,
+		`期望 900_000，实际 ${g.reviewTimeoutMs}`,
+	);
+}
+
+// 所有 loop-group 都应有 reviewTimeoutMs
+for (const g of loopGroups) {
+	assert(
+		`3.5 ${g.loopAgent} loop-group 有 reviewTimeoutMs`,
+		g.reviewTimeoutMs > 0,
+		`缺少 reviewTimeoutMs`,
+	);
+}
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 4: loop-group 行不显示 timeout
+//  验证 updateWidgetStep 对 loop-group 步骤不传 timeoutMs
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 4: loop-group 行不显示 timeout");
+
+assertIncludes(
+	"4.1 loop-group running 状态不传 timeoutMs",
+	weContent,
+	'step.type === "loop-group" ? undefined : step.timeoutMs',
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 5: sub-step 显示 timeout
+//  验证 runAgentWithProgress 在 sub-step 的 detail 中写入超时
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 5: sub-step 显示 timeout");
+
+assertIncludes(
+	"5.1 runAgentWithProgress 在新建 sub-step 时写入 detail",
+	weContent,
+	"detail: `超时时间${formatTimeout(timeoutMs)}`",
+);
+
+assertIncludes(
+	"5.2 runAgentWithProgress 在复用 sub-step 时更新 detail",
+	weContent,
+	"existing.detail = `超时时间${formatTimeout(timeoutMs)}`;",
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 6: formatTimeout 已导出
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 6: formatTimeout 导出");
+
+assertIncludes(
+	"6.1 formatTimeout 从 ui-helpers.ts 导出",
+	uhContent,
+	"export function formatTimeout",
+);
+
+assertIncludes(
+	"6.2 formatTimeout 被 workflow-engine.ts 导入",
+	weContent,
+	"formatTimeout,",
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 7: WorkflowStepDef 接口有 reviewTimeoutMs 字段
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 7: WorkflowStepDef 接口");
+
+assertIncludes(
+	"7.1 WorkflowStepDef 有 reviewTimeoutMs 字段定义",
+	weContent,
+	"reviewTimeoutMs?: number;",
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 8: 回归测试 — 非 loop-group 功能不受影响
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 8: 回归测试");
+
+assertIncludes(
+	"8.1 非 loop-group 步骤运行状态仍传 timeoutMs",
+	weContent,
+	"timeoutMs: step.type === \"loop-group\" ? undefined : step.timeoutMs,", // 对于非 loop-group 仍传
+);
+
+assertIncludes(
+	"8.2 非 loop-group 步骤 done 状态仍传 timeoutMs",
+	weContent,
+	"timeoutMs: step.type === \"loop-group\" ? undefined : step.timeoutMs,", // done 状态同样逻辑
+);
+
+// 验证 executeSingleStep 未受影响 — 它仍然传递超时给 runAgentWithProgress
+if (weContent.includes("executeSingleStep")) {
+	assert(
+		"8.3 executeSingleStep 中仍传递 timeoutMs",
+		true,
+	);
+}
+
+// ═══════════════════════════════════════════════════════════════
+//  Test 9: sub-step 重置 — 每次循环重置 sub-step 状态
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n📋 Test 9: sub-step 状态重置");
+
+assertIncludes(
+	"9.1 每次循环开始时重置 sub-step 状态",
+	weContent,
+	"// 每次循环开始时重置 sub-step 状态",
+);
+
+assert(
+	"9.2 loopAgent sub-step 在循环开始被重置为 pending",
+	weContent.includes('setWidgetSubStepStatus(stepIndex, step.loopAgentName!, "pending")'),
+);
+
+assert(
+	"9.3 reviewAgent sub-step 在循环开始被重置为 pending",
+	weContent.includes('setWidgetSubStepStatus(stepIndex, step.reviewAgentName!, "pending")'),
+);
+
+// ═══════════════════════════════════════════════════════════════
+//  Summary
+// ═══════════════════════════════════════════════════════════════
+
+console.log("\n" + "═".repeat(60));
+console.log(`结果: ${passed} 通过, ${failed} 失败, 共 ${passed + failed} 个测试`);
+console.log("═".repeat(60));
+
+if (failed > 0) {
+	console.error("\n⚠️  部分测试未通过:");
+	for (const r of results) {
+		if (!r.ok) {
+			console.error(`  ❌ ${r.label}${r.detail ? " — " + r.detail : ""}`);
+		}
+	}
+	process.exit(1);
+} else {
+	console.log("\n✅ 全部通过");
+}

package/themes/oh-my-pi-titanium.json

@@ -0,0 +1,90 @@
+{
+	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
+	"name": "titanium",
+	"vars": {
+		"brushedTitanium": "#151820",
+		"darkTitanium": "#0f1216",
+		"electricBlue": "#00b4ff",
+		"deepBlue": "#0082b3",
+		"titaniumGold": "#d4c090",
+		"brightAluminum": "#e8ecf4",
+		"dimAluminum": "#9ca3b0",
+		"warningAmber": "#ffb347",
+		"readoutGreen": "#00ff88",
+		"alertRed": "#ff4757",
+		"subtleGray": "#2a3038"
+	},
+	"colors": {
+		"accent": "electricBlue",
+		"border": "subtleGray",
+		"borderAccent": "electricBlue",
+		"borderMuted": "#1f252d",
+		"success": "readoutGreen",
+		"error": "alertRed",
+		"warning": "warningAmber",
+		"muted": "dimAluminum",
+		"dim": "#6b7280",
+		"text": "",
+		"thinkingText": "dimAluminum",
+		"selectedBg": "deepBlue",
+		"userMessageBg": "darkTitanium",
+		"userMessageText": "",
+		"customMessageBg": "subtleGray",
+		"customMessageText": "",
+		"customMessageLabel": "titaniumGold",
+		"toolPendingBg": "darkTitanium",
+		"toolSuccessBg": "darkTitanium",
+		"toolErrorBg": "#1a0f10",
+		"toolTitle": "",
+		"toolOutput": "dimAluminum",
+		"mdHeading": "electricBlue",
+		"mdLink": "electricBlue",
+		"mdLinkUrl": "deepBlue",
+		"mdCode": "readoutGreen",
+		"mdCodeBlock": "dimAluminum",
+		"mdCodeBlockBorder": "subtleGray",
+		"mdQuote": "dimAluminum",
+		"mdQuoteBorder": "subtleGray",
+		"mdHr": "subtleGray",
+		"mdListBullet": "electricBlue",
+		"toolDiffAdded": "readoutGreen",
+		"toolDiffRemoved": "alertRed",
+		"toolDiffContext": "dimAluminum",
+		"syntaxComment": "#6b7280",
+		"syntaxKeyword": "electricBlue",
+		"syntaxFunction": "readoutGreen",
+		"syntaxVariable": "brightAluminum",
+		"syntaxString": "titaniumGold",
+		"syntaxNumber": "warningAmber",
+		"syntaxType": "electricBlue",
+		"syntaxOperator": "electricBlue",
+		"syntaxPunctuation": "dimAluminum",
+		"thinkingOff": "#4a5058",
+		"thinkingMinimal": "#5a6068",
+		"thinkingLow": "#6a7078",
+		"thinkingMedium": "dimAluminum",
+		"thinkingHigh": "electricBlue",
+		"thinkingXhigh": "titaniumGold",
+		"bashMode": "readoutGreen",
+		"statusLineBg": "darkTitanium",
+		"statusLineSep": "subtleGray",
+		"statusLineModel": "electricBlue",
+		"statusLinePath": "brightAluminum",
+		"statusLineGitClean": "readoutGreen",
+		"statusLineGitDirty": "warningAmber",
+		"statusLineContext": "dimAluminum",
+		"statusLineSpend": "titaniumGold",
+		"statusLineStaged": "readoutGreen",
+		"statusLineDirty": "warningAmber",
+		"statusLineUntracked": "dimAluminum",
+		"statusLineOutput": "deepBlue",
+		"statusLineCost": "titaniumGold",
+		"statusLineSubagents": "electricBlue",
+		"pythonMode": "#f0c040"
+	},
+	"export": {
+		"pageBg": "brushedTitanium",
+		"cardBg": "darkTitanium",
+		"infoBg": "subtleGray"
+	}
+}