@xdevops/issue-auto-finish 1.0.93 → 1.0.95

package/dist/{chunk-OPWP73PW.js → chunk-P3YTEJU6.js}

@@ -20,7 +20,7 @@ import {
 } from "./chunk-GPZX4DSY.js";
 import {
   HookInjector
-} from "./chunk-HD6V7KPE.js";
+} from "./chunk-36G3DPO3.js";
 import {
   getProjectKnowledge
 } from "./chunk-ACVOOHAR.js";
@@ -236,8 +236,8 @@ var GongfengClient = class {
     const encoded = encodeURIComponent(this.projectPath);
     return `${this.apiUrl}/api/v3/projects/${encoded}`;
   }
-  async requestRaw(path12, options = {}) {
-    const url = `${this.projectApiBase}${path12}`;
+  async requestRaw(path13, options = {}) {
+    const url = `${this.projectApiBase}${path13}`;
     logger4.debug("API request", { method: options.method || "GET", url });
     return this.circuitBreaker.execute(
       () => this.retryPolicy.execute(async () => {
@@ -254,11 +254,11 @@ var GongfengClient = class {
           throw new GongfengApiError(resp.status, `Gongfeng API error ${resp.status}: ${body}`, body);
         }
         return resp;
-      }, `requestRaw ${options.method || "GET"} ${path12}`)
+      }, `requestRaw ${options.method || "GET"} ${path13}`)
     );
   }
-  async request(path12, options = {}) {
-    const resp = await this.requestRaw(path12, options);
+  async request(path13, options = {}) {
+    const resp = await this.requestRaw(path13, options);
     return resp.json();
   }
   async createIssue(title, description, labels) {
@@ -437,8 +437,8 @@ var GongfengClient = class {
     }
     return mr;
   }
-  async requestGlobal(path12, options = {}) {
-    const url = `${this.apiUrl}${path12}`;
+  async requestGlobal(path13, options = {}) {
+    const url = `${this.apiUrl}${path13}`;
     logger4.debug("API request (global)", { method: options.method || "GET", url });
     const resp = await this.circuitBreaker.execute(
       () => this.retryPolicy.execute(async () => {
@@ -455,7 +455,7 @@ var GongfengClient = class {
           throw new GongfengApiError(r.status, `Gongfeng API error ${r.status}: ${body}`, body);
         }
         return r;
-      }, `requestGlobal ${options.method || "GET"} ${path12}`)
+      }, `requestGlobal ${options.method || "GET"} ${path13}`)
     );
     return resp.json();
   }
@@ -3134,8 +3134,8 @@ var WorkspaceManager = class {
 };
 
 // src/orchestrator/PipelineOrchestrator.ts
-import path11 from "path";
-import fs9 from "fs/promises";
+import path12 from "path";
+import fs10 from "fs/promises";
 import fsSync from "fs";
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
@@ -3774,7 +3774,38 @@ metrics.registerCounter("iaf_braindump_batches_total", "Total braindump batches"
 metrics.registerCounter("iaf_braindump_tasks_total", "Total braindump tasks");
 
 // src/orchestrator/steps/SetupStep.ts
+import fs9 from "fs";
+import path11 from "path";
 var logger14 = logger.child("SetupStep");
+var PLAN_DIR_NAME = ".claude-plan";
+function cleanupStalePlanDirs(workDir, currentIid) {
+  const claudePlanDir = path11.join(workDir, PLAN_DIR_NAME);
+  if (!fs9.existsSync(claudePlanDir)) return;
+  const currentDirName = `issue-${currentIid}`;
+  let entries;
+  try {
+    entries = fs9.readdirSync(claudePlanDir);
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    if (entry.startsWith("issue-") && entry !== currentDirName) {
+      const stalePath = path11.join(claudePlanDir, entry);
+      try {
+        fs9.rmSync(stalePath, { recursive: true, force: true });
+        logger14.info("Removed stale plan directory from worktree", {
+          removed: entry,
+          currentIid
+        });
+      } catch (err) {
+        logger14.warn("Failed to remove stale plan directory", {
+          path: stalePath,
+          error: err.message
+        });
+      }
+    }
+  }
+}
 async function executeSetup(ctx, deps) {
   const { issue, wtCtx, record, pipelineDef, branchName } = ctx;
   try {
@@ -3808,6 +3839,7 @@ async function executeSetup(ctx, deps) {
   const primaryGitRoot = wtCtx.workspace ? wtCtx.workspace.primary.gitRootDir : wtCtx.gitRootDir;
   const wtGit = new GitOperations(primaryGitRoot);
   const wtPlan = new PlanPersistence(primaryWorkDir, issue.iid);
+  cleanupStalePlanDirs(primaryWorkDir, issue.iid);
   wtPlan.ensureDir();
   wtPlan.writeIssueMeta({
     id: issue.id,
@@ -3970,7 +4002,10 @@ function resolveUatRunner(deps, issueIid) {
   }
   return deps.aiRunner;
 }
-async function commitPlanFiles(ctx, wtGit, wtGitMap, phaseName, displayId) {
+async function commitPlanFiles(ctx, wtGit, wtGitMap, phaseName, displayId, planWorkDir) {
+  if (planWorkDir) {
+    cleanupStalePlanDirs(planWorkDir, displayId);
+  }
   const commitMsg = `chore(auto): ${phaseName} phase completed for issue #${displayId}`;
   if (ctx.workspace && ctx.workspace.repos.length > 1) {
     for (const repo of ctx.workspace.repos) {
@@ -4202,7 +4237,7 @@ var DefaultLifecycleHook = class {
       completedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     wtPlan.updatePhaseProgress(spec.name, "completed");
-    await commitPlanFiles(phaseCtx, wtGit, wtGitMap, spec.name, displayId);
+    await commitPlanFiles(phaseCtx, wtGit, wtGitMap, spec.name, displayId, wtPlan.baseDir);
     if (phase) {
       await syncResultToIssue(phase, phaseCtx, displayId, spec.name, deps, issue.id, wtPlan);
     }
@@ -4350,7 +4385,7 @@ var AiPhaseStrategy = class {
           completedAt: (/* @__PURE__ */ new Date()).toISOString()
         });
         wtPlan.updatePhaseProgress(spec.name, "completed");
-        await commitPlanFiles(phaseCtx, wtGit, wtGitMap, spec.name, issue.iid);
+        await commitPlanFiles(phaseCtx, wtGit, wtGitMap, spec.name, issue.iid, wtPlan.baseDir);
         const runner = this.resolveRunner(ctx);
         const phase = createPhase(spec.name, runner, wtGit, wtPlan, deps.config);
         await syncResultToIssue(phase, phaseCtx, issue.iid, spec.name, deps, issue.id, wtPlan);
@@ -4918,7 +4953,7 @@ var PipelineOrchestrator = class {
     });
     this.devServerManager = new DevServerManager();
     this.screenshotPublisher = new ScreenshotPublisher(gongfeng);
-    this.effectiveWorktreeBaseDir = this.tenantId === "default" ? config.project.worktreeBaseDir : path11.join(config.project.worktreeBaseDir, this.tenantId);
+    this.effectiveWorktreeBaseDir = this.tenantId === "default" ? config.project.worktreeBaseDir : path12.join(config.project.worktreeBaseDir, this.tenantId);
     const effectiveWsConfig = wsConfig ?? buildSingleRepoWorkspace(config.project, config.gongfeng.projectPath);
     this.workspaceManager = new WorkspaceManager({
       wsConfig: effectiveWsConfig,
@@ -4957,9 +4992,9 @@ var PipelineOrchestrator = class {
         if (wtDir === repoGitRoot) continue;
         if (!wtDir.includes("/issue-")) continue;
         try {
-          const gitFile = path11.join(wtDir, ".git");
+          const gitFile = path12.join(wtDir, ".git");
           try {
-            await fs9.access(gitFile);
+            await fs10.access(gitFile);
           } catch {
             logger23.warn("Worktree corrupted (.git missing), force removing", { dir: wtDir });
             await this.mainGit.worktreeRemove(wtDir, true).catch(() => {
@@ -4974,9 +5009,9 @@ var PipelineOrchestrator = class {
             await wtGit.rebaseAbort();
             cleaned++;
           }
-          const indexLock = path11.join(wtDir, ".git", "index.lock");
+          const indexLock = path12.join(wtDir, ".git", "index.lock");
           try {
-            await fs9.unlink(indexLock);
+            await fs10.unlink(indexLock);
             logger23.warn("Removed stale index.lock", { path: indexLock });
             cleaned++;
           } catch {
@@ -4988,9 +5023,9 @@ var PipelineOrchestrator = class {
     } catch (err) {
       logger23.warn("Failed to list worktrees for cleanup", { error: err.message });
     }
-    const mainIndexLock = path11.join(repoGitRoot, ".git", "index.lock");
+    const mainIndexLock = path12.join(repoGitRoot, ".git", "index.lock");
     try {
-      await fs9.unlink(mainIndexLock);
+      await fs10.unlink(mainIndexLock);
       logger23.warn("Removed stale main repo index.lock", { path: mainIndexLock });
       cleaned++;
     } catch {
@@ -5106,17 +5141,17 @@ var PipelineOrchestrator = class {
     }
   }
   async ensureNodeModules(workDir) {
-    const targetBin = path11.join(workDir, "node_modules", ".bin");
+    const targetBin = path12.join(workDir, "node_modules", ".bin");
     try {
-      await fs9.access(targetBin);
+      await fs10.access(targetBin);
       logger23.info("node_modules already complete (has .bin/)");
       return true;
     } catch {
     }
-    const sourceNM = path11.join(this.config.project.workDir, "node_modules");
-    const targetNM = path11.join(workDir, "node_modules");
+    const sourceNM = path12.join(this.config.project.workDir, "node_modules");
+    const targetNM = path12.join(workDir, "node_modules");
     try {
-      await fs9.access(sourceNM);
+      await fs10.access(sourceNM);
     } catch {
       logger23.warn("Main repo node_modules not found, skipping seed", { sourceNM });
       return false;
@@ -5203,10 +5238,10 @@ var PipelineOrchestrator = class {
   async cleanupE2eOutputs(issueIid) {
     const vendorDir = this.config.e2e.uatVendorDir;
     if (!vendorDir) return;
-    const abs = path11.isAbsolute(vendorDir) ? vendorDir : path11.resolve(this.config.project.workDir, vendorDir);
-    const outputDir = path11.join(abs, "outputs", `issue-${issueIid}`);
+    const abs = path12.isAbsolute(vendorDir) ? vendorDir : path12.resolve(this.config.project.workDir, vendorDir);
+    const outputDir = path12.join(abs, "outputs", `issue-${issueIid}`);
     try {
-      await fs9.rm(outputDir, { recursive: true, force: true });
+      await fs10.rm(outputDir, { recursive: true, force: true });
       logger23.info("E2E outputs cleaned up", { issueIid, dir: outputDir });
     } catch (err) {
       logger23.warn("Failed to cleanup E2E outputs", { issueIid, dir: outputDir, error: err.message });
@@ -5221,7 +5256,7 @@ var PipelineOrchestrator = class {
     if (!this.workspaceManager) return;
     const wsRoot = this.workspaceManager.getWorkspaceRoot(issueIid);
     try {
-      await fs9.rm(wsRoot, { recursive: true, force: true });
+      await fs10.rm(wsRoot, { recursive: true, force: true });
       logger23.info("Workspace root cleaned up", { issueIid, dir: wsRoot });
     } catch (err) {
       logger23.warn("Failed to cleanup workspace root", { issueIid, dir: wsRoot, error: err.message });
@@ -6073,4 +6108,4 @@ export {
   PipelineOrchestrator,
   BrainstormService
 };
-//# sourceMappingURL=chunk-OPWP73PW.js.map
+//# sourceMappingURL=chunk-P3YTEJU6.js.map