@gh-symphony/cli 0.0.18 → 0.0.20

package/dist/{chunk-LZE6YUSB.js → chunk-HZVDTAPS.js}

@@ -26,7 +26,7 @@ import {
   resolveIssueWorkspaceDirectory,
   safeReadDir,
   scheduleRetryAt
-} from "./chunk-OL73UN2X.js";
+} from "./chunk-M3IFVLQS.js";
 
 // ../orchestrator/dist/service.js
 import { mkdir as mkdir3, readFile as readFile3, rm as rm3, writeFile as writeFile3 } from "fs/promises";
@@ -501,6 +501,9 @@ function normalizeProjectItem(projectId, item, lifecycle = DEFAULT_WORKFLOW_LIFE
       state: normalizeBlockerState(node.state, lifecycle)
     }
   ] : []);
+  const issueUpdatedAtMs = parseTimestampMs(item.content.updatedAt);
+  const itemUpdatedAtMs = parseTimestampMs(item.updatedAt);
+  const trackedUpdatedAt = itemUpdatedAtMs !== null && (issueUpdatedAtMs === null || itemUpdatedAtMs > issueUpdatedAtMs) ? item.updatedAt : item.content.updatedAt ?? item.updatedAt;
   return {
     id: item.content.id,
     identifier: `${repository.owner.login}/${repository.name}#${item.content.number}`,
@@ -514,7 +517,7 @@ function normalizeProjectItem(projectId, item, lifecycle = DEFAULT_WORKFLOW_LIFE
     labels: (item.content.labels?.nodes ?? []).flatMap((label) => label?.name ? [label.name.toLowerCase()] : []).sort(),
     blockedBy,
     createdAt: item.content.createdAt,
-    updatedAt: item.content.updatedAt ?? item.updatedAt,
+    updatedAt: trackedUpdatedAt,
     repository: {
       owner: repository.owner.login,
       name: repository.name,
@@ -1381,8 +1384,6 @@ var DEFAULT_POLL_INTERVAL_MS = 3e4;
 var DEFAULT_CONCURRENCY = 3;
 var DEFAULT_RETRY_BACKOFF_MS = 3e4;
 var CONTINUATION_RETRY_DELAY_MS = 1e3;
-var DEFAULT_GLOBAL_MAX_TURNS = 100;
-var DEFAULT_MAX_TOKENS = 256e3;
 var DEFAULT_WORKER_COMMAND = "node packages/worker/dist/index.js";
 var DEFAULT_MAX_NONPRODUCTIVE_TURNS = 3;
 var LOW_RATE_LIMIT_WARNING_THRESHOLD = 0.05;
@@ -1624,7 +1625,7 @@ var OrchestratorService = class {
       const availableSlots = Math.max(0, concurrency - currentlyActive);
       const latestRunsByIssueId = buildLatestRunMapByIssueId(projectRunsAfterReconcile);
       const unscheduledCandidates = actionableCandidates.filter((issue) => {
-        if (hasConvergenceLockedRun(projectRunsAfterReconcile, issue.id, issue.state)) {
+        if (hasConvergenceLockedRun(projectRunsAfterReconcile, issue.id, issue.state, issue.updatedAt)) {
           return false;
         }
         return !issueRecords.some((record) => record.issueId === issue.id && isIssueOrchestrationClaimed(record.state));
@@ -1647,9 +1648,6 @@ var OrchestratorService = class {
         if (await this.isFailureRetrySuppressedIssue(tenant, issue, issueRecords, latestRunsByIssueId.get(issue.id) ?? null)) {
           continue;
         }
-        if (isIssueBudgetExceeded(resolveIssueBudgetSnapshot(projectRunsAfterReconcile, issue.id), now)) {
-          continue;
-        }
         const stateLimit = maxConcurrentByState[issue.state];
         if (stateLimit !== void 0) {
           const activeInState = activeByState.get(issue.state) ?? 0;
@@ -2011,7 +2009,7 @@ var OrchestratorService = class {
     const resolution = await loadRepositoryWorkflow(repositoryDirectory, repository);
     return this.resolveWorkflowResolution(repository, cacheRoot, resolution, changed);
   }
-  async startRun(tenant, issue, resumeContext) {
+  async startRun(tenant, issue) {
     if (this.shuttingDown || !this.running) {
       throw new Error("Orchestrator is shutting down and cannot start new runs.");
     }
@@ -2073,8 +2071,6 @@ var OrchestratorService = class {
     if (!isUsableWorkflowResolution(workflow)) {
       throw new Error(workflow.validationError ?? "Invalid repository WORKFLOW.md");
     }
-    const allProjectRuns = (await this.store.loadAllRuns()).filter((run) => run.projectId === tenant.projectId);
-    const issueBudgetSnapshot = resolveIssueBudgetSnapshot(allProjectRuns, issue.id);
     const promptVariables = buildPromptVariables(issue, {
       attempt: null
       // first execution
@@ -2144,17 +2140,19 @@ var OrchestratorService = class {
         SYMPHONY_THREAD_SANDBOX: workflow.workflow.codex.threadSandbox ?? "",
         SYMPHONY_TURN_SANDBOX_POLICY: workflow.workflow.codex.turnSandboxPolicy ?? "",
         SYMPHONY_MAX_TURNS: String(workflow.workflow.agent.maxTurns),
-        SYMPHONY_GLOBAL_MAX_TURNS: process.env.SYMPHONY_GLOBAL_MAX_TURNS ?? "",
-        SYMPHONY_MAX_TOKENS: process.env.SYMPHONY_MAX_TOKENS ?? "",
         SYMPHONY_MAX_NONPRODUCTIVE_TURNS: process.env.SYMPHONY_MAX_NONPRODUCTIVE_TURNS ?? String(DEFAULT_MAX_NONPRODUCTIVE_TURNS),
-        SYMPHONY_SESSION_TIMEOUT_MS: process.env.SYMPHONY_SESSION_TIMEOUT_MS ?? "",
-        SYMPHONY_RESUME_THREAD_ID: resumeContext?.threadId ?? "",
-        SYMPHONY_CUMULATIVE_TURN_COUNT: String(Math.max(0, resumeContext?.cumulativeTurnCount ?? issueBudgetSnapshot.cumulativeTurnCount)),
-        SYMPHONY_CUMULATIVE_INPUT_TOKENS: String(issueBudgetSnapshot.tokenUsage.inputTokens),
-        SYMPHONY_CUMULATIVE_OUTPUT_TOKENS: String(issueBudgetSnapshot.tokenUsage.outputTokens),
-        SYMPHONY_CUMULATIVE_TOTAL_TOKENS: String(issueBudgetSnapshot.tokenUsage.totalTokens),
-        SYMPHONY_LAST_TURN_SUMMARY: resumeContext?.lastTurnSummary ?? "",
-        SYMPHONY_SESSION_STARTED_AT: issueBudgetSnapshot.sessionStartedAt ?? "",
+        // Clear legacy resume/budget env so fresh worker sessions do not
+        // inherit stale process-level values.
+        SYMPHONY_GLOBAL_MAX_TURNS: "",
+        SYMPHONY_MAX_TOKENS: "",
+        SYMPHONY_SESSION_TIMEOUT_MS: "",
+        SYMPHONY_RESUME_THREAD_ID: "",
+        SYMPHONY_CUMULATIVE_TURN_COUNT: "0",
+        SYMPHONY_CUMULATIVE_INPUT_TOKENS: "0",
+        SYMPHONY_CUMULATIVE_OUTPUT_TOKENS: "0",
+        SYMPHONY_CUMULATIVE_TOTAL_TOKENS: "0",
+        SYMPHONY_LAST_TURN_SUMMARY: "",
+        SYMPHONY_SESSION_STARTED_AT: "",
         SYMPHONY_READ_TIMEOUT_MS: String(workflow.workflow.codex.readTimeoutMs),
         SYMPHONY_TURN_TIMEOUT_MS: String(workflow.workflow.codex.turnTimeoutMs)
       }),
@@ -2399,17 +2397,17 @@ var OrchestratorService = class {
       }
       return this.restartRun(tenant, run, issueRecords, now, workerSessionId);
     }
-    if (workerInfo.exitClassification === "budget-exceeded" || workerInfo.exitClassification === "convergence-detected") {
+    if (workerInfo.exitClassification === "convergence-detected") {
       const completedRun = {
         ...runWithTokens,
-        status: workerInfo.exitClassification === "budget-exceeded" ? "succeeded" : "failed",
+        status: "failed",
         processId: null,
         updatedAt: now.toISOString(),
         completedAt: now.toISOString(),
         nextRetryAt: null,
         retryKind: null,
-        lastError: workerInfo.exitClassification === "budget-exceeded" ? null : runWithTokens.lastError,
-        runPhase: runWithTokens.runPhase ?? (workerInfo.exitClassification === "budget-exceeded" ? "succeeded" : "failed")
+        lastError: runWithTokens.lastError,
+        runPhase: runWithTokens.runPhase ?? "failed"
       };
       await this.store.saveRun(completedRun);
       this.logVerbose(`[run-completed] ${completedRun.runId} status=${completedRun.status}`);
@@ -2746,9 +2744,6 @@ var OrchestratorService = class {
   }
   async resolveRetryRestartAction(tenant, run, trackerDependencies = {}) {
     try {
-      if (isIssueBudgetExceeded(resolveIssueBudgetSnapshot((await this.store.loadAllRuns()).filter((candidate) => candidate.projectId === tenant.projectId), run.issueId), this.now())) {
-        return "release";
-      }
       const eligibleContext = await this.fetchTrackedIssueEligibilityContext(tenant, run.issueIdentifier, trackerDependencies);
       if (!eligibleContext) {
         return "release";
@@ -2860,18 +2855,14 @@ var OrchestratorService = class {
     };
     await this.store.saveRun(supersededRecord);
     const issue = resolveTrackerAdapter2(tenant.tracker).reviveIssue(tenant, run);
-    const restarted = await this.startRun(tenant, issue, {
-      threadId: run.threadId ?? run.runtimeSession?.threadId ?? null,
-      cumulativeTurnCount: resolvePersistedCumulativeTurnCount(run),
-      lastTurnSummary: run.lastTurnSummary ?? null
-    });
+    const restarted = await this.startRun(tenant, issue);
     const recoveredRecord = {
       ...restarted,
       attempt: run.attempt,
       retryKind: run.retryKind ?? "recovery",
       createdAt: run.createdAt,
       issueWorkspaceKey: run.issueWorkspaceKey,
-      threadId: run.threadId ?? run.runtimeSession?.threadId ?? null,
+      threadId: null,
       cumulativeTurnCount: resolvePersistedCumulativeTurnCount(run),
       lastTurnSummary: run.lastTurnSummary ?? null,
       turnCount: 0
@@ -3264,48 +3255,17 @@ function buildRuntimeSession(existing, sessionId, threadId, status, startedAt, u
 function resolvePersistedCumulativeTurnCount(run) {
   return run.cumulativeTurnCount ?? run.turnCount ?? 0;
 }
-function hasConvergenceLockedRun(runs, issueId, issueState) {
+function hasConvergenceLockedRun(runs, issueId, issueState, issueUpdatedAt) {
   const latestRun = runs.filter((run) => run.issueId === issueId).sort((left, right) => new Date(right.updatedAt).getTime() - new Date(left.updatedAt).getTime())[0];
-  return latestRun?.runtimeSession?.exitClassification === "convergence-detected" && latestRun.issueState === issueState;
-}
-function resolveIssueBudgetSnapshot(runs, issueId) {
-  const issueRuns = runs.filter((run) => run.issueId === issueId);
-  const startedAtCandidates = issueRuns.map((run) => run.startedAt).filter((value) => typeof value === "string");
-  return {
-    cumulativeTurnCount: issueRuns.reduce((total, run) => total + resolvePersistedCumulativeTurnCount(run), 0),
-    tokenUsage: issueRuns.reduce((total, run) => ({
-      inputTokens: total.inputTokens + (run.tokenUsage?.inputTokens ?? 0),
-      outputTokens: total.outputTokens + (run.tokenUsage?.outputTokens ?? 0),
-      totalTokens: total.totalTokens + (run.tokenUsage?.totalTokens ?? 0)
-    }), {
-      inputTokens: 0,
-      outputTokens: 0,
-      totalTokens: 0
-    }),
-    sessionStartedAt: startedAtCandidates.sort((left, right) => left.localeCompare(right))[0] ?? null
-  };
-}
-function isIssueBudgetExceeded(snapshot, now, env = process.env) {
-  const globalMaxTurns = parsePositiveInteger(env.SYMPHONY_GLOBAL_MAX_TURNS ?? "") ?? DEFAULT_GLOBAL_MAX_TURNS;
-  if (snapshot.cumulativeTurnCount >= globalMaxTurns) {
-    return true;
-  }
-  const maxTokens = parsePositiveInteger(env.SYMPHONY_MAX_TOKENS ?? "") ?? DEFAULT_MAX_TOKENS;
-  if (snapshot.tokenUsage.totalTokens >= maxTokens) {
-    return true;
-  }
-  const sessionTimeoutMs = parsePositiveInteger(env.SYMPHONY_SESSION_TIMEOUT_MS ?? "");
-  if (sessionTimeoutMs === null || snapshot.sessionStartedAt === null) {
+  if (latestRun?.runtimeSession?.exitClassification !== "convergence-detected" || latestRun.issueState !== issueState) {
     return false;
   }
-  return now.getTime() - new Date(snapshot.sessionStartedAt).getTime() >= sessionTimeoutMs;
-}
-function parsePositiveInteger(value) {
-  const parsed = Number(value);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    return null;
+  const convergedAtMs = parseTimestampMs2(latestRun.completedAt ?? latestRun.updatedAt);
+  const issueUpdatedAtMs = parseTimestampMs2(issueUpdatedAt);
+  if (convergedAtMs === null || issueUpdatedAtMs === null) {
+    return true;
   }
-  return Math.floor(parsed);
+  return issueUpdatedAtMs <= convergedAtMs;
 }
 function resolveCumulativeTurnCount(run, turnCount) {
   const carriedTotal = resolvePersistedCumulativeTurnCount(run);