patchwarden 1.5.1 → 1.6.1

package/dist/goal/specKitImport.js

@@ -10,7 +10,7 @@
  */
 import { PatchWardenError } from "../errors.js";
 import { addSubgoal } from "./goalStatus.js";
-import { readGoalStatus, writeGoalStatus } from "./goalStore.js";
+import { mutateGoalStatus } from "./goalStore.js";
 // ── JSON 解析 ─────────────────────────────────────────────────────
 /**
  * 解析 Spec Kit JSON 文本并验证结构。
@@ -101,120 +101,121 @@ export function importSpecKitTasks(goalId, input, options) {
         throw new PatchWardenError("invalid_spec_kit_input", 'Spec Kit input must contain a "tasks" array', "Ensure input.tasks is an array of SpecKitTask objects.", true, { tasks_type: Array.isArray(input.tasks) ? "array" : typeof input.tasks });
     }
     const workspaceRoot = options?.workspaceRoot;
-    // ── 读取现有 GoalStatus ────────────────────────────────────
-    let goalStatus = readGoalStatus(goalId, workspaceRoot);
-    // ── 构建 external_ref → subgoal_id 映射（现有 subgoal）─────
-    const refToSubgoalId = new Map();
-    for (const sg of goalStatus.subgoals) {
-        if (sg.external_ref) {
-            refToSubgoalId.set(sg.external_ref, sg.id);
-        }
-    }
-    // ── 幂等去重：区分新 task 和已存在的 task ─────────────────
-    const newTasks = [];
-    let existingCount = 0;
-    for (const task of input.tasks) {
-        if (refToSubgoalId.has(task.id)) {
-            existingCount++;
-        }
-        else {
-            newTasks.push(task);
-        }
-    }
-    // 新批次中所有 task id 集合（用于判断依赖是否在同批次）
-    const newTaskIds = new Set(newTasks.map((t) => t.id));
-    // ── 按依赖顺序创建 subgoal（拓扑排序，迭代多轮）────────────
-    const createdIds = [];
-    let remaining = [...newTasks];
-    // 辅助：创建单个 subgoal 并设置 external_ref / scope_hints
-    const createSubgoalForTask = (gs, task, resolvedDeps) => {
-        const { goalStatus: newGs, subgoalId } = addSubgoal(gs, task.desc, resolvedDeps);
-        // 新 subgoal 是数组最后一个元素，追加 external_ref 和 scope_hints
-        const subgoals = [...newGs.subgoals];
-        const lastIdx = subgoals.length - 1;
-        const updated = {
-            ...subgoals[lastIdx],
-            external_ref: task.id,
-        };
-        if (task.files && task.files.length > 0) {
-            updated.scope_hints = [...task.files];
-        }
-        subgoals[lastIdx] = updated;
-        return { goalStatus: { ...newGs, subgoals }, subgoalId };
-    };
-    while (remaining.length > 0) {
-        const stillRemaining = [];
-        let progress = false;
-        // 正向遍历：保持输入顺序，先创建的 task 可被同批次后续 task 依赖
-        for (const task of remaining) {
-            const deps = task.depends_on ?? [];
-            const resolvedDeps = [];
-            let hasUnresolvedInBatch = false;
-            for (const dep of deps) {
-                if (refToSubgoalId.has(dep)) {
-                    // 依赖已存在（已有 subgoal 或本批次已创建）
-                    resolvedDeps.push(refToSubgoalId.get(dep));
-                }
-                else if (newTaskIds.has(dep)) {
-                    // 依赖同批次中尚未创建的 task
-                    hasUnresolvedInBatch = true;
-                }
-                else {
-                    // 依赖的 task 不存在任何地方：忽略并记录 warning
-                    console.warn(`[specKitImport] Task "${task.id}" depends on non-existent task "${dep}"; ignoring this dependency.`);
-                }
+    return mutateGoalStatus(goalId, (currentGoalStatus) => {
+        let goalStatus = currentGoalStatus;
+        // ── 构建 external_ref → subgoal_id 映射（现有 subgoal）─────
+        const refToSubgoalId = new Map();
+        for (const sg of goalStatus.subgoals) {
+            if (sg.external_ref) {
+                refToSubgoalId.set(sg.external_ref, sg.id);
             }
-            if (!hasUnresolvedInBatch) {
-                const { goalStatus: newGs, subgoalId } = createSubgoalForTask(goalStatus, task, resolvedDeps);
-                goalStatus = newGs;
-                refToSubgoalId.set(task.id, subgoalId);
-                createdIds.push(subgoalId);
-                progress = true;
+        }
+        // ── 幂等去重：区分新 task 和已存在的 task ─────────────────
+        const newTasks = [];
+        let existingCount = 0;
+        for (const task of input.tasks) {
+            if (refToSubgoalId.has(task.id)) {
+                existingCount++;
             }
             else {
-                stillRemaining.push(task);
+                newTasks.push(task);
             }
         }
-        remaining = stillRemaining;
-        if (!progress && remaining.length > 0) {
-            // 检测到循环依赖：强制创建剩余 task，忽略未解析的同批次依赖
+        // 新批次中所有 task id 集合（用于判断依赖是否在同批次）
+        const newTaskIds = new Set(newTasks.map((t) => t.id));
+        // ── 按依赖顺序创建 subgoal（拓扑排序，迭代多轮）────────────
+        const createdIds = [];
+        let remaining = [...newTasks];
+        // 辅助：创建单个 subgoal 并设置 external_ref / scope_hints
+        const createSubgoalForTask = (gs, task, resolvedDeps) => {
+            const { goalStatus: newGs, subgoalId } = addSubgoal(gs, task.desc, resolvedDeps);
+            // 新 subgoal 是数组最后一个元素，追加 external_ref 和 scope_hints
+            const subgoals = [...newGs.subgoals];
+            const lastIdx = subgoals.length - 1;
+            const updated = {
+                ...subgoals[lastIdx],
+                external_ref: task.id,
+            };
+            if (task.files && task.files.length > 0) {
+                updated.scope_hints = [...task.files];
+            }
+            subgoals[lastIdx] = updated;
+            return { goalStatus: { ...newGs, subgoals }, subgoalId };
+        };
+        while (remaining.length > 0) {
+            const stillRemaining = [];
+            let progress = false;
+            // 正向遍历：保持输入顺序，先创建的 task 可被同批次后续 task 依赖
             for (const task of remaining) {
                 const deps = task.depends_on ?? [];
                 const resolvedDeps = [];
+                let hasUnresolvedInBatch = false;
                 for (const dep of deps) {
                     if (refToSubgoalId.has(dep)) {
+                        // 依赖已存在（已有 subgoal 或本批次已创建）
                         resolvedDeps.push(refToSubgoalId.get(dep));
                     }
                     else if (newTaskIds.has(dep)) {
-                        console.warn(`[specKitImport] Circular dependency detected: task "${task.id}" depends on "${dep}" which could not be resolved; ignoring this dependency.`);
+                        // 依赖同批次中尚未创建的 task
+                        hasUnresolvedInBatch = true;
                     }
                     else {
+                        // 依赖的 task 不存在任何地方：忽略并记录 warning
                         console.warn(`[specKitImport] Task "${task.id}" depends on non-existent task "${dep}"; ignoring this dependency.`);
                     }
                 }
-                const { goalStatus: newGs, subgoalId } = createSubgoalForTask(goalStatus, task, resolvedDeps);
-                goalStatus = newGs;
-                refToSubgoalId.set(task.id, subgoalId);
-                createdIds.push(subgoalId);
+                if (!hasUnresolvedInBatch) {
+                    const { goalStatus: newGs, subgoalId } = createSubgoalForTask(goalStatus, task, resolvedDeps);
+                    goalStatus = newGs;
+                    refToSubgoalId.set(task.id, subgoalId);
+                    createdIds.push(subgoalId);
+                    progress = true;
+                }
+                else {
+                    stillRemaining.push(task);
+                }
+            }
+            remaining = stillRemaining;
+            if (!progress && remaining.length > 0) {
+                // 检测到循环依赖：强制创建剩余 task，忽略未解析的同批次依赖
+                for (const task of remaining) {
+                    const deps = task.depends_on ?? [];
+                    const resolvedDeps = [];
+                    for (const dep of deps) {
+                        if (refToSubgoalId.has(dep)) {
+                            resolvedDeps.push(refToSubgoalId.get(dep));
+                        }
+                        else if (newTaskIds.has(dep)) {
+                            console.warn(`[specKitImport] Circular dependency detected: task "${task.id}" depends on "${dep}" which could not be resolved; ignoring this dependency.`);
+                        }
+                        else {
+                            console.warn(`[specKitImport] Task "${task.id}" depends on non-existent task "${dep}"; ignoring this dependency.`);
+                        }
+                    }
+                    const { goalStatus: newGs, subgoalId } = createSubgoalForTask(goalStatus, task, resolvedDeps);
+                    goalStatus = newGs;
+                    refToSubgoalId.set(task.id, subgoalId);
+                    createdIds.push(subgoalId);
+                }
+                break;
             }
-            break;
         }
-    }
-    // ── 验收标准 ───────────────────────────────────────────────
-    if (input.acceptance && input.acceptance.length > 0) {
-        goalStatus = {
-            ...goalStatus,
-            acceptance_criteria: [...input.acceptance],
+        // ── 验收标准 ───────────────────────────────────────────────
+        if (input.acceptance && input.acceptance.length > 0) {
+            goalStatus = {
+                ...goalStatus,
+                acceptance_criteria: [...input.acceptance],
+            };
+        }
+        return {
+            next: goalStatus,
+            result: {
+                goal_id: goalId,
+                spec_name: input.spec,
+                created_count: createdIds.length,
+                existing_count: existingCount,
+                subgoal_ids: createdIds,
+            },
         };
-    }
-    // ── 持久化（原子写）────────────────────────────────────────
-    writeGoalStatus(goalId, goalStatus, workspaceRoot);
-    // ── 返回结果 ───────────────────────────────────────────────
-    return {
-        goal_id: goalId,
-        spec_name: input.spec,
-        created_count: createdIds.length,
-        existing_count: existingCount,
-        subgoal_ids: createdIds,
-    };
+    }, workspaceRoot);
 }

package/dist/goal/subgoalSync.js

@@ -8,7 +8,7 @@
  */
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
-import { readGoalStatus, writeGoalStatus } from "./goalStore.js";
+import { mutateGoalStatus } from "./goalStore.js";
 import { updateSubgoalStatus } from "./goalStatus.js";
 import { logger } from "../logging.js";
 // ── 同步函数 ──────────────────────────────────────────────────────
@@ -32,14 +32,16 @@ export function syncSubgoalOnTaskDone(taskId, taskMeta, workspaceRoot) {
     if (!goalId || !subgoalId)
         return;
     try {
-        const goalStatus = readGoalStatus(goalId, workspaceRoot);
-        const subgoal = goalStatus.subgoals.find((s) => s.id === subgoalId);
-        if (!subgoal)
-            return;
-        if (subgoal.status !== "running")
-            return;
-        const updated = updateSubgoalStatus(goalStatus, subgoalId, "done_by_agent");
-        writeGoalStatus(goalId, updated, workspaceRoot);
+        mutateGoalStatus(goalId, (goalStatus) => {
+            const subgoal = goalStatus.subgoals.find((entry) => entry.id === subgoalId);
+            if (!subgoal || subgoal.status !== "running") {
+                return { result: undefined };
+            }
+            return {
+                next: updateSubgoalStatus(goalStatus, subgoalId, "done_by_agent"),
+                result: undefined,
+            };
+        }, workspaceRoot);
     }
     catch (err) {
         // subgoal 同步失败不应影响任务完成流程，只记录到 stderr

package/dist/goal/worktreeManager.d.ts

@@ -31,6 +31,8 @@ export interface WorktreeStatus {
 }
 /** worktree 根目录名，放在 workspaceRoot 下。 */
 export declare const WorktreeDir = "_workspacetrees";
+/** Accept only IDs emitted by generateWorktreeId(). */
+export declare function assertValidWorktreeId(worktreeId: string): void;
 /**
  * 返回 `<workspaceRoot>/_workspacetrees` 目录路径。不自动创建目录。
  */