patchwarden 1.5.1 → 1.6.2

package/src/doctor.ts

@@ -10,20 +10,23 @@
 
 import { existsSync, statSync, readFileSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
 import { isAbsolute, resolve, normalize, join } from "node:path";
-import { execSync } from "node:child_process";
 import { createServer } from "node:net";
 import { getConfig, type PatchWardenConfig } from "./config.js";
 import { guardPath, guardWorkspacePath } from "./security/pathGuard.js";
 import { isSensitivePath } from "./security/sensitiveGuard.js";
 import { guardPlanContent } from "./security/planGuard.js";
-import { TASK_READ_ONLY_FILES } from "./tools/getTaskFile.js";
+import { TASK_READ_ONLY_FILES } from "./tools/tasks/getTaskFile.js";
 import { getToolDefs } from "./tools/registry.js";
-import { CHATGPT_CORE_TOOL_NAMES, CHATGPT_DIRECT_TOOL_NAMES, selectToolsForProfile } from "./tools/toolCatalog.js";
-import { buildToolRegistry } from "./tools/toolRegistry.js";
-import { runAllSchemaDriftChecks } from "./tools/schemaDriftCheck.js";
+import { CHATGPT_CORE_TOOL_NAMES, CHATGPT_DIRECT_TOOL_NAMES, selectToolsForProfile } from "./tools/catalog/toolCatalog.js";
+import { buildToolRegistry } from "./tools/catalog/toolRegistry.js";
+import { runAllSchemaDriftChecks } from "./tools/diagnostics/schemaDriftCheck.js";
 import { runReleaseGateCheck } from "./release/releaseGate.js";
 import { PATCHWARDEN_VERSION } from "./version.js";
 import { logger } from "./logging.js";
+import { unsafeWorkspaceRootLabel } from "./security/workspaceRootGuard.js";
+import { runSimpleProcessSync } from "./runner/simpleProcess.js";
+import { resolveAgentLaunch } from "./runner/agentInvocation.js";
+import { isDangerousAllowedTestCommand } from "./diagnostics/allowedTestCommandSafety.js";
 
 // ── Types ──────────────────────────────────────────────────────────
 
@@ -50,13 +53,18 @@ export interface DoctorContext {
 
 // ── Helpers ────────────────────────────────────────────────────────
 
-function cmd(cmdStr: string): string {
+function cmd(command: string, args: readonly string[] = []): string {
   try {
-    return execSync(cmdStr, {
-      encoding: "utf-8",
-      timeout: 5000,
-      stdio: ["ignore", "pipe", "ignore"], // suppress stdin and stderr
-    }).trim();
+    const result = runSimpleProcessSync({
+      command,
+      args: [...args],
+      cwd: process.cwd(),
+      timeoutMs: 5000,
+      maxStdoutBytes: 64 * 1024,
+      maxStderrBytes: 64 * 1024,
+    });
+    if (result.exitCode !== 0) return "";
+    return `${result.stdout}${result.stderr}`.trim();
   } catch {
     return "";
   }
@@ -109,7 +117,7 @@ const checkNpmAvailable: DoctorCheck = {
   id: "npm-available",
   description: "npm available",
   run() {
-    const npmVer = cmd("npm --version");
+    const npmVer = cmd(process.platform === "win32" ? "npm.cmd" : "npm", ["--version"]);
     return [checkResult("npm available", npmVer !== "", npmVer || "npm not found in PATH")];
   },
 };
@@ -144,7 +152,7 @@ const checkGitAvailable: DoctorCheck = {
   id: "git-available",
   description: "Git available",
   run() {
-    const gitVer = cmd("git --version");
+    const gitVer = cmd("git", ["--version"]);
     return [warnCheckResult("Git available", gitVer !== "", gitVer || "git not found — runner git.diff will not work")];
   },
 };
@@ -199,18 +207,9 @@ const checkWorkspaceRoot: DoctorCheck = {
     try { isDir = statSync(ws).isDirectory(); } catch {}
     results.push(checkResult("workspaceRoot is directory", isDir, ws));
 
-    const dangerousRoots = [
-      { pattern: /^[A-Za-z]:\\?$/, label: "drive root" },
-      { pattern: /\\Users\\[^\\]+$/, label: "user home directory" },
-      { pattern: /\\Desktop$/, label: "Desktop" },
-      { pattern: /\\Downloads$/, label: "Downloads" },
-      { pattern: /\\Documents$/, label: "Documents" },
-    ];
-
-    for (const { pattern, label } of dangerousRoots) {
-      if (pattern.test(ws)) {
-        results.push(warnResult(`workspaceRoot is ${label}: ${ws} — consider narrowing to a project directory`));
-      }
+    const unsafeLabel = unsafeWorkspaceRootLabel(ws);
+    if (unsafeLabel) {
+      results.push(warnResult(`workspaceRoot is ${unsafeLabel}: ${ws} — consider narrowing to a project directory`));
     }
     return results;
   },
@@ -312,11 +311,13 @@ const checkServerVersion: DoctorCheck = {
         packageJson.version === PATCHWARDEN_VERSION,
         `${PATCHWARDEN_VERSION} vs ${packageJson.version}`,
       ),
-      checkResult(
-        "Manifest preflight script exists",
-        existsSync(resolve(process.cwd(), "scripts/checks/mcp-manifest-check.js")),
-        "scripts/checks/mcp-manifest-check.js",
-      ),
+      process.env.PATCHWARDEN_DESKTOP_RUNTIME === "1"
+        ? okResult("Manifest preflight covered by compiled desktop runtime checks")
+        : checkResult(
+            "Manifest preflight script exists",
+            existsSync(resolve(process.cwd(), "scripts/checks/mcp-manifest-check.js")),
+            "scripts/checks/mcp-manifest-check.js",
+          ),
     ];
   },
 };
@@ -331,8 +332,8 @@ const checkToolProfiles: DoctorCheck = {
       process.env.PATCHWARDEN_TOOL_PROFILE = "full";
       const fullTools = getToolDefs();
       const coreTools = selectToolsForProfile(fullTools, "chatgpt_core", context.config?.enableDirectProfile);
-      const createSchema = coreTools.find((tool) => tool.name === "create_task")?.inputSchema as any;
-      const waitSchema = coreTools.find((tool) => tool.name === "wait_for_task")?.inputSchema as any;
+      const createSchema = coreTools.find((tool) => tool.name === "create_task")?.inputSchema;
+      const waitSchema = coreTools.find((tool) => tool.name === "wait_for_task")?.inputSchema;
       results.push(checkResult("Full tool profile exposes 66 tools", fullTools.length === 66, `${fullTools.length} tools`));
       results.push(
         checkResult(
@@ -463,23 +464,23 @@ const checkToolModules: DoctorCheck = {
   description: "Tool module checks",
   run() {
     const newTools = [
-      "listTasks",
-      "listAgents",
-      "cancelTask",
-      "killTask",
-      "retryTask",
-      "getTaskProgress",
-      "getTaskSummary",
-      "waitForTask",
-      "getTaskStdoutTail",
-      "healthCheck",
-      "auditTask",
+      { name: "listTasks", subdir: "tasks" },
+      { name: "listAgents", subdir: "workspace" },
+      { name: "cancelTask", subdir: "tasks" },
+      { name: "killTask", subdir: "tasks" },
+      { name: "retryTask", subdir: "tasks" },
+      { name: "getTaskProgress", subdir: "tasks" },
+      { name: "getTaskSummary", subdir: "tasks" },
+      { name: "waitForTask", subdir: "tasks" },
+      { name: "getTaskStdoutTail", subdir: "tasks" },
+      { name: "healthCheck", subdir: "diagnostics" },
+      { name: "auditTask", subdir: "diagnostics" },
     ];
     const results: DoctorCheckResult[] = [];
     for (const t of newTools) {
-      const compiled = resolve(process.cwd(), "dist/tools", `${t}.js`);
+      const compiled = resolve(process.cwd(), "dist/tools", t.subdir, `${t.name}.js`);
       const exists = existsSync(compiled);
-      results.push(checkResult(`Tool module: ${t}`, exists, exists ? "compiled" : "missing"));
+      results.push(checkResult(`Tool module: ${t.name}`, exists, exists ? "compiled" : "missing"));
     }
     return results;
   },
@@ -490,18 +491,18 @@ const checkDirectToolModules: DoctorCheck = {
   description: "Direct tool module checks",
   run() {
     const directToolModules = [
-      "createDirectSession",
-      "searchWorkspace",
-      "applyPatch",
-      "runVerification",
-      "finalizeDirectSession",
-      "auditSession",
+      { name: "createDirectSession", subdir: "direct" },
+      { name: "searchWorkspace", subdir: "workspace" },
+      { name: "applyPatch", subdir: "workspace" },
+      { name: "runVerification", subdir: "tasks" },
+      { name: "finalizeDirectSession", subdir: "direct" },
+      { name: "auditSession", subdir: "diagnostics" },
     ];
     const results: DoctorCheckResult[] = [];
     for (const t of directToolModules) {
-      const compiled = resolve(process.cwd(), "dist/tools", `${t}.js`);
+      const compiled = resolve(process.cwd(), "dist/tools", t.subdir, `${t.name}.js`);
       const exists = existsSync(compiled);
-      results.push(checkResult(`Direct tool module: ${t}`, exists, exists ? "compiled" : "missing"));
+      results.push(checkResult(`Direct tool module: ${t.name}`, exists, exists ? "compiled" : "missing"));
     }
     return results;
   },
@@ -612,8 +613,7 @@ const checkAgentCommands: DoctorCheck = {
   run(context) {
     if (!context.config) return [];
     const results: DoctorCheckResult[] = [];
-    const agents = context.config.agents || {};
-    for (const [name, agentCfg] of Object.entries(agents) as [string, any][]) {
+    for (const [name, agentCfg] of Object.entries(context.config.agents)) {
       const cmdName = agentCfg.command;
       const looksLikePath = isAbsolute(cmdName) || cmdName.includes("/") || cmdName.includes("\\");
       if (looksLikePath) {
@@ -621,11 +621,26 @@ const checkAgentCommands: DoctorCheck = {
         results.push(warnCheckResult(`Agent "${name}" command available`, agentExists, agentExists ? `Found: ${cmdName}` : `"${cmdName}" does not exist — agent tasks will fail`));
         continue;
       }
-      // Platform-appropriate lookup: 'where' on Windows, 'command -v' on Unix
+      // Use an argumentized lookup utility; never interpolate config into a shell.
       const isWin = process.platform === "win32";
-      const lookupCmd = isWin ? `where ${cmdName}` : `command -v ${cmdName}`;
-      const fallbackCmd = isWin ? `command -v ${cmdName}` : `which ${cmdName}`;
-      const found = cmd(lookupCmd) || cmd(fallbackCmd);
+      let found = "";
+      if (isWin) {
+        try {
+          found = resolveAgentLaunch(
+            name,
+            cmdName,
+            process.platform,
+            process.env.PATH || "",
+            existsSync,
+            context.config.workspaceRoot,
+            typeof agentCfg.adapter === "string" ? agentCfg.adapter : name,
+          ).command;
+        } catch {
+          found = "";
+        }
+      } else {
+        found = cmd("which", [cmdName]);
+      }
       results.push(warnCheckResult(`Agent "${name}" command available`, found !== "", found ? `Found: ${found.split("\n")[0]}` : `"${cmdName}" not in PATH — agent tasks will fail`));
     }
     return results;
@@ -641,12 +656,9 @@ const checkAllowedTestCommandsSafety: DoctorCheck = {
     const testCmds = context.config.allowedTestCommands || [];
     results.push(checkResult("allowedTestCommands is non-empty", testCmds.length > 0, testCmds.length > 0 ? `${testCmds.length} commands` : "No test commands configured"));
 
-    const dangerous = ["rm -rf", "del /s", "format", "shutdown", "curl |", "wget |"];
     for (const cmdStr of testCmds) {
-      for (const danger of dangerous) {
-        if (cmdStr.toLowerCase().includes(danger)) {
-          results.push(warnResult(`allowedTestCommands contains dangerous pattern: "${cmdStr}"`));
-        }
+      if (isDangerousAllowedTestCommand(cmdStr)) {
+        results.push(warnResult(`allowedTestCommands contains dangerous pattern: "${cmdStr}"`));
       }
     }
     return results;

package/src/goal/acceptanceEngine.ts

@@ -13,7 +13,7 @@
  *   4. 所有检查通过 → ACCEPTED
  */
 
-import type { AcceptanceStatus } from "../tools/createTask.js";
+import type { AcceptanceStatus } from "../tools/tasks/createTask.js";
 
 // ── 类型定义 ──────────────────────────────────────────────────────
 

package/src/goal/goalProgress.ts

@@ -15,7 +15,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { isAbsolute, join } from "node:path";
 import { getConfig } from "../config.js";
 import { PatchWardenError } from "../errors.js";
-import { readGoalStatus, writeGoalStatus } from "./goalStore.js";
+import { mutateGoalStatus, readGoalStatus } from "./goalStore.js";
 import { updateSubgoalStatus, type GoalStatus, type Subgoal } from "./goalStatus.js";
 import { getBlockedSubgoals } from "./goalGraph.js";
 
@@ -93,7 +93,7 @@ export function acceptSubgoal(
   subgoalId: string,
   workspaceRoot?: string
 ): { subgoal_id: string; status: "accepted"; accepted_at: string } {
-  const goalStatus = readGoalStatus(goalId, workspaceRoot);
+  return mutateGoalStatus(goalId, (goalStatus) => {
 
   const subgoal = goalStatus.subgoals.find((s) => s.id === subgoalId);
   if (!subgoal) {
@@ -146,14 +146,16 @@ export function acceptSubgoal(
   // 校验 3：通过状态机转换（要求 subgoal 当前为 done_by_agent）
   const updatedGoalStatus = updateSubgoalStatus(goalStatus, subgoalId, "accepted");
 
-  writeGoalStatus(goalId, updatedGoalStatus, workspaceRoot);
-
   const updatedSubgoal = updatedGoalStatus.subgoals.find((s) => s.id === subgoalId)!;
   return {
-    subgoal_id: subgoalId,
-    status: "accepted",
-    accepted_at: updatedSubgoal.accepted_at!,
+    next: updatedGoalStatus,
+    result: {
+      subgoal_id: subgoalId,
+      status: "accepted" as const,
+      accepted_at: updatedSubgoal.accepted_at!,
+    },
   };
+  }, workspaceRoot);
 }
 
 /**
@@ -175,7 +177,7 @@ export function rejectSubgoal(
   reason: string,
   workspaceRoot?: string
 ): { subgoal_id: string; status: "rejected"; rejected_reason: string } {
-  const goalStatus = readGoalStatus(goalId, workspaceRoot);
+  return mutateGoalStatus(goalId, (goalStatus) => {
 
   const index = goalStatus.subgoals.findIndex((s) => s.id === subgoalId);
   if (index === -1) {
@@ -222,13 +224,15 @@ export function rejectSubgoal(
     updated_at: new Date().toISOString(),
   };
 
-  writeGoalStatus(goalId, updatedGoalStatus, workspaceRoot);
-
   return {
-    subgoal_id: subgoalId,
-    status: "rejected",
-    rejected_reason: reason,
+    next: updatedGoalStatus,
+    result: {
+      subgoal_id: subgoalId,
+      status: "rejected" as const,
+      rejected_reason: reason,
+    },
   };
+  }, workspaceRoot);
 }
 
 /**

package/src/goal/goalReport.ts

@@ -6,11 +6,12 @@
  * 所有写入操作使用原子写（.tmp + rename），所有字符串内容经 redactSensitiveValue 脱敏。
  */
 
-import { mkdirSync, renameSync, writeFileSync } from "node:fs";
+import { mkdirSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { getConfig } from "../config.js";
 import { redactSensitiveValue } from "../security/contentRedaction.js";
-import { listEvidencePacks } from "../tools/evidencePack.js";
+import { listEvidencePacks } from "../tools/tasks/evidencePack.js";
+import { atomicWriteFileSync } from "../utils/atomicFile.js";
 import { summarizeGoalProgress, type GoalProgressSummary } from "./goalProgress.js";
 import { readGoalStatus } from "./goalStore.js";
 
@@ -45,15 +46,6 @@ function resolveWorkspaceRoot(workspaceRoot?: string): string {
   return workspaceRoot ?? getConfig().workspaceRoot;
 }
 
-/**
- * 原子写文件：先写到 .tmp 文件，再 renameSync 到目标路径。
- */
-function atomicWriteFile(filePath: string, content: string): void {
-  const tmpPath = filePath + ".tmp";
-  writeFileSync(tmpPath, content, "utf-8");
-  renameSync(tmpPath, filePath);
-}
-
 /**
  * 将百分比字符串（如 "100%"）解析为数字。
  */
@@ -261,11 +253,11 @@ export function exportGoalReport(
   const safeReport = redactSensitiveValue(rawReport).value as SafeGoalReport;
 
   // 原子写 JSON（机器可读）
-  atomicWriteFile(reportJsonPath, JSON.stringify(safeReport, null, 2) + "\n");
+  atomicWriteFileSync(reportJsonPath, JSON.stringify(safeReport, null, 2) + "\n");
 
   // 原子写 Markdown（人类可读，从脱敏后的对象生成）
   const markdown = buildReportMarkdown(safeReport, { noSubgoals, incomplete });
-  atomicWriteFile(reportMdPath, markdown);
+  atomicWriteFileSync(reportMdPath, markdown);
 
   return safeReport;
 }

package/src/goal/goalStatus.ts

@@ -12,6 +12,7 @@
  */
 
 import { PatchWardenError } from "../errors.js";
+import { redactSensitiveContent } from "../security/contentRedaction.js";
 
 // ── 类型定义 ──────────────────────────────────────────────────────
 
@@ -35,6 +36,8 @@ export interface Subgoal {
   external_ref?: string;
   /** Spec Kit task.files 提示（作用域文件路径列表） */
   scope_hints?: string[];
+  /** Managed git worktree associated with an isolated subgoal task. */
+  worktree_id?: string;
 }
 
 export interface GoalStatus {
@@ -74,7 +77,7 @@ export function createInitialGoalStatus(
   const now = new Date().toISOString();
   return {
     goal_id: goalId,
-    title,
+    title: redactGoalText(title, 500),
     status: "active",
     repo_path: repoPath,
     created_at: now,
@@ -94,6 +97,15 @@ export function addSubgoal(
   title: string,
   dependsOn: string[] = []
 ): { goalStatus: GoalStatus; subgoalId: string } {
+  if (goalStatus.status !== "active") {
+    throw new PatchWardenError(
+      "goal_not_active",
+      `Goal "${goalStatus.goal_id}" is ${goalStatus.status} and cannot accept new subgoals.`,
+      "Create a new Goal Session for additional work.",
+      true,
+      { goal_id: goalStatus.goal_id, status: goalStatus.status },
+    );
+  }
   const existingIds = new Set(goalStatus.subgoals.map((s) => s.id));
   for (const depId of dependsOn) {
     if (!existingIds.has(depId)) {
@@ -111,7 +123,7 @@ export function addSubgoal(
   const subgoalId = `subgoal-${String(nextNumber).padStart(3, "0")}`;
   const newSubgoal: Subgoal = {
     id: subgoalId,
-    title,
+    title: redactGoalText(title, 500),
     status: "ready",
     depends_on: [...dependsOn],
     task_ids: [],
@@ -185,7 +197,7 @@ export function updateSubgoalStatus(
         { subgoal_id: subgoalId, from_status: current.status, to_status: newStatus }
       );
     }
-    updatedSubgoal.rejected_reason = options.rejected_reason;
+    updatedSubgoal.rejected_reason = redactGoalText(options.rejected_reason, 2000);
   }
 
   const newSubgoals = [...goalStatus.subgoals];
@@ -198,6 +210,10 @@ export function updateSubgoalStatus(
   };
 }
 
+function redactGoalText(value: string, maxChars: number): string {
+  return redactSensitiveContent(String(value || "")).content.slice(0, maxChars);
+}
+
 /**
  * 将 taskId 关联到指定 subgoal（去重）。
  * 不可变更新：返回新的 GoalStatus 对象。