@xdevops/issue-auto-finish 1.0.87 → 1.0.89

package/dist/{chunk-IP3QTP5A.js → chunk-IWSMQXBL.js}

@@ -17,7 +17,7 @@ import {
   planPrompt,
   rePlanPrompt,
   verifyPrompt
-} from "./chunk-2YQHKXLL.js";
+} from "./chunk-GPZX4DSY.js";
 import {
   getProjectKnowledge
 } from "./chunk-ACVOOHAR.js";
@@ -26,7 +26,7 @@ import {
 } from "./chunk-B7TVVODN.js";
 import {
   t
-} from "./chunk-YCYVNRLF.js";
+} from "./chunk-OBGEEGQ3.js";
 import {
   getLocalIP
 } from "./chunk-AKXDQH25.js";
@@ -36,8 +36,11 @@ import {
 import {
   createAIRunner,
   getRunnerCapabilities,
+  usesDeterministicPlanCopy
+} from "./chunk-TFEPHOVE.js";
+import {
   isShuttingDown
-} from "./chunk-SAMTXC4A.js";
+} from "./chunk-G7QI5WDI.js";
 import {
   AIExecutionError,
   GongfengApiError,
@@ -51,7 +54,7 @@ import {
   PortExhaustionError,
   ServiceShutdownError,
   UnregisteredPhasesError
-} from "./chunk-AVGZH64A.js";
+} from "./chunk-2RWGZPNF.js";
 import {
   logger,
   runWithIssueContext
@@ -1082,6 +1085,28 @@ var IssueTracker = class _IssueTracker extends BaseTracker {
     logger5.warn("Issue marked as failed", { issueIid, error, failedAtState, attempts: record.attempts, isRetryable });
     eventBus.emitTyped("issue:failed", { issueIid, error, failedAtState, record });
   }
+  /**
+   * Mark as failed WITHOUT incrementing attempts. Used when the agent was still
+   * actively producing output at timeout — a slow-but-progressing run should not
+   * consume the retry budget.
+   */
+  markFailedSoft(issueIid, error, failedAtState) {
+    const record = this.collection[this.key(issueIid)];
+    if (!record) return;
+    record.state = "failed" /* Failed */;
+    record.lastError = error;
+    record.failedAtState = failedAtState;
+    record.lastErrorRetryable = true;
+    record.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    this.save();
+    logger5.warn("Issue marked as failed (soft \u2014 no attempt increment)", {
+      issueIid,
+      error,
+      failedAtState,
+      attempts: record.attempts
+    });
+    eventBus.emitTyped("issue:failed", { issueIid, error, failedAtState, record });
+  }
   pauseIssue(issueIid, currentPhase) {
     const record = this.collection[this.key(issueIid)];
     if (!record) return;
@@ -1593,6 +1618,31 @@ var PlanPersistence = class _PlanPersistence {
     this.ensureDir();
     fs2.writeFileSync(path2.join(this.planDir, filename), content, "utf-8");
   }
+  /**
+   * Copy a plan file from an external source (e.g. ~/.claude/plans/) into planDir.
+   * Returns the destination path, or null if the source is empty/unreadable.
+   */
+  copyPlanFromExternal(sourcePath, targetFilename = "01-plan.md") {
+    try {
+      const content = fs2.readFileSync(sourcePath, "utf-8");
+      if (content.trim().length === 0) {
+        logger6.warn("External plan file is empty", { sourcePath });
+        return null;
+      }
+      this.ensureDir();
+      const destPath = path2.join(this.planDir, targetFilename);
+      fs2.writeFileSync(destPath, content, "utf-8");
+      logger6.info("Plan copied from external source", {
+        source: sourcePath,
+        dest: destPath,
+        size: content.length
+      });
+      return destPath;
+    } catch (err) {
+      logger6.error("Failed to copy plan from external source", { sourcePath, err });
+      return null;
+    }
+  }
 };
 
 // src/phases/BasePhase.ts
@@ -1776,7 +1826,8 @@ ${t("basePhase.rulesSection", { rules })}`;
         error: {
           message: (result.errorMessage || result.output).slice(0, 500),
           isRetryable: this.classifyRetryable(result),
-          rawOutput: result.output
+          rawOutput: result.output,
+          wasActiveAtTimeout: result.wasActiveAtTimeout
         }
       };
     }
@@ -1843,6 +1894,9 @@ ${t("basePhase.rulesSection", { rules })}`;
       workDir: this.resolveAIWorkDir(ctx),
       timeoutMs: this.config.ai.phaseTimeoutMs,
       idleTimeoutMs: this.config.ai.idleTimeoutMs,
+      timeoutGraceMs: this.config.ai.timeoutGraceMs,
+      timeoutExtensionMs: this.config.ai.timeoutExtensionMs,
+      timeoutMaxExtensions: this.config.ai.timeoutMaxExtensions,
       mode: this.getRunMode(),
       phaseName: this.phaseName,
       artifactCheck,
@@ -2122,6 +2176,7 @@ var PlanPhase = class extends BasePhase {
   buildPrompt(ctx) {
     const pc = demandToPromptContext(ctx.demand);
     const history = this.plan.readReviewHistory();
+    const detCopy = usesDeterministicPlanCopy(this.config.ai.mode);
     const promptCtx = {
       issueTitle: pc.title,
       issueDescription: pc.description,
@@ -2131,13 +2186,14 @@ var PlanPhase = class extends BasePhase {
     };
     let basePrompt;
     if (history.length > 0) {
-      basePrompt = rePlanPrompt(promptCtx, history);
+      basePrompt = rePlanPrompt(promptCtx, history, detCopy);
     } else {
-      basePrompt = planPrompt(promptCtx);
+      basePrompt = planPrompt(promptCtx, detCopy);
     }
     const caps = getRunnerCapabilities(this.config.ai.mode);
     if (!caps?.nativePlanMode) {
-      basePrompt = `${t("prompt.planModeFallback")}
+      const preambleKey = detCopy ? "prompt.planModeNative" : "prompt.planModeFallback";
+      basePrompt = `${t(preambleKey)}
 
 ${basePrompt}`;
     }
@@ -3804,6 +3860,18 @@ function buildNoteSyncComment(phaseName, phaseLabel, docUrl, dashboardUrl, summa
   ].join("\n");
 }
 
+// src/orchestrator/PendingDialogStore.ts
+var store = /* @__PURE__ */ new Map();
+function setPendingDialog(info) {
+  store.set(info.issueIid, info);
+}
+function getPendingDialog(issueIid) {
+  return store.get(issueIid);
+}
+function clearPendingDialog(issueIid) {
+  store.delete(issueIid);
+}
+
 // src/orchestrator/steps/PhaseLoopStep.ts
 var logger15 = logger.child("PhaseLoopStep");
 function resolveVerifyRunner(deps) {
@@ -3878,41 +3946,95 @@ async function syncResultToIssue(phase, ctx, displayId, phaseName, deps, issueId
     await safeComment(deps, issueId, issueProgressComment(phaseName, "completed"));
   }
 }
-function buildAcpHandler(displayId, phaseName, deps) {
-  if (deps.config.ai.codebuddyAcpAutoApprove !== false) return void 0;
+function buildInputHandler(displayId, phaseName, deps) {
+  const useAcpGate = deps.config.ai.codebuddyAcpAutoApprove === false;
   return (request) => {
-    if (request.type !== "plan-approval") {
-      return Promise.resolve("allow");
+    if (request.type === "interactive-dialog") {
+      return handleInteractiveDialog(displayId, phaseName, deps, request);
     }
-    logger15.info("ACP plan-approval requested, delegating to review gate", {
-      issueIid: displayId,
-      phase: phaseName
-    });
-    deps.eventBus.emitTyped("review:requested", { issueIid: displayId });
-    return new Promise((resolve) => {
-      const onApproved = (payload) => {
-        const data = payload.data;
-        if (data.issueIid !== displayId) return;
-        cleanup();
-        logger15.info("ACP plan-approval approved via review gate", { issueIid: displayId });
-        resolve("allow");
-      };
-      const onRejected = (payload) => {
-        const data = payload.data;
-        if (data.issueIid !== displayId) return;
-        cleanup();
-        logger15.info("ACP plan-approval rejected via review gate", { issueIid: displayId });
-        resolve("reject");
-      };
-      const cleanup = () => {
-        deps.eventBus.removeListener("review:approved", onApproved);
-        deps.eventBus.removeListener("review:rejected", onRejected);
-      };
-      deps.eventBus.on("review:approved", onApproved);
-      deps.eventBus.on("review:rejected", onRejected);
-    });
+    if (request.type === "plan-approval" && useAcpGate) {
+      return handlePlanApproval(displayId, phaseName, deps);
+    }
+    return Promise.resolve("allow");
   };
 }
+function handlePlanApproval(displayId, phaseName, deps) {
+  logger15.info("ACP plan-approval requested, delegating to review gate", {
+    issueIid: displayId,
+    phase: phaseName
+  });
+  deps.eventBus.emitTyped("review:requested", { issueIid: displayId });
+  return new Promise((resolve) => {
+    const onApproved = (payload) => {
+      const data = payload.data;
+      if (data.issueIid !== displayId) return;
+      cleanup();
+      logger15.info("ACP plan-approval approved via review gate", { issueIid: displayId });
+      resolve("allow");
+    };
+    const onRejected = (payload) => {
+      const data = payload.data;
+      if (data.issueIid !== displayId) return;
+      cleanup();
+      logger15.info("ACP plan-approval rejected via review gate", { issueIid: displayId });
+      resolve("reject");
+    };
+    const cleanup = () => {
+      deps.eventBus.removeListener("review:approved", onApproved);
+      deps.eventBus.removeListener("review:rejected", onRejected);
+    };
+    deps.eventBus.on("review:approved", onApproved);
+    deps.eventBus.on("review:rejected", onRejected);
+  });
+}
+function handleInteractiveDialog(displayId, phaseName, deps, request) {
+  logger15.info("Interactive dialog forwarded to frontend", {
+    issueIid: displayId,
+    phase: phaseName,
+    question: request.content.slice(0, 80),
+    optionCount: request.options?.length
+  });
+  const options = request.options ?? [];
+  setPendingDialog({
+    issueIid: displayId,
+    question: request.content,
+    options,
+    phase: phaseName,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  });
+  deps.eventBus.emitTyped("agent:inputRequired", {
+    issueIid: displayId,
+    phase: phaseName,
+    question: request.content,
+    options
+  });
+  return new Promise((resolve) => {
+    const cleanup = () => {
+      deps.eventBus.removeListener("agent:inputResponse", onResponse);
+      deps.eventBus.removeListener("agent:dialogDismissed", onDismiss);
+    };
+    const onResponse = (payload) => {
+      const data = payload.data;
+      if (data.issueIid !== displayId) return;
+      cleanup();
+      clearPendingDialog(displayId);
+      logger15.info("Interactive dialog response received from frontend", {
+        issueIid: displayId,
+        response: data.response
+      });
+      resolve(data.response ?? "1");
+    };
+    const onDismiss = (payload) => {
+      const data = payload.data;
+      if (data.issueIid !== displayId) return;
+      cleanup();
+      logger15.info("Interactive dialog dismissed by user (false positive)", { issueIid: displayId });
+      resolve("");
+    };
+    deps.eventBus.on("agent:inputResponse", onResponse);
+    deps.eventBus.on("agent:dialogDismissed", onDismiss);
+  });
+}
 async function safeComment(deps, issueId, message) {
   try {
     await deps.gongfeng.createIssueNote(issueId, message);
@@ -3941,7 +4063,7 @@ async function runPhaseWithLifecycle(phase, phaseCtx, spec, ctx, deps, wtGit, wt
       phase: spec.name,
       event
     }),
-    onInputRequired: buildAcpHandler(displayId, spec.name, deps)
+    onInputRequired: buildInputHandler(displayId, spec.name, deps)
   };
   const outcome = await phase.run(phaseCtx, callbacks);
   if (outcome.sessionId) wtPlan.updatePhaseSessionId(spec.name, outcome.sessionId);
@@ -3961,14 +4083,20 @@ async function runPhaseWithLifecycle(phase, phaseCtx, spec, ctx, deps, wtGit, wt
   }
   const errMsg = outcome.error?.message ?? "Unknown error";
   const shortErr = errMsg.slice(0, 200);
+  const wasActive = outcome.error?.wasActiveAtTimeout ?? false;
   wtPlan.updatePhaseProgress(spec.name, "failed", errMsg);
   deps.tracker.updatePhaseProgress(displayId, spec.name, { status: "failed" });
-  deps.tracker.markFailed(displayId, errMsg, "phase_running" /* PhaseRunning */);
+  if (wasActive) {
+    deps.tracker.markFailedSoft(displayId, errMsg, "phase_running" /* PhaseRunning */);
+  } else {
+    deps.tracker.markFailed(displayId, errMsg, "phase_running" /* PhaseRunning */);
+  }
   await safeComment(deps, issue.id, issueProgressComment(spec.name, "failed", shortErr));
   throw new AIExecutionError(spec.name, `Phase ${spec.name} failed: ${shortErr}`, {
     output: outcome.error?.rawOutput ?? outcome.output,
     exitCode: outcome.exitCode ?? 1,
-    isRetryable: outcome.error?.isRetryable
+    isRetryable: outcome.error?.isRetryable,
+    wasActiveAtTimeout: wasActive
   });
 }
 async function executePhaseLoop(ctx, deps, wtGit, wtPlan, wtGitMap) {
@@ -4185,14 +4313,20 @@ async function awaitAsyncPhase(outcome, spec, ctx, deps, wtGit, wtPlan, wtGitMap
   }
   const errMsg = finalOutcome.error?.message ?? "Unknown error";
   const shortErr = errMsg.slice(0, 200);
+  const wasActive = finalOutcome.error?.wasActiveAtTimeout ?? false;
   wtPlan.updatePhaseProgress(spec.name, "failed", errMsg);
   deps.tracker.updatePhaseProgress(displayId, spec.name, { status: "failed" });
-  deps.tracker.markFailed(displayId, errMsg, "phase_running" /* PhaseRunning */);
+  if (wasActive) {
+    deps.tracker.markFailedSoft(displayId, errMsg, "phase_running" /* PhaseRunning */);
+  } else {
+    deps.tracker.markFailed(displayId, errMsg, "phase_running" /* PhaseRunning */);
+  }
   await safeComment(deps, issue.id, issueProgressComment(spec.name, "failed", shortErr));
   throw new AIExecutionError(spec.name, `Phase ${spec.name} failed: ${shortErr}`, {
     output: finalOutcome.error?.rawOutput ?? finalOutcome.output,
     exitCode: finalOutcome.exitCode ?? 1,
-    isRetryable: finalOutcome.error?.isRetryable
+    isRetryable: finalOutcome.error?.isRetryable,
+    wasActiveAtTimeout: wasActive
   });
 }
 function findPreviousAiPhaseIndex(phases, currentIdx) {
@@ -4417,13 +4551,18 @@ var logger17 = logger.child("FailureHandler");
 async function handleFailure(err, issue, wtCtx, deps) {
   const errorMsg = err.message;
   const isRetryable = err instanceof AIExecutionError ? err.isRetryable : true;
-  logger17.error("Issue processing failed", { iid: issue.iid, error: errorMsg, isRetryable });
+  const wasActiveAtTimeout = err instanceof AIExecutionError && err.wasActiveAtTimeout;
+  logger17.error("Issue processing failed", { iid: issue.iid, error: errorMsg, isRetryable, wasActiveAtTimeout });
   metrics.incCounter("iaf_issues_failed_total");
   const currentRecord = deps.tracker.get(issue.iid);
   const failedAtState = currentRecord?.state || "pending" /* Pending */;
   const wasReset = failedAtState === "pending" /* Pending */ && currentRecord?.attempts === 0;
   if (failedAtState !== "failed" /* Failed */ && !wasReset) {
-    deps.tracker.markFailed(issue.iid, errorMsg.slice(0, 500), failedAtState, isRetryable);
+    if (wasActiveAtTimeout) {
+      deps.tracker.markFailedSoft(issue.iid, errorMsg.slice(0, 500), failedAtState);
+    } else {
+      deps.tracker.markFailed(issue.iid, errorMsg.slice(0, 500), failedAtState, isRetryable);
+    }
   }
   if (wasReset) {
     logger17.info("Issue was reset during processing, skipping failure marking", { iid: issue.iid });
@@ -5363,7 +5502,7 @@ E2E \u6D4B\u8BD5\u5C06\u5C1D\u8BD5\u4F7F\u7528 config.json \u4E2D\u7684\u9ED8\u8
       const verifyOutcome = await verifyPhase.run(verifyCtx);
       if (verifyOutcome.status === "failed") {
         const errMsg = verifyOutcome.error?.message ?? "Verification failed after conflict resolution";
-        throw new (await import("./errors-S3BWYA4I.js")).AIExecutionError("verify", errMsg, {
+        throw new (await import("./errors-J3ZRP66W.js")).AIExecutionError("verify", errMsg, {
           output: verifyOutcome.error?.rawOutput ?? verifyOutcome.output,
           exitCode: verifyOutcome.exitCode ?? 1
         });
@@ -5674,7 +5813,9 @@ export {
   getNoteSyncEnabled,
   setNoteSyncOverride,
   isNoteSyncEnabledForIssue,
+  getPendingDialog,
+  clearPendingDialog,
   PipelineOrchestrator,
   BrainstormService
 };
-//# sourceMappingURL=chunk-IP3QTP5A.js.map
+//# sourceMappingURL=chunk-IWSMQXBL.js.map