@ghyper9023/pi-dev-workflow 0.3.1 → 0.4.0

package/extensions/sub-agents.ts

@@ -17,6 +17,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
+import { uiSelect } from "./ui-helpers";
 
 // ── Configuration ────────────────────────────────────────────
 
@@ -70,11 +71,12 @@ function loadAppendSystem(cwd: string): string | null {
 	return null;
 }
 
-/** Find the newest HTML review file in pi-review/ or pi-dev-output/pi-review/ directory. */
+/** Find the newest HTML review file in .pi-dev-output/pi-review/html/, pi-review/, or .pi-dev-output/pi-review/ directory. */
 function findNewestReviewHtml(cwd: string): string {
 	const candidates = [
+		path.join(cwd, ".pi-dev-output", "pi-review", "html"),
 		path.join(cwd, "pi-review"),
-		path.join(cwd, "pi-dev-output", "pi-review"),
+		path.join(cwd, ".pi-dev-output", "pi-review"),
 	];
 
 	for (const reviewDir of candidates) {
@@ -184,6 +186,7 @@ function inferTimeout(name: string): number {
 	const lc = name.toLowerCase();
 	if (lc.includes("review") || lc.includes("审查")) return REVIEW_TIMEOUT_MS;
 	if (lc.includes("git")) return GIT_TIMEOUT_MS;
+	if (lc.includes("prd")) return REVIEW_TIMEOUT_MS;
 	return DEFAULT_TIMEOUT_MS;
 }
 
@@ -238,20 +241,28 @@ export function discoverAgents(): AgentDef[] {
 	if (!agentsDir) return (_discoveredAgents = []);
 
 	const agents: AgentDef[] = [];
-	let entries: fs.Dirent[];
-	try {
-		entries = fs.readdirSync(agentsDir, { withFileTypes: true });
-	} catch {
-		return (_discoveredAgents = agents);
-	}
 
-	for (const entry of entries) {
-		if (!entry.name.endsWith(".md")) continue;
-		if (!entry.isFile() && !entry.isSymbolicLink()) continue;
-		const filePath = path.join(agentsDir, entry.name);
-		const agent = loadAgent(filePath);
-		if (agent) agents.push(agent);
+	/** Recursively walk directory to collect all .md agent definitions. */
+	function scanAgentsDir(dir: string): void {
+		let entries: fs.Dirent[];
+		try {
+			entries = fs.readdirSync(dir, { withFileTypes: true });
+		} catch {
+			return;
+		}
+		for (const entry of entries) {
+			if (entry.name.startsWith(".")) continue; // skip hidden files/dirs
+			const fullPath = path.join(dir, entry.name);
+			if (entry.isDirectory()) {
+				scanAgentsDir(fullPath);
+			} else if ((entry.isFile() || entry.isSymbolicLink()) && entry.name.endsWith(".md")) {
+				const agent = loadAgent(fullPath);
+				if (agent) agents.push(agent);
+			}
+		}
 	}
+
+	scanAgentsDir(agentsDir);
 	return (_discoveredAgents = agents);
 }
 
@@ -543,17 +554,35 @@ export default function (pi: ExtensionAPI) {
 
 	// ── /subagent-stop - 主动终止所有正在运行的 sub-agent ──────
 	pi.registerCommand("subagent-stop", {
-		description: "Terminate all running sub-agents immediately",
+		description: "Terminate all running sub-agents immediately. Also cancels any active workflow.",
 		handler: async (_args, ctx) => {
-			const count = activeChildren.size;
-			if (count === 0) {
-				ctx.ui.notify("i️ 当前没有运行中的 sub-agent", "info");
+			const childCount = activeChildren.size;
+
+			// Also try to cancel any active workflow
+			let workflowCancelled = false;
+			try {
+				const { cancelActiveWorkflow, isWorkflowRunning } = await import("./workflow-engine");
+				if (isWorkflowRunning()) {
+					cancelActiveWorkflow();
+					workflowCancelled = true;
+				}
+			} catch { /* workflow-engine not available, ignore */ }
+
+			if (childCount === 0 && !workflowCancelled) {
+				ctx.ui.notify("i️ 当前没有运行中的 sub-agent 或工作流", "info");
 				return;
 			}
-			killAllChildren();
-			ctx.ui.notify(`━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`, "info");
-			ctx.ui.notify(`🛑 已终止 ${count} 个 sub-agent 进程`, "warning");
-			ctx.ui.notify(`━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`, "info");
+
+			if (childCount > 0) {
+				killAllChildren();
+				ctx.ui.notify(`━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`, "info");
+				ctx.ui.notify(`🛑 已终止 ${childCount} 个 sub-agent 进程`, "warning");
+				ctx.ui.notify(`━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━`, "info");
+			}
+
+			if (workflowCancelled) {
+				ctx.ui.notify(`🛑 已取消运行中的工作流`, "warning");
+			}
 		},
 	});
 
@@ -661,7 +690,8 @@ export default function (pi: ExtensionAPI) {
 
 		// 对于普通关键词触发的审查请求,询问用户选择模式
 		// ctx.ui.select 接受 string[],返回选中的字符串
-		const mode = await ctx.ui.select(
+		const mode = await uiSelect(
+			ctx,
 			"🔍 检测到审查意图",
 			[
 				"1. 后台审查(非阻塞,异步通知)",