@harness-engineering/orchestrator 0.2.8 → 0.2.10

package/dist/index.d.mts

@@ -94,7 +94,14 @@ interface OrchestratorState {
     running: Map<string, RunningEntry>;
     claimed: Set<string>;
     retryAttempts: Map<string, RetryEntry>;
-    completed: Set<string>;
+    /**
+     * Tracks completed issue IDs mapped to the epoch-ms timestamp when the
+     * completion was recorded. The timestamp enables a grace-period so that
+     * issues manually re-activated in the roadmap can be re-dispatched, while
+     * still guarding against duplicate dispatch on the tick immediately after
+     * completion (when the tracker write-back may not have persisted yet).
+     */
+    completed: Map<string, number>;
     tokenTotals: TokenTotals;
     rateLimits: RateLimitSnapshot$1;
     /** Running count of claim rejections (another orchestrator won the race). */

package/dist/index.d.ts

@@ -94,7 +94,14 @@ interface OrchestratorState {
     running: Map<string, RunningEntry>;
     claimed: Set<string>;
     retryAttempts: Map<string, RetryEntry>;
-    completed: Set<string>;
+    /**
+     * Tracks completed issue IDs mapped to the epoch-ms timestamp when the
+     * completion was recorded. The timestamp enables a grace-period so that
+     * issues manually re-activated in the roadmap can be re-dispatched, while
+     * still guarding against duplicate dispatch on the tick immediately after
+     * completion (when the tracker write-back may not have persisted yet).
+     */
+    completed: Map<string, number>;
     tokenTotals: TokenTotals;
     rateLimits: RateLimitSnapshot$1;
     /** Running count of claim rejections (another orchestrator won the race). */

package/dist/index.js

@@ -492,7 +492,7 @@ function cloneState(state) {
     running: new Map(state.running),
     claimed: new Set(state.claimed),
     retryAttempts: new Map(state.retryAttempts),
-    completed: new Set(state.completed),
+    completed: new Map(state.completed),
     tokenTotals: { ...state.tokenTotals },
     rateLimits: { ...state.rateLimits }
   };
@@ -591,13 +591,39 @@ function resolveBackend(action, hasLocalBackend) {
 }
 function pruneCompleted(next) {
   if (next.completed.size <= COMPLETED_PRUNE_THRESHOLD) return;
-  for (const id of next.completed) {
+  for (const [id] of next.completed) {
     const hasPending = next.retryAttempts.has(id) || next.running.has(id) || next.claimed.has(id);
     if (!hasPending) {
       next.completed.delete(id);
     }
   }
 }
+var COMPLETED_GRACE_MULTIPLIER = 2;
+function reconcileCompletedAndClaimed(next, candidates, nowMs, effects) {
+  const gracePeriodMs = next.pollIntervalMs * COMPLETED_GRACE_MULTIPLIER;
+  const candidateIds = new Set(candidates.map((c) => c.id));
+  for (const [id, completedAtMs] of next.completed) {
+    if (candidateIds.has(id) && nowMs - completedAtMs > gracePeriodMs) {
+      next.completed.delete(id);
+      effects.push({
+        type: "emitLog",
+        level: "info",
+        message: `Released completed lock for ${id}: reappeared as active candidate after grace period`
+      });
+    }
+  }
+  for (const id of next.claimed) {
+    if (next.running.has(id) || next.retryAttempts.has(id)) continue;
+    if (!candidateIds.has(id)) {
+      next.claimed.delete(id);
+      effects.push({
+        type: "emitLog",
+        level: "info",
+        message: `Released orphaned claim for ${id}: no longer in active candidates`
+      });
+    }
+  }
+}
 function handleTick(state, event, config) {
   const { candidates, runningStates, nowMs } = event;
   const next = cloneState(state);
@@ -610,6 +636,7 @@ function handleTick(state, event, config) {
   );
   effects.push(...reconcileEffects);
   applyReconcileEffects(next, reconcileEffects);
+  reconcileCompletedAndClaimed(next, candidates, nowMs, effects);
   const eligible = selectCandidates(
     candidates,
     next,
@@ -671,7 +698,7 @@ function handleWorkerExit(state, issueId, reason, error, attempt, config) {
   next.running.delete(issueId);
   const nowMs = Date.now();
   if (reason === "normal") {
-    next.completed.add(issueId);
+    next.completed.set(issueId, nowMs);
     next.claimed.delete(issueId);
     effects.push({
       type: "cleanWorkspace",
@@ -948,7 +975,7 @@ function createEmptyState(config) {
     running: /* @__PURE__ */ new Map(),
     claimed: /* @__PURE__ */ new Set(),
     retryAttempts: /* @__PURE__ */ new Map(),
-    completed: /* @__PURE__ */ new Set(),
+    completed: /* @__PURE__ */ new Map(),
     tokenTotals: {
       inputTokens: 0,
       outputTokens: 0,
@@ -1414,7 +1441,7 @@ var WorkflowLoader = class {
       if (parts.length < 3) {
         return (0, import_types3.Err)(
           new Error(
-            `Invalid WORKFLOW.md format at ${filePath}. Expected frontmatter surrounded by '---'.`
+            `Invalid harness.orchestrator.md format at ${filePath}. Expected frontmatter surrounded by '---'.`
           )
         );
       }
@@ -1701,11 +1728,6 @@ var WorkspaceManager = class {
       const workspacePath = path5.resolve(this.resolvePath(identifier));
       try {
         await fs7.access(path5.join(workspacePath, ".git"));
-        return (0, import_types6.Ok)(workspacePath);
-      } catch {
-      }
-      try {
-        await fs7.access(workspacePath);
         const repoRoot2 = await this.getRepoRoot();
         try {
           await this.git(["worktree", "remove", "--force", workspacePath], repoRoot2);
@@ -1713,6 +1735,16 @@ var WorkspaceManager = class {
           await fs7.rm(workspacePath, { recursive: true, force: true });
         }
       } catch {
+        try {
+          await fs7.access(workspacePath);
+          const repoRoot2 = await this.getRepoRoot();
+          try {
+            await this.git(["worktree", "remove", "--force", workspacePath], repoRoot2);
+          } catch {
+            await fs7.rm(workspacePath, { recursive: true, force: true });
+          }
+        } catch {
+        }
       }
       const repoRoot = await this.getRepoRoot();
       await this.tryFetch(repoRoot);
@@ -6678,7 +6710,7 @@ var Orchestrator = class extends import_node_events.EventEmitter {
       claimed: new Set(this.state.claimed),
       running: new Map(this.state.running),
       retryAttempts: new Map(this.state.retryAttempts),
-      completed: new Set(this.state.completed),
+      completed: new Map(this.state.completed),
       recentRequestTimestamps: [...this.state.recentRequestTimestamps],
       recentInputTokens: [...this.state.recentInputTokens],
       recentOutputTokens: [...this.state.recentOutputTokens],
@@ -6786,7 +6818,7 @@ var Orchestrator = class extends import_node_events.EventEmitter {
       running: Array.from(this.state.running.entries()),
       retryAttempts: Array.from(this.state.retryAttempts.entries()),
       claimed: Array.from(this.state.claimed),
-      completed: Array.from(this.state.completed),
+      completed: Array.from(this.state.completed.keys()),
       tokenTotals: { ...this.state.tokenTotals, secondsRunning },
       maxConcurrentAgents: this.state.maxConcurrentAgents,
       globalCooldownUntilMs: this.state.globalCooldownUntilMs,

package/dist/index.mjs

@@ -420,7 +420,7 @@ function cloneState(state) {
     running: new Map(state.running),
     claimed: new Set(state.claimed),
     retryAttempts: new Map(state.retryAttempts),
-    completed: new Set(state.completed),
+    completed: new Map(state.completed),
     tokenTotals: { ...state.tokenTotals },
     rateLimits: { ...state.rateLimits }
   };
@@ -519,13 +519,39 @@ function resolveBackend(action, hasLocalBackend) {
 }
 function pruneCompleted(next) {
   if (next.completed.size <= COMPLETED_PRUNE_THRESHOLD) return;
-  for (const id of next.completed) {
+  for (const [id] of next.completed) {
     const hasPending = next.retryAttempts.has(id) || next.running.has(id) || next.claimed.has(id);
     if (!hasPending) {
       next.completed.delete(id);
     }
   }
 }
+var COMPLETED_GRACE_MULTIPLIER = 2;
+function reconcileCompletedAndClaimed(next, candidates, nowMs, effects) {
+  const gracePeriodMs = next.pollIntervalMs * COMPLETED_GRACE_MULTIPLIER;
+  const candidateIds = new Set(candidates.map((c) => c.id));
+  for (const [id, completedAtMs] of next.completed) {
+    if (candidateIds.has(id) && nowMs - completedAtMs > gracePeriodMs) {
+      next.completed.delete(id);
+      effects.push({
+        type: "emitLog",
+        level: "info",
+        message: `Released completed lock for ${id}: reappeared as active candidate after grace period`
+      });
+    }
+  }
+  for (const id of next.claimed) {
+    if (next.running.has(id) || next.retryAttempts.has(id)) continue;
+    if (!candidateIds.has(id)) {
+      next.claimed.delete(id);
+      effects.push({
+        type: "emitLog",
+        level: "info",
+        message: `Released orphaned claim for ${id}: no longer in active candidates`
+      });
+    }
+  }
+}
 function handleTick(state, event, config) {
   const { candidates, runningStates, nowMs } = event;
   const next = cloneState(state);
@@ -538,6 +564,7 @@ function handleTick(state, event, config) {
   );
   effects.push(...reconcileEffects);
   applyReconcileEffects(next, reconcileEffects);
+  reconcileCompletedAndClaimed(next, candidates, nowMs, effects);
   const eligible = selectCandidates(
     candidates,
     next,
@@ -599,7 +626,7 @@ function handleWorkerExit(state, issueId, reason, error, attempt, config) {
   next.running.delete(issueId);
   const nowMs = Date.now();
   if (reason === "normal") {
-    next.completed.add(issueId);
+    next.completed.set(issueId, nowMs);
     next.claimed.delete(issueId);
     effects.push({
       type: "cleanWorkspace",
@@ -876,7 +903,7 @@ function createEmptyState(config) {
     running: /* @__PURE__ */ new Map(),
     claimed: /* @__PURE__ */ new Set(),
     retryAttempts: /* @__PURE__ */ new Map(),
-    completed: /* @__PURE__ */ new Set(),
+    completed: /* @__PURE__ */ new Map(),
     tokenTotals: {
       inputTokens: 0,
       outputTokens: 0,
@@ -1342,7 +1369,7 @@ var WorkflowLoader = class {
       if (parts.length < 3) {
         return Err2(
           new Error(
-            `Invalid WORKFLOW.md format at ${filePath}. Expected frontmatter surrounded by '---'.`
+            `Invalid harness.orchestrator.md format at ${filePath}. Expected frontmatter surrounded by '---'.`
           )
         );
       }
@@ -1632,11 +1659,6 @@ var WorkspaceManager = class {
       const workspacePath = path5.resolve(this.resolvePath(identifier));
       try {
         await fs7.access(path5.join(workspacePath, ".git"));
-        return Ok6(workspacePath);
-      } catch {
-      }
-      try {
-        await fs7.access(workspacePath);
         const repoRoot2 = await this.getRepoRoot();
         try {
           await this.git(["worktree", "remove", "--force", workspacePath], repoRoot2);
@@ -1644,6 +1666,16 @@ var WorkspaceManager = class {
           await fs7.rm(workspacePath, { recursive: true, force: true });
         }
       } catch {
+        try {
+          await fs7.access(workspacePath);
+          const repoRoot2 = await this.getRepoRoot();
+          try {
+            await this.git(["worktree", "remove", "--force", workspacePath], repoRoot2);
+          } catch {
+            await fs7.rm(workspacePath, { recursive: true, force: true });
+          }
+        } catch {
+        }
       }
       const repoRoot = await this.getRepoRoot();
       await this.tryFetch(repoRoot);
@@ -6647,7 +6679,7 @@ var Orchestrator = class extends EventEmitter {
       claimed: new Set(this.state.claimed),
       running: new Map(this.state.running),
       retryAttempts: new Map(this.state.retryAttempts),
-      completed: new Set(this.state.completed),
+      completed: new Map(this.state.completed),
       recentRequestTimestamps: [...this.state.recentRequestTimestamps],
       recentInputTokens: [...this.state.recentInputTokens],
       recentOutputTokens: [...this.state.recentOutputTokens],
@@ -6755,7 +6787,7 @@ var Orchestrator = class extends EventEmitter {
       running: Array.from(this.state.running.entries()),
       retryAttempts: Array.from(this.state.retryAttempts.entries()),
       claimed: Array.from(this.state.claimed),
-      completed: Array.from(this.state.completed),
+      completed: Array.from(this.state.completed.keys()),
       tokenTotals: { ...this.state.tokenTotals, secondsRunning },
       maxConcurrentAgents: this.state.maxConcurrentAgents,
       globalCooldownUntilMs: this.state.globalCooldownUntilMs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harness-engineering/orchestrator",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Orchestrator daemon for dispatching coding agents to issues",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",