@ghyper9023/pi-dev-workflow 0.4.1 → 0.4.2

package/extensions/dev-prompts.ts

@@ -381,7 +381,8 @@ const FEAT_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "worker",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 900_000,
+		timeoutMs: 1_800_000,
+		reviewTimeoutMs: 900_000,
 	},
 	{
 		id: "trimmer-reviewer",
@@ -390,7 +391,8 @@ const FEAT_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "trimmer",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 300_000,
+		timeoutMs: 1_200_000,
+		reviewTimeoutMs: 900_000,
 	},
 	{
 		id: "docWriter",
@@ -416,7 +418,8 @@ const FIX_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "worker",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 900_000,
+		timeoutMs: 1_800_000,
+		reviewTimeoutMs: 900_000,
 	},
 	{
 		id: "docWriter",
@@ -442,7 +445,8 @@ const REFACTOR_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "worker",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 900_000,
+		timeoutMs: 1_800_000,
+		reviewTimeoutMs: 900_000,
 	},
 	{
 		id: "trimmer-reviewer",
@@ -451,7 +455,8 @@ const REFACTOR_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "trimmer",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 300_000,
+		timeoutMs: 1_200_000,
+		reviewTimeoutMs: 900_000,
 	},
 ];
 
@@ -470,7 +475,8 @@ const PERF_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "worker",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 900_000,
+		timeoutMs: 1_800_000,
+		reviewTimeoutMs: 900_000,
 	},
 ];
 
@@ -489,7 +495,8 @@ const TEST_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "worker",
 		reviewAgentName: "reviewer",
 		maxLoops: 3,
-		timeoutMs: 900_000,
+		timeoutMs: 1_800_000,
+		reviewTimeoutMs: 900_000,
 	},
 ];
 
@@ -518,7 +525,8 @@ const STYLE_WORKFLOW_STEPS: WorkflowStepDef[] = [
 		loopAgentName: "trimmer",
 		reviewAgentName: "reviewer",
 		maxLoops: 2,
-		timeoutMs: 300_000,
+		timeoutMs: 1_200_000,
+		reviewTimeoutMs: 900_000,
 	},
 ];
 

package/extensions/grill-me-agent.ts

@@ -21,6 +21,9 @@ import {
 	SelectList,
 	Text,
 	Spacer,
+	matchesKey,
+	Key,
+	truncateToWidth,
 	type SelectItem,
 } from "@earendil-works/pi-tui";
 import { uiSelect, uiConfirm, uiInput } from "./ui-helpers";
@@ -599,12 +602,20 @@ async function showQuestionTUI(
 	backable = false,
 	previousAnswer?: string,
 ): Promise<string | null> {
-	const selectItems: SelectItem[] = q.options.map((opt, i) => ({
-		value: `opt-${i}`,
-		label: opt === previousAnswer
-			? `(${String.fromCharCode(97 + i)}) ${opt} - 上次选择`
-			: `(${String.fromCharCode(97 + i)}) ${opt}`,
-	}));
+	const MAX_OPTION_LABEL = 50;
+	const selectItems: SelectItem[] = q.options.map((opt, i) => {
+		const prefix = `(${String.fromCharCode(97 + i)}) `;
+		const label = opt === previousAnswer
+			? `${prefix}${opt} - 上次选择`
+			: `${prefix}${opt}`;
+		const truncated = truncateToWidth(label, MAX_OPTION_LABEL, "...");
+		return {
+			value: `opt-${i}`,
+			label: truncated,
+			// 只有被截断时才提供 description，展示完整文本
+			description: truncated !== label ? opt : undefined,
+		};
+	});
 
 	const customLabel = previousAnswer && !q.options.includes(previousAnswer)
 		? `✏️  自定义输入 - 上次选择`
@@ -646,7 +657,7 @@ async function showQuestionTUI(
 
 		container.addChild(new Spacer(1));
 		const hint = backable && currentIndex > 1
-			? "  ↑↓ 导航 • Enter 选择 • 选择←返回上一题 • Esc 取消全部评审"
+			? "  ↑↓ 导航 • Enter 选择 • ← 返回上一题 • Esc 取消全部评审"
 			: "  ↑↓ 导航 • Enter 选择 • Esc 取消全部评审";
 		container.addChild(
 			new Text(theme.fg("dim", hint), 0, 0),
@@ -657,6 +668,11 @@ async function showQuestionTUI(
 			render: (w) => container.render(w),
 			invalidate: () => container.invalidate(),
 			handleInput: (data) => {
+				// 左方向键 → 返回上一题（SelectList 不处理 left 键，需自行拦截）
+				if (backable && currentIndex > 1 && matchesKey(data, Key.left)) {
+					done("__BACK__");
+					return;
+				}
 				selectList.handleInput(data);
 				tui.requestRender();
 			},

package/extensions/ui-helpers.ts

@@ -207,7 +207,7 @@ export function uiConfirm(
 /**
  * Show an input dialog with proper wrapping.
  * Returns the entered string, or BACK_MARKER on back, or undefined on cancel.
- * When backable=true, supports Ctrl+Shift+← for back and Ctrl+Shift+→ for submit+next.
+ * When backable=true, supports ← for back, Ctrl+Shift+← for back, and Ctrl+Shift+→ for submit+next.
  */
 export function uiInput(
     ctx: ExtensionCommandContext,
@@ -229,6 +229,11 @@ export function uiInput(
         }
         container.addChild(new Spacer(1));
 
+        // 实时换行预览区域（在输入框上方）
+        const previewText = new Text("", 0, 0);
+        container.addChild(previewText);
+        container.addChild(new Spacer(1));
+
         const input = new Input(placeholder ?? "", width - 2);
         if (initialValue) {
             input.setValue(initialValue);
@@ -255,6 +260,12 @@ export function uiInput(
             render: (w) => container.render(w),
             invalidate: () => container.invalidate(),
             handleInput: (data) => {
+                // 左方向键 → 返回（优先于 Input 的光标左移）
+                if (backable && matchesKey(data, Key.left)) {
+                    done(BACK_MARKER);
+                    return;
+                }
+
                 // Intercept back/next keys before passing to Input
                 if (backable) {
                     // Ctrl+Shift+← → go back to previous question
@@ -269,6 +280,19 @@ export function uiInput(
                     }
                 }
                 input.handleInput(data);
+
+                // 读取更新后的 value，更新预览
+                const val = input.getValue();
+                if (val.length > 0) {
+                    const wrapped = wrapTextWithAnsi(val, width - 4);
+                    const previewContent = wrapped
+                        .map(l => theme.fg("dim", `  ${l}`))
+                        .join("\n");
+                    previewText.setText(previewContent);
+                } else {
+                    previewText.setText("");
+                }
+
                 tui.requestRender();
             },
         };
@@ -362,7 +386,7 @@ function formatDurationFull(ms: number): string {
     return `${m}m${s}s`;
 }
 
-function formatTimeout(ms: number): string {
+export function formatTimeout(ms: number): string {
     const m = Math.floor(ms / 60000);
     const s = Math.floor((ms % 60000) / 1000);
     return s > 0 ? `${m}m${s}s` : `${m}m`;
@@ -462,8 +486,13 @@ function buildWidgetLines(state: WorkflowWidgetState, theme: Theme, expanded: bo
             loopStr = dim(theme, ` · 第 ${s.loopCount} 次循环`);
         } else if (s.maxLoops != null) {
             if (isRunning) {
-                // Immediately show 第 1 次循环 when loop-group starts
-                loopStr = dim(theme, ` · 第 1 次循环`);
+                // 当 loop-group 开始运行时，loopCount 已经通过 executeLoopGroup 在循环开头设置了，
+                // 所以不需要 fallback 显示"第 1 次循环"
+                // 直接使用 s.loopCount 的值
+                if (s.loopCount == null || s.loopCount === 0) {
+                    // 安全 fallback（理论上不会走到这里）
+                    loopStr = dim(theme, ` · 第 1 次循环`);
+                }
             } else if (isPending) {
                 loopStr = dim(theme, ` · 第 0 次循环`);
             }
@@ -516,9 +545,32 @@ function buildWidgetLines(state: WorkflowWidgetState, theme: Theme, expanded: bo
                       ? theme.fg("accent", spinnerFrame())
                       : dim(theme, "◦");
 
-                // Agent line: "        |__ ✓ worker ·"
+                // Agent line: "        |__ ✓ worker · (52.6s/超时时间60m)"
+                // Build inline duration and timeout info for sub-step
+                let subDurStr = "";
+                let subTimeoutStr = "";
+                let subDurClose = "";
+                let elapsedMs: number | undefined;
+                if (sub.startedAt) {
+                    elapsedMs = Date.now() - sub.startedAt;
+                } else if (sub.durationMs != null) {
+                    elapsedMs = sub.durationMs;
+                }
+                if (elapsedMs != null) {
+                    subDurStr = dim(theme, ` (${formatDurationFull(elapsedMs)}`);
+                } else if (isSubRunning) {
+                    subDurStr = dim(theme, ` (0s`);
+                }
+                // Extract timeout info from sub.detail (e.g. "超时时间60m")
+                // detail is set in runAgentWithProgress as `超时时间${formatTimeout(timeoutMs)}`
+                if (sub.detail && sub.detail.includes("超时时间")) {
+                    subTimeoutStr = dim(theme, `/${sub.detail}`);
+                }
+                if (subDurStr) {
+                    subDurClose = dim(theme, ")");
+                }
                 const agentConnector = dim(theme, "|__");
-                lines.push(`${agentIndent}${agentConnector} ${subIcon} ${sub.agent} ·`);
+                lines.push(`${agentIndent}${agentConnector} ${subIcon} ${sub.agent} ·${subDurStr}${subTimeoutStr}${subDurClose}`);
 
                 // ── Children (tools, outputs, or "正在排队") ──
                 const childItems: string[] = [];
@@ -536,7 +588,7 @@ function buildWidgetLines(state: WorkflowWidgetState, theme: Theme, expanded: bo
                             childItems.push(`output:${o}`);
                         }
                     }
-                    if (childItems.length === 0 && sub.detail) {
+                    if (childItems.length === 0 && sub.detail && !sub.detail.includes("超时时间")) {
                         childItems.push(sub.detail);
                     }
                 }

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.2",
   "keywords": [
     "pi-package"
   ],