opencode-swarm 7.87.0 → 7.87.2

package/dist/cli/{index-89xjr3h4.js → index-8y7qetpg.js}

@@ -122,6 +122,27 @@ function isGitBinaryMissing(err) {
 
 // src/git/branch.ts
 init_logger();
+
+// src/utils/transient-retry.ts
+var MAX_TRANSIENT_RETRIES = 5;
+var RETRY_BASE_DELAY_MS = 200;
+function isTransientSpawnError(error2) {
+  if (!error2 || typeof error2 !== "object")
+    return false;
+  const code = error2.code;
+  return code === "ETIMEDOUT";
+}
+function transientBackoff(attempt) {
+  const delay = RETRY_BASE_DELAY_MS * 2 ** attempt;
+  try {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delay);
+  } catch {
+    const start = Date.now();
+    while (Date.now() - start < delay) {}
+  }
+}
+
+// src/git/branch.ts
 var GIT_TIMEOUT_MS = 30000;
 var GIT_MAX_BUFFER_BYTES = 5 * 1024 * 1024;
 function unique(values) {
@@ -153,26 +174,34 @@ function gitExec(args, cwd) {
   const subcommand = args[0];
   const hardenedArgs = subcommand === "commit" || subcommand === "tag" ? ["-c", "commit.gpgsign=false", "-c", "tag.gpgsign=false", ...args] : args;
   for (const command of windowsGitCandidates()) {
-    const result = child_process.spawnSync(command, hardenedArgs, {
-      cwd,
-      encoding: "utf-8",
-      timeout: GIT_TIMEOUT_MS,
-      windowsHide: true,
-      maxBuffer: GIT_MAX_BUFFER_BYTES,
-      stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
-    });
-    if (result.error) {
-      if (isGitBinaryMissing(result.error)) {
-        missingGitError ??= result.error;
-        continue;
+    for (let attempt = 0;attempt < MAX_TRANSIENT_RETRIES; attempt++) {
+      const result = child_process.spawnSync(command, hardenedArgs, {
+        cwd,
+        encoding: "utf-8",
+        timeout: GIT_TIMEOUT_MS,
+        windowsHide: true,
+        maxBuffer: GIT_MAX_BUFFER_BYTES,
+        stdio: ["ignore", "pipe", "pipe"],
+        env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
+      });
+      if (!result.error && result.status === 0) {
+        return result.stdout;
+      }
+      if (result.error) {
+        if (isGitBinaryMissing(result.error)) {
+          missingGitError ??= result.error;
+          break;
+        }
+        if (isTransientSpawnError(result.error) && attempt < MAX_TRANSIENT_RETRIES - 1) {
+          transientBackoff(attempt);
+          continue;
+        }
+        throw new Error(errorMessage(result.error));
+      }
+      if (result.status !== 0) {
+        throw new Error(result.stderr || result.stdout || `git exited with ${result.status}`);
       }
-      throw new Error(errorMessage(result.error));
-    }
-    if (result.status !== 0) {
-      throw new Error(result.stderr || result.stdout || `git exited with ${result.status}`);
     }
-    return result.stdout;
   }
   throw new GitBinaryMissingError(process.platform === "win32" ? "git executable is not available on PATH or common Windows install locations" : "git executable is not available on PATH", { cause: missingGitError });
 }
@@ -3859,4 +3888,4 @@ function mergeDurableGateEntriesFromEvidence(taskId, entries, evidence) {
   return merged;
 }
 
-export { PlanSchema, getGitRepositoryStatus, isGitRepo, resetToRemoteBranch, resetToMainAfterMerge, isStateUnreadable, loadEpicSessionState, isEpicModeActive, enableEpicMode, disableEpicMode, normalizePath, pathsConflict, isGlobalFile, isProtectedPath, readTaskScopes, loadSddStatusSync, buildOpenSpecProjectionSync, readEffectiveSpecSync, writeProjectedSpecSync, computeSpecHash, derivePlanId, computePlanHash, initLedger, appendLedgerEvent, loadPlanJsonOnly, loadPlan, savePlan, closePlanTerminalState, derivePlanMarkdown, RetrospectiveEvidenceSchema, isValidEvidenceType, sanitizeTaskId2 as sanitizeTaskId, validateProjectRoot, saveEvidence, loadEvidence, listEvidenceTaskIds, checkRequirementCoverage, archiveEvidence, readDurableGateEvidence, getDurableGateEvidenceStatus, getDurableGateEvidenceStatusForTask, mergeDurableGateEntriesFromEvidence };
+export { PlanSchema, MAX_TRANSIENT_RETRIES, isTransientSpawnError, transientBackoff, getGitRepositoryStatus, isGitRepo, resetToRemoteBranch, resetToMainAfterMerge, isStateUnreadable, loadEpicSessionState, isEpicModeActive, enableEpicMode, disableEpicMode, normalizePath, pathsConflict, isGlobalFile, isProtectedPath, readTaskScopes, loadSddStatusSync, buildOpenSpecProjectionSync, readEffectiveSpecSync, writeProjectedSpecSync, computeSpecHash, derivePlanId, computePlanHash, initLedger, appendLedgerEvent, loadPlanJsonOnly, loadPlan, savePlan, closePlanTerminalState, derivePlanMarkdown, RetrospectiveEvidenceSchema, isValidEvidenceType, sanitizeTaskId2 as sanitizeTaskId, validateProjectRoot, saveEvidence, loadEvidence, listEvidenceTaskIds, checkRequirementCoverage, archiveEvidence, readDurableGateEvidence, getDurableGateEvidenceStatus, getDurableGateEvidenceStatusForTask, mergeDurableGateEntriesFromEvidence };

package/dist/cli/{index-f13d3b69.js → index-f41fa3f0.js}

@@ -12,7 +12,7 @@ import {
   detectPosixWrites,
   detectWindowsWrites,
   resolveWriteTargets
-} from "./index-wv2yj8ka.js";
+} from "./index-6qkwgdsg.js";
 import {
   checkFileAuthority,
   classifyFile,

package/dist/cli/{index-0m44n5qv.js → index-gjdq4na6.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   handleGuardrailExplain
-} from "./index-f13d3b69.js";
+} from "./index-f41fa3f0.js";
 import {
   handleGuardrailLog
 } from "./index-5vpe6vq9.js";
@@ -76,7 +76,7 @@ import {
   handleWriteRetroCommand,
   normalizeSwarmCommandInput,
   resolveCommand
-} from "./index-wv2yj8ka.js";
+} from "./index-6qkwgdsg.js";
 import"./index-5hvbw5xh.js";
 import"./index-yhsmmv2z.js";
 import"./index-s8bj492g.js";
@@ -87,7 +87,7 @@ import {
   ORCHESTRATOR_NAME,
   stripKnownSwarmPrefix
 } from "./index-q9h0wb04.js";
-import"./index-89xjr3h4.js";
+import"./index-8y7qetpg.js";
 import"./index-adz3nk9b.js";
 import"./index-v4fcn4tr.js";
 import"./index-e7h9bb6v.js";

package/dist/cli/index.js

@@ -7,7 +7,7 @@ import {
   getPluginLockFilePaths,
   package_default,
   resolveCommand
-} from "./index-wv2yj8ka.js";
+} from "./index-6qkwgdsg.js";
 import"./index-5hvbw5xh.js";
 import"./index-yhsmmv2z.js";
 import"./index-s8bj492g.js";
@@ -16,7 +16,7 @@ import"./index-1cb4wxnm.js";
 import {
   DEFAULT_AGENT_CONFIGS
 } from "./index-q9h0wb04.js";
-import"./index-89xjr3h4.js";
+import"./index-8y7qetpg.js";
 import"./index-adz3nk9b.js";
 import"./index-v4fcn4tr.js";
 import"./index-e7h9bb6v.js";

package/dist/commands/close.d.ts

@@ -78,12 +78,18 @@ export interface CloseStageContext {
     archivedFileCount: number;
     archivedActiveStateFiles: Set<string>;
     archivedActiveStateDirs: Set<string>;
+    archiveFailureReasons: Map<string, string>;
     timestamp: string;
     archiveDir: string;
     archiveSuffix: string;
     args: string[];
 }
 declare function countSessionKnowledgeEntries(entries: CloseKnowledgeEntry[], sessionStart: string | undefined, fallbackCount: number): number;
+/**
+ * Backward-compatible wrapper that returns only the copied count.
+ * Direct callers (including tests) that expect a number continue to work.
+ * Use copyDirRecursiveWithFailures when per-file failure tracking is needed.
+ */
 declare function copyDirRecursive(src: string, dest: string): Promise<number>;
 /**
  * Guarantee all phases and tasks in a plan are marked complete/closed.

package/dist/git/branch.d.ts

@@ -28,6 +28,11 @@ export type GitRepositoryStatus = {
  *     signing entirely. This is the single source of truth for
  *     non-interactive git, so the hardening covers every caller
  *     (current and future) uniformly.
+ *
+ * Transient retry: transient spawn errors (e.g. ETIMEDOUT) are retried
+ * with exponential backoff up to MAX_TRANSIENT_RETRIES before throwing.
+ * Permanent errors — non-zero exit, missing git binary, non-transient
+ * spawn errors — throw immediately with no retry.
  */
 declare function gitExec(args: string[], cwd: string): string;
 export declare function getGitRepositoryStatus(cwd: string): GitRepositoryStatus;

package/dist/git/pr.d.ts

@@ -1,3 +1,4 @@
+import * as child_process from 'node:child_process';
 export declare const GIT_TIMEOUT_MS = 30000;
 /**
  * Sanitize input string to prevent command injection
@@ -6,8 +7,23 @@ export declare const GIT_TIMEOUT_MS = 30000;
 export declare function sanitizeInput(input: string): string;
 /**
  * Execute gh CLI command
+ *
+ * Follows canonical gitExec safety pattern from branch.ts:
+ * - result.error check before result.status
+ * - maxBuffer to prevent ERR_CHILD_PROCESS_STDIO_MAXBUFFER on large output
+ * - windowsHide: true to prevent console window flash on Windows
+ * - Bounded transient retry for ETIMEDOUT per AGENTS.md invariant 9
  */
 export declare function ghExec(args: string[], cwd: string): string;
+/**
+ * Shared spawnSync wrapper with bounded ETIMEDOUT-only transient retry.
+ *
+ * Mirrors the retry shape from ghExec (invariant 9):
+ * - Up to MAX_TRANSIENT_RETRIES attempts with exponential backoff on ETIMEDOUT
+ * - ENOENT and non-zero exit are thrown immediately (not retried)
+ * - On success, returns the raw spawnSync result transparently
+ */
+declare function spawnSyncWithTransientRetry(command: string, args: string[], options: child_process.SpawnSyncOptions): child_process.SpawnSyncReturns<string>;
 /**
  * Execute gh CLI command asynchronously (non-blocking).
  * Used by background workers that must not block the event loop.
@@ -23,6 +39,7 @@ export declare function ghExecAsync(args: string[], cwd: string): Promise<string
 export declare const _internals: {
     ghExec: typeof ghExec;
     ghExecAsync: typeof ghExecAsync;
+    spawnSyncWithTransientRetry: typeof spawnSyncWithTransientRetry;
 };
 /**
  * Check if gh CLI is available
@@ -106,3 +123,4 @@ export declare function getMergeState(prNumber: number, repoFullName: string, cw
  * Uses async ghExecAsync to avoid blocking the event loop.
  */
 export declare function getPRReviewState(prNumber: number, repoFullName: string, cwd: string): Promise<ReviewStateResult>;
+export {};