@quantiya/codevibe-claude-plugin 2.0.23 → 2.0.25

package/node_modules/@quantiya/codevibe-core/dist/orchestration-shell/cli.js

@@ -1042,6 +1042,7 @@ __export(cli_exports, {
   CliEntitlementError: () => CliEntitlementError,
   CliUsageError: () => CliUsageError,
   LocalModelPlannerUnavailableAdapter: () => LocalModelPlannerUnavailableAdapter,
+  ORCHESTRATION_ORPHAN_SWEEP_STALE_THRESHOLD_MS: () => ORCHESTRATION_ORPHAN_SWEEP_STALE_THRESHOLD_MS,
   OrchestrationSessionBootstrapError: () => OrchestrationSessionBootstrapError,
   PlannerUnavailableError: () => PlannerUnavailableError,
   bridgeAuthorityErrorToShellRefusal: () => bridgeAuthorityErrorToShellRefusal,
@@ -1067,7 +1068,8 @@ __export(cli_exports, {
   resumeOrCreateSession: () => resumeOrCreateSession2,
   runAuditCli: () => runAuditCli,
   runModelCli: () => runModelCli,
-  runWithAdmittedSessionOwnership: () => runWithAdmittedSessionOwnership
+  runWithAdmittedSessionOwnership: () => runWithAdmittedSessionOwnership,
+  triggerStartupOrphanSweep: () => triggerStartupOrphanSweep
 });
 module.exports = __toCommonJS(cli_exports);
 var import_node_crypto19 = require("node:crypto");
@@ -1173,9 +1175,9 @@ var import_os = __toESM(require("os")), import_path = __toESM(require("path")),
     }
   }
 }, currentConfig = null, configInitialized = !1;
-function getEnvironment() {
-  let env = process.env.ENVIRONMENT;
-  return env === "development" || env === "production" || env === "experiment" ? env : "production";
+function getEnvironment(env = process.env) {
+  let target = env.ENVIRONMENT;
+  return target === "development" || target === "production" || target === "experiment" ? target : "production";
 }
 function loadConfig(environment) {
   let env = environment || getEnvironment();
@@ -4467,6 +4469,18 @@ var RECONNECT_CONFIG = {
 function shouldDeliverSubscribedEvent(event, receiveDesktopEvents) {
   return !!(event.source === "MOBILE" /* MOBILE */ || receiveDesktopEvents && event.source === "DESKTOP" /* DESKTOP */);
 }
+var DEFAULT_HEARTBEAT_INTERVAL_MS = 12e4, MIN_HEARTBEAT_INTERVAL_MS = 1e3, MAX_HEARTBEAT_INTERVAL_MS = 3e5;
+function isRecognizedNonProductionEnvironment(env = process.env) {
+  let canonicalEnv = getEnvironment(env);
+  return canonicalEnv === "development" || canonicalEnv === "experiment";
+}
+function resolveHeartbeatIntervalMs(override, env = process.env) {
+  let candidate;
+  if (override !== void 0 ? candidate = override : isRecognizedNonProductionEnvironment(env) && env.CODEVIBE_HEARTBEAT_INTERVAL_MS !== void 0 && (candidate = env.CODEVIBE_HEARTBEAT_INTERVAL_MS), candidate == null || candidate === "")
+    return DEFAULT_HEARTBEAT_INTERVAL_MS;
+  let num = typeof candidate == "number" ? candidate : Number(candidate);
+  return !Number.isFinite(num) || !Number.isInteger(num) || num < MIN_HEARTBEAT_INTERVAL_MS || num > MAX_HEARTBEAT_INTERVAL_MS ? DEFAULT_HEARTBEAT_INTERVAL_MS : num;
+}
 var AppSyncClient = class _AppSyncClient {
   constructor() {
     this.authenticated = !1;
@@ -7212,14 +7226,14 @@ var AppSyncClient = class _AppSyncClient {
    * Start periodic heartbeat for a session.
    * Updates lastHeartbeatAt on the session every intervalMs (default 2 minutes).
    */
-  startHeartbeat(sessionId, intervalMs = 120 * 1e3) {
-    let existingConfirmation = this.heartbeatInitialPulses.get(sessionId);
+  startHeartbeat(sessionId, intervalMs) {
+    let effectiveIntervalMs = resolveHeartbeatIntervalMs(intervalMs), existingConfirmation = this.heartbeatInitialPulses.get(sessionId);
     if (existingConfirmation) return existingConfirmation;
-    let confirmation = this.startHeartbeatOutcome(sessionId, intervalMs).then((value) => (value === "retired" && this.notifyRetiredSession(sessionId), value === "confirmed"));
+    let confirmation = this.startHeartbeatOutcome(sessionId, effectiveIntervalMs).then((value) => (value === "retired" && this.notifyRetiredSession(sessionId), value === "confirmed"));
     return this.heartbeatInitialPulses.set(sessionId, confirmation), confirmation;
   }
-  startHeartbeatOutcome(sessionId, intervalMs = 120 * 1e3) {
-    let existingToken = this.heartbeatTokens.get(sessionId), existingTimer = this.heartbeatTimers.get(sessionId);
+  startHeartbeatOutcome(sessionId, intervalMs) {
+    let effectiveIntervalMs = resolveHeartbeatIntervalMs(intervalMs), existingToken = this.heartbeatTokens.get(sessionId), existingTimer = this.heartbeatTimers.get(sessionId);
     if (existingToken && existingTimer) {
       let existingOutcome = this.heartbeatInitialOutcomes.get(sessionId);
       if (existingOutcome) return existingOutcome;
@@ -7244,8 +7258,8 @@ var AppSyncClient = class _AppSyncClient {
       ).then((outcome) => {
         outcome === "retired" && this.notifyRetiredSession(sessionId);
       });
-    }, intervalMs);
-    return this.heartbeatTimers.set(sessionId, timer), logger.info("[AppSyncClient] Heartbeat started", { sessionId, intervalMs }), initialHeartbeat;
+    }, effectiveIntervalMs);
+    return this.heartbeatTimers.set(sessionId, timer), logger.info("[AppSyncClient] Heartbeat started", { sessionId, intervalMs: effectiveIntervalMs }), initialHeartbeat;
   }
   /**
    * Stop heartbeat for a session.
@@ -7945,6 +7959,14 @@ function sanitizeForTerminal(input) {
   return out;
 }
 
+// src/ordinal-presentation.ts
+function displayOrdinal(index) {
+  return Number.isSafeInteger(index) && index >= 0 ? String(index + 1) : "?";
+}
+function displaySeatNumber(seatId) {
+  return /^(0|[1-9][0-9]*)$/.test(seatId) ? displayOrdinal(Number(seatId)) : seatId;
+}
+
 // src/reviewer/token-usage.ts
 function finiteToken(n) {
   return tokenFieldAvailable(n) ? n : 0;
@@ -8123,7 +8145,7 @@ function renderProgressLine(event) {
       return "Workspace copy ready \u2014 starting implementor";
     case "implementor_running": {
       let files = typeof event.filesChanged == "number" ? `, ${event.filesChanged} ${event.filesChanged === 1 ? "file" : "files"} changed` : "";
-      return `Implementor working in shadow \u2014 round ${event.round}${files}`;
+      return `Implementor working in shadow \u2014 round ${displayOrdinal(event.round)}${files}`;
     }
     case "diff_captured": {
       let parts = [];
@@ -8132,7 +8154,7 @@ function renderProgressLine(event) {
       return `Diff captured: ${event.files} ${event.files === 1 ? "file" : "files"}${breakdown}`;
     }
     case "submitting_diff":
-      return `Submitting changes for review \u2014 round ${event.round}`;
+      return `Submitting changes for review \u2014 round ${displayOrdinal(event.round)}`;
     case "reviewers_dispatched":
       return `Reviewers dispatched \u2014 ${event.seats} ${event.seats === 1 ? "seat" : "seats"}`;
     case "seat_update":
@@ -8141,10 +8163,10 @@ function renderProgressLine(event) {
       return `Verdicts ${event.received}/${event.expected} received`;
     case "revise_round": {
       let summary = event.feedbackSummary ? ` \u2014 ${event.feedbackSummary}` : "";
-      return `Revise round ${event.round} \u2014 re-running implementor${summary}`;
+      return `Revise round ${displayOrdinal(event.round)} \u2014 re-running implementor${summary}`;
     }
     case "round_failed":
-      return `Implementor round ${event.round} failed \u2014 ${event.reason}`;
+      return `Implementor round ${displayOrdinal(event.round)} failed \u2014 ${event.reason}`;
     case "continuation_offered":
       return `Implementor halted (${event.reason}) \u2014 choose a continuation agent`;
     case "declared_tests_skipped":
@@ -8279,19 +8301,20 @@ function reducer(state, action) {
       return reduceGateSummaryLoaded(state, action.gateId, action.panelModel);
     // ─── CP-12 W3 team-track arms (per PHASE-CP-12-DESIGN.md §3.5) ──────────
     case "TEAM_STARTED":
-      return reduceTeamStarted(state, action.taskGroupId);
+      return reduceTeamStarted(state, action.taskGroupId, action.startedAt);
     case "TEAM_TRACK_ASSIGNED":
       return reduceTeamTrackAssigned(
         state,
         action.trackIndex,
         action.state,
         action.taskId,
-        action.agent
+        action.agent,
+        action.startedAt
       );
     case "TEAM_MERGE_GATE":
       return reduceTeamMergeGate(state, action.status, action.startedAt, action.endedAt);
     case "TEAM_HALTED":
-      return reduceTeamHalted(state, action.haltReason);
+      return reduceTeamHalted(state, action.haltReason, action.completedAt);
     case "TEAM_TRACK_TERMINAL":
       return reduceTeamTrackTerminal(state, action.trackIndex, action.state);
     case "TEAM_TRACK_REVISING":
@@ -8299,7 +8322,7 @@ function reducer(state, action) {
     case "TEAM_TRACK_AWAITING_DECISION":
       return reduceTeamTrackTerminal(state, action.trackIndex, "AwaitingDecision");
     case "TEAM_GROUP_RESOLVED":
-      return reduceTeamGroupResolved(state, action.outcome);
+      return reduceTeamGroupResolved(state, action.outcome, action.completedAt);
     case "TASK_PROGRESS":
       return reduceTaskProgress(
         reduceReviewerStatusLine(
@@ -8410,19 +8433,26 @@ function reduceSessionTaskTerminal(state, event) {
   if (terminal === null) return state;
   let taskId = "taskId" in event ? event.taskId : void 0;
   if (!taskId) return state;
-  let runningTasks = new Map(state.runningTasks), evictedRunningTask = runningTasks.delete(taskId), existing = state.sessionTasks.get(taskId), sessionTasks = new Map(state.sessionTasks);
+  let runningTasks = new Map(state.runningTasks), evictedRunningTask = runningTasks.delete(taskId), existing = state.sessionTasks.get(taskId), sessionTasks = new Map(state.sessionTasks), nextSeq = (state.terminalSequence ?? 0) + 1;
   if (existing) {
     if (existing.origin !== "single" || existing.status !== "running")
       return evictedRunningTask ? { ...state, runningTasks } : state;
-    sessionTasks.set(taskId, { ...existing, status: terminal });
+    sessionTasks.set(taskId, {
+      ...existing,
+      status: terminal,
+      completedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      terminalSeq: nextSeq
+    });
   } else
     sessionTasks.set(taskId, {
       taskId,
       origin: "single",
       status: terminal,
-      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+      startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      completedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      terminalSeq: nextSeq
     });
-  return { ...state, runningTasks, sessionTasks };
+  return { ...state, runningTasks, sessionTasks, terminalSequence: nextSeq };
 }
 var REVIEWER_STATUS_PHASES = /* @__PURE__ */ new Set([
   "reviewers_dispatched",
@@ -8727,14 +8757,21 @@ function reduceClarificationAnswered(state, answer) {
 function reduceTaskLifecycle(state, task) {
   let existing = state.sessionTasks.get(task.taskId), existingIsTerminal = existing?.origin === "single" && (existing.status === "completed" || existing.status === "cancelled" || existing.status === "failed"), incomingIsTerminal = task.status === "completed" || task.status === "cancelled" || task.status === "failed", next = new Map(state.runningTasks);
   incomingIsTerminal || existingIsTerminal && !incomingIsTerminal ? next.delete(task.taskId) : next.set(task.taskId, task);
-  let history = new Map(state.sessionTasks);
+  let history = new Map(state.sessionTasks), nextSeq = incomingIsTerminal ? existing?.terminalSeq ?? (state.terminalSequence ?? 0) + 1 : existing?.terminalSeq, terminalSequence = incomingIsTerminal && !existing?.terminalSeq ? nextSeq : state.terminalSequence;
   return history.set(task.taskId, {
     taskId: task.taskId,
     agentKind: task.agentKind,
     origin: "single",
     status: existingIsTerminal && !incomingIsTerminal ? existing.status : task.status,
-    startedAt: task.startedAt
-  }), { ...state, runningTasks: next, sessionTasks: history };
+    startedAt: task.startedAt,
+    completedAt: incomingIsTerminal ? task.completedAt ?? existing?.completedAt ?? task.startedAt : existing?.completedAt,
+    ...nextSeq !== void 0 ? { terminalSeq: nextSeq } : {}
+  }), {
+    ...state,
+    runningTasks: next,
+    sessionTasks: history,
+    ...terminalSequence !== void 0 ? { terminalSequence } : {}
+  };
 }
 function findUnfinalizedGatePromptIndex(state, taskId) {
   for (let i = 0; i < state.conversation.length; i++) {
@@ -9059,28 +9096,38 @@ function reduceGateSummaryLoaded(state, gateId, panelModel) {
   ], attached = { ...state, conversation: nextConversation };
   return isFirstLoad && panelModel.rounds.length > 0 ? appendConversation(attached, makeGateSummaryPanel(panelModel)) : attached;
 }
-function reduceTeamStarted(state, taskGroupId) {
+function reduceTeamStarted(state, taskGroupId, startedAt) {
   if (state.team) {
     if (state.team.taskGroupId === taskGroupId)
       return state;
     if (state.team.taskGroupId === "")
-      return { ...state, team: { ...state.team, taskGroupId } };
+      return {
+        ...state,
+        team: {
+          ...state.team,
+          taskGroupId,
+          startedAt: state.team.startedAt ?? startedAt ?? (/* @__PURE__ */ new Date()).toISOString()
+        }
+      };
   }
-  return { ...state, team: {
+  let team = {
     taskGroupId,
     tracks: /* @__PURE__ */ new Map(),
     mergeGate: "none",
     haltReason: null,
-    groupResolved: !1
-  } };
+    groupResolved: !1,
+    startedAt: startedAt ?? (/* @__PURE__ */ new Date()).toISOString()
+  };
+  return { ...state, team };
 }
-function reduceTeamTrackAssigned(state, trackIndex, trackState, taskId, agent) {
+function reduceTeamTrackAssigned(state, trackIndex, trackState, taskId, agent, startedAt) {
   let base = state.team ?? {
     taskGroupId: "",
     tracks: /* @__PURE__ */ new Map(),
     mergeGate: "none",
     haltReason: null,
-    groupResolved: !1
+    groupResolved: !1,
+    startedAt: startedAt ?? (/* @__PURE__ */ new Date()).toISOString()
   }, tracks = new Map(base.tracks), prior = tracks.get(trackIndex), merged = {
     state: trackState,
     // Preserve a prior taskId/agent when the new event omits them.
@@ -9091,12 +9138,16 @@ function reduceTeamTrackAssigned(state, trackIndex, trackState, taskId, agent) {
   let sessionTasks = state.sessionTasks;
   if (merged.taskId) {
     let existing = state.sessionTasks.get(merged.taskId);
-    sessionTasks = new Map(state.sessionTasks), sessionTasks.set(merged.taskId, {
+    sessionTasks = new Map(state.sessionTasks);
+    let isTerminal = trackState === "Passed" || trackState === "Failed";
+    sessionTasks.set(merged.taskId, {
       taskId: merged.taskId,
       agentKind: merged.agent ?? existing?.agentKind,
       origin: "team",
       status: trackState,
-      startedAt: existing?.startedAt ?? (/* @__PURE__ */ new Date()).toISOString()
+      startedAt: existing?.startedAt ?? startedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+      completedAt: isTerminal ? existing?.completedAt : void 0,
+      ...isTerminal && existing?.terminalSeq !== void 0 ? { terminalSeq: existing.terminalSeq } : {}
     });
   }
   return { ...state, team: { ...base, tracks }, sessionTasks };
@@ -9132,12 +9183,19 @@ function reduceTeamMergeGate(state, status, startedAt, endedAt) {
   let elapsed = team.mergeGateElapsedMs ?? mergeGateElapsed(team.mergeGateStartedAt, endedAt);
   return { ...state, team: { ...team, mergeGate: status, mergeGateElapsedMs: elapsed } };
 }
-function reduceTeamHalted(state, haltReason) {
+function reduceTeamHalted(state, haltReason, completedAt) {
   if (!state.team) return state;
-  let t = state.team, frozen = t.mergeGateStartedAt != null && t.mergeGateElapsedMs == null ? mergeGateElapsed(t.mergeGateStartedAt, (/* @__PURE__ */ new Date()).toISOString()) : t.mergeGateElapsedMs;
+  let t = state.team, frozen = t.mergeGateStartedAt != null && t.mergeGateElapsedMs == null ? mergeGateElapsed(t.mergeGateStartedAt, (/* @__PURE__ */ new Date()).toISOString()) : t.mergeGateElapsedMs, nextSeq = (state.terminalSequence ?? 0) + 1;
   return {
     ...state,
-    team: { ...t, haltReason, mergeGateElapsedMs: frozen },
+    team: {
+      ...t,
+      haltReason,
+      mergeGateElapsedMs: frozen,
+      completedAt: completedAt ?? t.completedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+      terminalSeq: nextSeq
+    },
+    terminalSequence: nextSeq,
     lastReviewerProgress: null
   };
 }
@@ -9147,15 +9205,37 @@ function reduceTeamTrackTerminal(state, trackIndex, trackState) {
   if (!prior || prior.state === trackState) return state;
   let tracks = new Map(state.team.tracks);
   tracks.set(trackIndex, { ...prior, state: trackState });
-  let sessionTasks = state.sessionTasks, record = prior.taskId ? state.sessionTasks.get(prior.taskId) : void 0;
-  return prior.taskId && record && (sessionTasks = new Map(state.sessionTasks), sessionTasks.set(prior.taskId, { ...record, status: trackState })), { ...state, team: { ...state.team, tracks }, sessionTasks };
+  let sessionTasks = state.sessionTasks, record = prior.taskId ? state.sessionTasks.get(prior.taskId) : void 0, terminalSequence = state.terminalSequence;
+  if (prior.taskId && record) {
+    let isTerminal = trackState === "Passed" || trackState === "Failed", nextSeq = isTerminal ? record.terminalSeq ?? (state.terminalSequence ?? 0) + 1 : void 0;
+    isTerminal && !record.terminalSeq && (terminalSequence = nextSeq), sessionTasks = new Map(state.sessionTasks), sessionTasks.set(prior.taskId, {
+      ...record,
+      status: trackState,
+      completedAt: isTerminal ? record.completedAt ?? (/* @__PURE__ */ new Date()).toISOString() : void 0,
+      ...isTerminal && nextSeq !== void 0 ? { terminalSeq: nextSeq } : {}
+    });
+  }
+  return {
+    ...state,
+    team: { ...state.team, tracks },
+    sessionTasks,
+    ...terminalSequence !== void 0 ? { terminalSequence } : {}
+  };
 }
-function reduceTeamGroupResolved(state, outcome) {
+function reduceTeamGroupResolved(state, outcome, completedAt) {
   if (!state.team || state.team.groupResolved && state.team.outcome === outcome) return state;
-  let t = state.team, frozen = t.mergeGateStartedAt != null && t.mergeGateElapsedMs == null ? mergeGateElapsed(t.mergeGateStartedAt, (/* @__PURE__ */ new Date()).toISOString()) : t.mergeGateElapsedMs;
+  let t = state.team, frozen = t.mergeGateStartedAt != null && t.mergeGateElapsedMs == null ? mergeGateElapsed(t.mergeGateStartedAt, (/* @__PURE__ */ new Date()).toISOString()) : t.mergeGateElapsedMs, nextSeq = (state.terminalSequence ?? 0) + 1;
   return {
     ...state,
-    team: { ...t, groupResolved: !0, outcome, mergeGateElapsedMs: frozen },
+    team: {
+      ...t,
+      groupResolved: !0,
+      outcome,
+      mergeGateElapsedMs: frozen,
+      completedAt: completedAt ?? t.completedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+      terminalSeq: nextSeq
+    },
+    terminalSequence: nextSeq,
     lastReviewerProgress: null
   };
 }
@@ -9441,7 +9521,7 @@ function ReviewerQuorumStatusNode(props) {
         React5.createElement(
           Text,
           null,
-          `${seat.seatId} ${seat.reviewerKind.padEnd(7)} `
+          `${displaySeatNumber(seat.seatId)} ${seat.reviewerKind.padEnd(7)} `
         ),
         React5.createElement(Text, { color: STATUS_COLOR[seat.status] }, STATUS_GLYPH[seat.status]),
         React5.createElement(Text, null, ` ${seat.status}`)
@@ -9819,7 +9899,7 @@ function buildPerSeatTruncationHint(findingsTruncated, truncatedFindingCount) {
   return truncatedFindingCount > 0 ? `(${truncatedFindingCount} more \u2014 ${PER_SEAT_AUDIT_BROWSER_HINT})` : findingsTruncated ? `(more \u2014 ${PER_SEAT_AUDIT_BROWSER_HINT})` : null;
 }
 function buildGateDetailsPanelModel(envelope) {
-  let headline = envelope.summary ?? null, reason = formatHaltReason(envelope.reason), reasonLabel = reason?.label ?? null, reasonExplanation = reason?.explanation ?? null, roundLabel = `Round ${envelope.currentRound}`, timeline = (envelope.timeline ?? []).map((t) => ({
+  let headline = envelope.summary ?? null, reason = formatHaltReason(envelope.reason), reasonLabel = reason?.label ?? null, reasonExplanation = reason?.explanation ?? null, roundLabel = `Round ${displayOrdinal(envelope.currentRound)}`, timeline = (envelope.timeline ?? []).map((t) => ({
     kind: t.kind,
     at: t.at
   })), elapsedSeconds = computeElapsedSeconds(envelope.timeline), history = envelope.roundHistory ?? [], cascade = history.length > 1 ? history.map((h) => ({
@@ -9837,7 +9917,7 @@ function buildGateDetailsPanelModel(envelope) {
       seatId: seat.seatId,
       role: seat.role,
       reviewerAgent: seat.reviewerAgent,
-      header: `Reviewer ${seat.seatId} (${seat.role}, ${seat.reviewerAgent}): ${formatDecision(
+      header: `Reviewer ${displayOrdinal(seat.seatId)} (${seat.role}, ${seat.reviewerAgent}): ${formatDecision(
         seat.decision
       )}`,
       findings: seat.findings,
@@ -9933,7 +10013,7 @@ function buildReviewSummaryPanelModel(summary) {
         seatId,
         role,
         agent,
-        header: `Reviewer ${seatId} (${role}, ${agent}): ${formatDecision(decision)}`,
+        header: `Reviewer ${displayOrdinal(seatId)} (${role}, ${agent}): ${formatDecision(decision)}`,
         decisionLabel: formatDecision(decision),
         reasoning,
         suggestedChanges
@@ -9941,7 +10021,7 @@ function buildReviewSummaryPanelModel(summary) {
     }
     rounds.push({
       round,
-      roundLabel: `Round ${round}`,
+      roundLabel: `Round ${displayOrdinal(round)}`,
       proposal,
       reviewers,
       outcome,
@@ -10216,7 +10296,7 @@ function GateContextPanel(props) {
         React10.createElement(
           Text,
           { dimColor: !0 },
-          `Round ${c.round}: ${c.reasonLabel}`
+          `Round ${displayOrdinal(c.round)}: ${c.reasonLabel}`
         )
       )
     );
@@ -10423,7 +10503,7 @@ function renderReviewSummarySection(reviewSummary) {
         )
       );
       for (let [index, usage] of terminal.tokenUsage.invocations.entries()) {
-        let locator = usage.role === "reviewer" ? `r${usage.round ?? "?"} seat ${usage.seatId ?? "?"}` : usage.round !== null ? `r${usage.round}` : usage.role, usageBreakdown = [
+        let locator = usage.role === "reviewer" ? `r${usage.round == null ? "?" : displayOrdinal(usage.round)} seat ${usage.seatId == null ? "?" : displayOrdinal(usage.seatId)}` : usage.round !== null ? `r${displayOrdinal(usage.round)}` : usage.role, usageBreakdown = [
           usage.inputTokens !== null ? `${usage.inputTokens.toLocaleString()} input` : null,
           usage.outputTokens !== null ? `${usage.outputTokens.toLocaleString()} output` : null,
           usage.cachedInputTokens !== null ? `cached ${usage.cachedInputTokens.toLocaleString()}` : null
@@ -17859,7 +17939,7 @@ function renderEntryAsLine(entry) {
     case "subagent-event":
       return `  \u23BF [${entry.role}] ${entry.event.kind === "NOTIFICATION" && "payload" in entry.event && typeof entry.event.payload.message == "string" ? entry.event.payload.message : entry.event.kind}`;
     case "reviewer-status-node": {
-      let seatLines = entry.seats.map((s) => `${s.seatId} ${s.reviewerKind} ${s.status}`).join(", ");
+      let seatLines = entry.seats.map((s) => `${displaySeatNumber(s.seatId)} ${s.reviewerKind} ${s.status}`).join(", ");
       return `[quorum ${entry.quorumStatus}] ${seatLines}`;
     }
     case "gate-status-node":
@@ -24679,7 +24759,7 @@ function buildReviewerVerdictModel(payload) {
   let decisionRaw = asString(verdict.verdict);
   if (decisionRaw === null) return null;
   let decisionLabel = decisionCopy[decisionRaw] ?? decisionRaw, parts = [], seatId = payload.seat_id ?? payload.seatId, role = asString(payload.role), agent = asString(payload.reviewer_agent) ?? asString(payload.reviewerAgent);
-  typeof seatId == "number" && parts.push(`Seat ${seatId}`), role && parts.push(role), agent && parts.push(agent);
+  typeof seatId == "number" && parts.push(`Seat ${displayOrdinal(seatId)}`), role && parts.push(role), agent && parts.push(agent);
   let provenance = parts.length > 0 ? parts.join(" \xB7 ") : null, reasoning = asString(verdict.reasoning), sugRaw = verdict.suggested_changes ?? verdict.suggestedChanges, suggestedChanges = Array.isArray(sugRaw) ? sugRaw.filter((s) => typeof s == "string") : [];
   return { decisionLabel, provenance, reasoning, suggestedChanges };
 }
@@ -44273,7 +44353,8 @@ var LocalExecutorImpl = class {
         metadata: {
           source: "team_group_resolved",
           task_group_id: taskGroupId,
-          outcome
+          outcome,
+          completed_at: (/* @__PURE__ */ new Date()).toISOString()
         }
       }),
       "team_group_resolved"
@@ -52508,7 +52589,16 @@ var QuorumLoop = class _QuorumLoop {
    * first promote/discard.
    */
   getLastWorkspaceOutcome() {
-    return this.lastWorkspaceOutcome === null ? null : this.lastWorkspaceOutcome.kind === "promoted" ? { kind: "promoted", files: [...this.lastWorkspaceOutcome.files] } : { kind: "discarded" };
+    return this.lastWorkspaceOutcome === null ? null : this.lastWorkspaceOutcome.kind === "promoted" ? {
+      kind: "promoted",
+      files: [...this.lastWorkspaceOutcome.files],
+      taskId: this.lastWorkspaceOutcome.taskId,
+      completedAt: this.lastWorkspaceOutcome.completedAt
+    } : {
+      kind: "discarded",
+      taskId: this.lastWorkspaceOutcome.taskId,
+      completedAt: this.lastWorkspaceOutcome.completedAt
+    };
   }
   /**
    * Session-owned Class-B ingress. The subscription calls this wrapper instead
@@ -54139,7 +54229,11 @@ var QuorumLoop = class _QuorumLoop {
         err: err.message
       });
     } finally {
-      discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && terminalDiscard && this.terminallyRetiredWorkspaceTasks.add(taskId), this.lastWorkspaceOutcome = { kind: "discarded" }, this.emitProgress(
+      discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && terminalDiscard && this.terminallyRetiredWorkspaceTasks.add(taskId), terminalDiscard && opts?.taskContinues !== !0 && (this.lastWorkspaceOutcome = {
+        kind: "discarded",
+        taskId,
+        completedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }), this.emitProgress(
         {
           phase: "discarded",
           ...terminalDiscard && opts?.taskContinues !== !0 ? { taskId } : {}
@@ -54248,7 +54342,11 @@ var QuorumLoop = class _QuorumLoop {
           err: discardErr.message
         });
       }
-      discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && this.terminallyRetiredWorkspaceTasks.add(taskId), this.lastWorkspaceOutcome = { kind: "discarded" }, this.emitProgress({ phase: "discarded", taskId }, originEpoch), discarded && terminalOutcomeReserved && await this.workspaceOutcomeSink.completeTask(taskId, "apply_failed");
+      discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && this.terminallyRetiredWorkspaceTasks.add(taskId), this.lastWorkspaceOutcome = {
+        kind: "discarded",
+        taskId,
+        completedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }, this.emitProgress({ phase: "discarded", taskId }, originEpoch), discarded && terminalOutcomeReserved && await this.workspaceOutcomeSink.completeTask(taskId, "apply_failed");
       return;
     }
     if (this.teamRunIsHalted(teamAuthority)) return;
@@ -54282,7 +54380,11 @@ var QuorumLoop = class _QuorumLoop {
           err: discardErr.message
         });
       }
-      discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && this.terminallyRetiredWorkspaceTasks.add(taskId), this.reviewedSnapshotByTask.delete(taskId), this.lastWorkspaceOutcome = { kind: "discarded" }, this.emitProgress({ phase: "discarded", taskId }, originEpoch), discarded && terminalOutcomeReserved && await this.workspaceOutcomeSink.completeTask(taskId, "apply_failed");
+      discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && this.terminallyRetiredWorkspaceTasks.add(taskId), this.reviewedSnapshotByTask.delete(taskId), this.lastWorkspaceOutcome = {
+        kind: "discarded",
+        taskId,
+        completedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }, this.emitProgress({ phase: "discarded", taskId }, originEpoch), discarded && terminalOutcomeReserved && await this.workspaceOutcomeSink.completeTask(taskId, "apply_failed");
       return;
     }
     this.reviewedSnapshotByTask.set(taskId, reviewedSnapshot);
@@ -54312,7 +54414,11 @@ var QuorumLoop = class _QuorumLoop {
             err: discardErr.message
           });
         }
-        discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && this.terminallyRetiredWorkspaceTasks.add(taskId), this.lastWorkspaceOutcome = { kind: "discarded" }, this.emitProgress({ phase: "discarded", taskId }, originEpoch), discarded && terminalOutcomeReserved && await this.workspaceOutcomeSink.completeTask(taskId, "apply_failed");
+        discarded && this.shadowsByTask.get(taskId) === shadow && this.shadowsByTask.delete(taskId), discarded && this.terminallyRetiredWorkspaceTasks.add(taskId), this.lastWorkspaceOutcome = {
+          kind: "discarded",
+          taskId,
+          completedAt: (/* @__PURE__ */ new Date()).toISOString()
+        }, this.emitProgress({ phase: "discarded", taskId }, originEpoch), discarded && terminalOutcomeReserved && await this.workspaceOutcomeSink.completeTask(taskId, "apply_failed");
         return;
       }
     }
@@ -54467,7 +54573,12 @@ var QuorumLoop = class _QuorumLoop {
     }), logger.info("[QuorumLoop] shadow promoted to real tree", {
       taskId,
       promoted: appliedPaths.length
-    }), this.lastWorkspaceOutcome = { kind: "promoted", files: [...appliedPaths] }, appendContextItem(this.deps.session.sessionId, {
+    }), this.lastWorkspaceOutcome = {
+      kind: "promoted",
+      files: [...appliedPaths],
+      taskId,
+      completedAt: (/* @__PURE__ */ new Date()).toISOString()
+    }, appendContextItem(this.deps.session.sessionId, {
       kind: "verdict",
       author: { role: "engine" },
       sensitivity: "user",
@@ -57142,7 +57253,7 @@ function seatKey(gateId, seatId) {
   return `${gateId}::${seatId}`;
 }
 function seatLabel(agentKind, seatId) {
-  return `${REVIEWER_AGENT_DISPLAY_NAME[agentKind] ?? agentKind} (seat ${seatId})`;
+  return `${REVIEWER_AGENT_DISPLAY_NAME[agentKind] ?? agentKind} (seat ${displayOrdinal(seatId)})`;
 }
 function diffCapturedProgress(round, files) {
   let created = 0, modified = 0, deleted = 0;
@@ -58110,7 +58221,7 @@ async function runOrchestrationShell(args) {
     });
   }
   workspaceTerminalCoordinator && await workspaceTerminalCoordinator.replayPending(), processMarkers();
-  let unsubscribeEvents = null, pendingDurableResolutions = /* @__PURE__ */ new Map(), durableDecisionEffectDispatcher = null, dispatchDurableDecisionEffect = async (resolution) => {
+  let inkUnmount = null, nonTtyAbort = null, explicitExit = null, sessionRetiredExitRequested = !1, triggerSessionRetiredTeardown = null, unsubscribeEvents = null, pendingDurableResolutions = /* @__PURE__ */ new Map(), durableDecisionEffectDispatcher = null, dispatchDurableDecisionEffect = async (resolution) => {
     if (!durableDecisionEffectDispatcher) {
       pendingDurableResolutions.set(resolution.eventId, resolution);
       return;
@@ -58246,6 +58357,16 @@ async function runOrchestrationShell(args) {
               text: "Gate history recovery is unavailable. Existing gate actions remain fail-closed until recovery succeeds."
             })) : rejectInitialSubscription(error);
           });
+        },
+        onSessionRetired: () => {
+          logger.warn(
+            "[orchestration-shell] Session permanently retired on backend; triggering fail-closed teardown",
+            { sessionId: args.session.sessionId }
+          ), store.dispatch({
+            type: "SHELL_ADVISORY",
+            source: "shell",
+            text: "Hosted session has been retired. Exiting orchestration shell."
+          }), triggerSessionRetiredTeardown ? triggerSessionRetiredTeardown() : sessionRetiredExitRequested = !0;
         }
       }
     );
@@ -58488,7 +58609,7 @@ async function runOrchestrationShell(args) {
       if (admitted.length === 0) return;
       await Promise.allSettled(admitted);
     }
-  }, NORMAL_SHUTDOWN_TIMEOUT_MS = 1e4, SIGNAL_SHUTDOWN_TIMEOUT_MS = 3e3, SESSION_RETIRE_TIMEOUT_MS2 = 3e3, hostedSessionIngressFenced = !1, hostedSessionIngressFenceFailures = [], hostedSessionIngressFenceDrain = Promise.resolve(), shutdownFailure = (message, reason) => Object.assign(
+  }, NORMAL_SHUTDOWN_TIMEOUT_MS = 1e4, SIGNAL_SHUTDOWN_TIMEOUT_MS = 3e3, SESSION_RETIRE_TIMEOUT_MS2 = 3e3, hostedSessionIngressFenced = !1, hostedRetirementMutationStarted = !1, lastDitchRetirementPromise = null, hostedSessionIngressFenceFailures = [], hostedSessionIngressFenceDrain = Promise.resolve(), shutdownFailure = (message, reason) => Object.assign(
     new Error(
       `${message}: ${reason instanceof Error ? reason.message : String(reason)}`
     ),
@@ -58559,7 +58680,7 @@ async function runOrchestrationShell(args) {
         shutdownFailure("session heartbeat stop failed", reason)
       );
     }
-  }, hostedRetirementMutationStarted = !1, retireHostedSession = async () => {
+  }, retireHostedSession = async () => {
     await hostedSessionIngressFenceDrain;
     let failures = [...hostedSessionIngressFenceFailures];
     try {
@@ -58596,11 +58717,11 @@ async function runOrchestrationShell(args) {
         new Error("final ContextItems publication did not converge"),
         { causes: failures }
       );
-  }, workspaceResourceRetirement = null, plannerTeardown = createBoundedSharedShutdownOperation({
+  }, workspaceResourceRetirement = null, teardownDeadlineExpired = !1, plannerTeardown = createBoundedSharedShutdownOperation({
     normalTimeoutMs: NORMAL_SHUTDOWN_TIMEOUT_MS,
     signalTimeoutMs: SIGNAL_SHUTDOWN_TIMEOUT_MS,
     onTimeout: (deadlineClass, timeoutMs) => {
-      logger.warn("[orchestration-shell] planner teardown timed out", {
+      teardownDeadlineExpired = !0, logger.warn("[orchestration-shell] planner teardown timed out", {
         deadlineClass,
         timeoutMs
       });
@@ -58667,47 +58788,75 @@ async function runOrchestrationShell(args) {
       });
     }
   }), runPlannerTeardown = async (deadlineClass = "normal") => {
-    let boundedCompletion = plannerTeardown.wait(deadlineClass);
-    if (deadlineClass === "signal") return boundedCompletion;
-    let requiredRetirement = workspaceResourceRetirement;
+    let boundedCompletion = plannerTeardown.wait(deadlineClass), requiredRetirement = workspaceResourceRetirement;
     if (!requiredRetirement)
       throw new Error("workspace retirement boundary was not published");
     let [boundedResult] = await Promise.allSettled([boundedCompletion]);
-    if (boundedResult.status === "rejected" && boundedResult.reason?.teardownDeadlineExpired === !0 && // The leak scenario is a hung EARLIER phase starving `retireHostedSession`
+    if ((teardownDeadlineExpired || boundedResult.status === "rejected" && boundedResult.reason?.teardownDeadlineExpired === !0) && // The leak scenario is a hung EARLIER phase starving `retireHostedSession`
     // before it could issue its mutation. If the ordered mutation already
     // started (in flight when the deadline expired, or settled with the
     // deadline expiring on a parallel phase such as the planner flush), the
     // last-ditch duplicate is redundant — skip it.
-    !hostedRetirementMutationStarted) {
-      let timer;
-      try {
-        await Promise.race([
-          args.appsyncClient.updateSession({
-            sessionId: args.session.sessionId,
-            status: "INACTIVE" /* INACTIVE */
-          }).then(() => {
-            logger.warn(
-              "[orchestration-shell] last-ditch session retirement landed after teardown timeout",
-              { sessionId: args.session.sessionId }
-            );
-          }).catch((reason) => {
-            logger.warn("[orchestration-shell] last-ditch session retirement failed", {
-              sessionId: args.session.sessionId,
-              errorName: reason?.name ?? "Error"
-            });
-          }),
-          new Promise((resolve21) => {
-            timer = setTimeout(resolve21, SESSION_RETIRE_TIMEOUT_MS2), timer.unref?.();
-          })
-        ]);
-      } finally {
-        timer && clearTimeout(timer);
+    !hostedRetirementMutationStarted)
+      if (lastDitchRetirementPromise)
+        await lastDitchRetirementPromise;
+      else {
+        let timer;
+        lastDitchRetirementPromise = (async () => {
+          try {
+            await Promise.race([
+              args.appsyncClient.updateSession({
+                sessionId: args.session.sessionId,
+                status: "INACTIVE" /* INACTIVE */
+              }).then(() => {
+                logger.warn(
+                  "[orchestration-shell] last-ditch session retirement landed after teardown timeout",
+                  { sessionId: args.session.sessionId }
+                );
+              }).catch((reason) => {
+                logger.warn("[orchestration-shell] last-ditch session retirement failed", {
+                  sessionId: args.session.sessionId,
+                  errorName: reason?.name ?? "Error"
+                });
+              }),
+              new Promise((resolve21) => {
+                timer = setTimeout(resolve21, SESSION_RETIRE_TIMEOUT_MS2), timer.unref?.();
+              })
+            ]);
+          } finally {
+            timer && clearTimeout(timer);
+          }
+        })(), await lastDitchRetirementPromise;
       }
-    }
-    let [retirementResult] = await Promise.allSettled([requiredRetirement]);
+    let [retirementResult] = await Promise.allSettled(
+      deadlineClass === "signal" && teardownDeadlineExpired ? [] : [requiredRetirement]
+    );
     if (boundedResult.status === "rejected") throw boundedResult.reason;
-    if (retirementResult.status === "rejected") throw retirementResult.reason;
-  }, inkUnmount = null, nonTtyAbort = null, signalShutdownStarted = !1, signalShutdownCompletion = null, signalsRegistered = /* @__PURE__ */ new Set(), onSignal = (sig) => {
+    if (retirementResult && retirementResult.status === "rejected") throw retirementResult.reason;
+  };
+  triggerSessionRetiredTeardown = () => {
+    if (sessionRetiredExitRequested = !0, nonTtyAbort)
+      try {
+        nonTtyAbort.abort();
+      } catch {
+      }
+    if (explicitExit)
+      try {
+        explicitExit.start();
+      } catch {
+      }
+    else if (inkUnmount)
+      try {
+        inkUnmount(), inkUnmount = null;
+      } catch {
+      }
+    runPlannerTeardown("normal").catch((err) => {
+      logger.warn("[orchestration-shell] session-retired teardown failed", {
+        error: err instanceof Error ? err.message : String(err)
+      });
+    });
+  }, sessionRetiredExitRequested && triggerSessionRetiredTeardown();
+  let signalShutdownStarted = !1, signalShutdownCompletion = null, signalsRegistered = /* @__PURE__ */ new Set(), onSignal = (sig) => {
     signalShutdownCompletion || (signalShutdownStarted = !0, disableBracketedPaste(), signalShutdownCompletion = Promise.allSettled([runPlannerTeardown("signal")]).then(() => {
     }).finally(() => {
       logger.info(`[orchestration-shell] caught ${sig}, teardown complete`);
@@ -58726,7 +58875,7 @@ async function runOrchestrationShell(args) {
       try {
         process.kill(process.pid, sig);
       } catch {
-        let code = sig === "SIGTERM" ? 143 : 130;
+        let code = sig === "SIGTERM" ? 143 : sig === "SIGHUP" ? 129 : 130;
         process.exit(code);
       }
     }));
@@ -58938,14 +59087,19 @@ async function runOrchestrationShell(args) {
     // land in the active conversation. ABSENT on a non-team session.
     ...args.groupDecisionDeps ? { groupDecision: { ...args.groupDecisionDeps, store } } : {}
   };
-  mobileGateDecisionDeps = gateDecisionDeps, process.once("SIGINT", onSignal), signalsRegistered.add("SIGINT"), process.once("SIGTERM", onSignal), signalsRegistered.add("SIGTERM");
+  mobileGateDecisionDeps = gateDecisionDeps, process.on("SIGINT", onSignal), signalsRegistered.add("SIGINT"), process.on("SIGTERM", onSignal), signalsRegistered.add("SIGTERM"), process.on("SIGHUP", onSignal), signalsRegistered.add("SIGHUP");
   try {
     if (signalShutdownCompletion) {
       await signalShutdownCompletion;
       return;
     }
+    if (sessionRetiredExitRequested)
+      return;
     if (args.acceptSessionLifecycleOwnership?.(), !isInteractiveTty()) {
-      nonTtyAbort = new AbortController();
+      if (nonTtyAbort = new AbortController(), sessionRetiredExitRequested) {
+        nonTtyAbort = null;
+        return;
+      }
       try {
         await runLineLogFallback({
           store,
@@ -58973,6 +59127,8 @@ async function runOrchestrationShell(args) {
       await signalShutdownCompletion;
       return;
     }
+    if (sessionRetiredExitRequested)
+      return;
     let { ink } = getInkRuntime(), { waitUntilExit, unmount } = ink.render(
       React20.createElement(OrchestrationApp, {
         store,
@@ -59023,19 +59179,21 @@ async function runOrchestrationShell(args) {
       { stdout: process.stdout }
     );
     inkUnmount = unmount;
-    let explicitExit = createExplicitTtyExitCoordinator({
+    let ttyExplicitExit = createExplicitTtyExitCoordinator({
       runTeardown: runPlannerTeardown,
       unmount: () => {
         inkUnmount && (inkUnmount(), inkUnmount = null);
       }
-    }), unsubscribe = store.subscribe((state) => {
+    });
+    explicitExit = ttyExplicitExit, sessionRetiredExitRequested && ttyExplicitExit.start();
+    let unsubscribe = store.subscribe((state) => {
       let last = state.conversation[state.conversation.length - 1];
-      last && last.kind === "slash-output" && isExitCommand(last.command) && explicitExit.start();
+      last && last.kind === "slash-output" && isExitCommand(last.command) && ttyExplicitExit.start();
     });
     try {
-      await Promise.race([waitUntilExit(), explicitExit.completion]);
+      await Promise.race([waitUntilExit(), ttyExplicitExit.completion]);
     } finally {
-      unsubscribe(), inkUnmount = null;
+      unsubscribe(), inkUnmount = null, explicitExit = null;
     }
   } finally {
     try {
@@ -59592,8 +59750,8 @@ function routeTeamShellEventToStore(store, evt) {
     return;
   }
   if (source === "task_group_halted") {
-    let haltReason = typeof md.haltReason == "string" ? md.haltReason : "halted";
-    store.dispatch({ type: "TEAM_HALTED", haltReason });
+    let haltReason = typeof md.haltReason == "string" ? md.haltReason : "halted", completedAt = typeof md.completed_at == "string" ? md.completed_at : typeof md.completedAt == "string" ? md.completedAt : void 0;
+    store.dispatch({ type: "TEAM_HALTED", haltReason, ...completedAt ? { completedAt } : {} });
     let team = store.getState().team;
     if (team)
       for (let [trackIndex, t] of team.tracks)
@@ -59639,8 +59797,12 @@ function routeTeamShellEventToStore(store, evt) {
     if (!team || team.groupResolved) return;
     let trackStates = [...team.tracks.values()].map((t) => t.state), allTerminal = trackStates.length > 0 && trackStates.every((s) => s === "Passed" || s === "Failed"), anyFailed = trackStates.some((s) => s === "Failed");
     if (!allTerminal || !anyFailed) return;
-    let failedTrackIndices = [...team.tracks.entries()].filter(([, t]) => t.state === "Failed").map(([idx]) => idx).sort((a, b) => a - b), failedLabel = failedTrackIndices.length === 1 ? `track ${displayTrackNumber(failedTrackIndices[0])}` : `tracks ${failedTrackIndices.map(displayTrackNumber).join(", ")}`;
-    store.dispatch({ type: "TEAM_GROUP_RESOLVED", outcome: `team_halted:${reason}` }), store.dispatch({
+    let failedTrackIndices = [...team.tracks.entries()].filter(([, t]) => t.state === "Failed").map(([idx]) => idx).sort((a, b) => a - b), failedLabel = failedTrackIndices.length === 1 ? `track ${displayTrackNumber(failedTrackIndices[0])}` : `tracks ${failedTrackIndices.map(displayTrackNumber).join(", ")}`, localHaltCompletedAt = typeof md.completed_at == "string" ? md.completed_at : typeof md.completedAt == "string" ? md.completedAt : void 0;
+    store.dispatch({
+      type: "TEAM_GROUP_RESOLVED",
+      outcome: `team_halted:${reason}`,
+      ...localHaltCompletedAt ? { completedAt: localHaltCompletedAt } : {}
+    }), store.dispatch({
       type: "SHELL_ADVISORY",
       source: "shell",
       text: `Agent Teams: Team halted \u2014 ${failedLabel} failed (${reason}). Passing tracks were not applied to your files; CodeVibe will clean up their disposable task resources automatically.`
@@ -59650,8 +59812,12 @@ function routeTeamShellEventToStore(store, evt) {
   if (source === "team_group_resolved") {
     let outcome = md.outcome;
     if (typeof outcome != "string" || outcome.length === 0) return;
-    let priorTeam = store.getState().team, alreadyResolvedSame = priorTeam?.groupResolved === !0 && priorTeam.outcome === outcome;
-    if (store.dispatch({ type: "TEAM_GROUP_RESOLVED", outcome }), alreadyResolvedSame) return;
+    let completedAt = typeof md.completed_at == "string" ? md.completed_at : typeof md.completedAt == "string" ? md.completedAt : void 0, priorTeam = store.getState().team, alreadyResolvedSame = priorTeam?.groupResolved === !0 && priorTeam.outcome === outcome;
+    if (store.dispatch({
+      type: "TEAM_GROUP_RESOLVED",
+      outcome,
+      ...completedAt ? { completedAt } : {}
+    }), alreadyResolvedSame) return;
     let text2 = outcome === "complete" ? "Agent Teams: Team complete" : `Agent Teams: Team halted \u2014 ${outcome}`;
     store.dispatch({ type: "SHELL_ADVISORY", source: "shell", text: text2 });
     return;
@@ -62834,6 +63000,11 @@ var GATE_PROMPT_KIND_LABEL = {
   orchestration_escalated_gate: "escalated review gate",
   continuation_offer_handoff: "continuation handoff offer"
 };
+function parseIsoTimestamp(iso) {
+  if (!iso) return 0;
+  let t = Date.parse(iso);
+  return Number.isFinite(t) ? t : 0;
+}
 function buildStatusSummary(state, quorumLoop) {
   let lines = [];
   if (state.team) {
@@ -62865,7 +63036,80 @@ function buildStatusSummary(state, quorumLoop) {
       `Awaiting your decision: ${label} for task ${entry.envelope.taskId} \u2014 reply with an option number (1-${entry.envelope.options.length})${queued}.`
     );
   }
-  let outcome = state.team ? null : quorumLoop?.getLastWorkspaceOutcome() ?? null;
+  let rawOutcome = quorumLoop?.getLastWorkspaceOutcome() ?? null, outcome = null;
+  if (rawOutcome !== null && !teamActive)
+    if (rawOutcome.taskId) {
+      let refTask = state.sessionTasks.get(rawOutcome.taskId);
+      if (refTask && refTask.origin === "single")
+        if (!state.team)
+          outcome = rawOutcome;
+        else {
+          let singleTaskTime = Math.max(
+            parseIsoTimestamp(rawOutcome.completedAt),
+            parseIsoTimestamp(refTask.completedAt),
+            parseIsoTimestamp(refTask.startedAt)
+          ), teamTasks = [...state.sessionTasks.values()].filter(
+            (t) => t.origin === "team"
+          ), maxTeamTrackTime = teamTasks.length > 0 ? Math.max(
+            ...teamTasks.map(
+              (tt) => Math.max(
+                parseIsoTimestamp(tt.completedAt),
+                parseIsoTimestamp(tt.startedAt)
+              )
+            )
+          ) : 0, teamStartedTime = parseIsoTimestamp(state.team.startedAt), teamCompletedTime = parseIsoTimestamp(state.team.completedAt), latestTeamTime = Math.max(
+            teamStartedTime,
+            teamCompletedTime,
+            maxTeamTrackTime
+          ), teamRanAfter;
+          if (latestTeamTime !== singleTaskTime)
+            teamRanAfter = latestTeamTime > singleTaskTime || teamTasks.length === 0 && teamStartedTime === 0 && teamCompletedTime === 0;
+          else {
+            let teamSeq = Math.max(
+              state.team.terminalSeq ?? 0,
+              ...teamTasks.map((tt) => tt.terminalSeq ?? 0)
+            ), singleSeq = refTask.terminalSeq ?? 0;
+            teamSeq > 0 && singleSeq > 0 ? teamRanAfter = teamSeq > singleSeq : teamRanAfter = teamTasks.length === 0 && teamStartedTime === 0 && teamCompletedTime === 0;
+          }
+          teamRanAfter || (outcome = rawOutcome);
+        }
+    } else if (!state.team)
+      outcome = rawOutcome;
+    else {
+      let singleTasks = [...state.sessionTasks.values()].filter(
+        (t) => t.origin === "single"
+      );
+      if (singleTasks.length > 0) {
+        let latestSingle = singleTasks.reduce((latest, curr) => {
+          let currTime = Math.max(
+            parseIsoTimestamp(curr.completedAt),
+            parseIsoTimestamp(curr.startedAt)
+          ), latestTime = Math.max(
+            parseIsoTimestamp(latest.completedAt),
+            parseIsoTimestamp(latest.startedAt)
+          );
+          return currTime > latestTime ? curr : latest;
+        }), singleTaskTime = Math.max(
+          parseIsoTimestamp(rawOutcome.completedAt),
+          parseIsoTimestamp(latestSingle.completedAt),
+          parseIsoTimestamp(latestSingle.startedAt)
+        ), teamTasks = [...state.sessionTasks.values()].filter(
+          (t) => t.origin === "team"
+        ), maxTeamTrackTime = teamTasks.length > 0 ? Math.max(
+          ...teamTasks.map(
+            (tt) => Math.max(
+              parseIsoTimestamp(tt.completedAt),
+              parseIsoTimestamp(tt.startedAt)
+            )
+          )
+        ) : 0, teamStartedTime = parseIsoTimestamp(state.team.startedAt), teamCompletedTime = parseIsoTimestamp(state.team.completedAt);
+        Math.max(
+          teamStartedTime,
+          teamCompletedTime,
+          maxTeamTrackTime
+        ) > singleTaskTime || teamTasks.length === 0 && teamStartedTime === 0 && teamCompletedTime === 0 || (outcome = rawOutcome);
+      }
+    }
   if (outcome && outcome.kind === "promoted") {
     let n = outcome.files.length;
     n > 0 ? lines.push(
@@ -67619,13 +67863,14 @@ function createAdmittedSessionOwnershipController(appsyncClient) {
     appsyncClient,
     admittedSession.sessionId
   ), retirement) : Promise.resolve(), removeTemporarySignalHandlers = () => {
-    process.removeListener("SIGINT", onSigint), process.removeListener("SIGTERM", onSigterm);
+    process.removeListener("SIGINT", onSigint), process.removeListener("SIGTERM", onSigterm), process.removeListener("SIGHUP", onSighup);
   }, handleSignal = (signal) => {
-    signalReceived || ownershipAccepted || closed || (signalReceived = !0, removeTemporarySignalHandlers(), retireOnce().finally(() => {
+    signalReceived || ownershipAccepted || closed || (signalReceived = !0, retireOnce().finally(() => {
+      removeTemporarySignalHandlers();
       try {
         process.kill(process.pid, signal);
       } catch {
-        process.exit(signal === "SIGTERM" ? 143 : 130);
+        process.exit(signal === "SIGTERM" ? 143 : signal === "SIGHUP" ? 129 : 130);
       }
     }));
   };
@@ -67635,7 +67880,10 @@ function createAdmittedSessionOwnershipController(appsyncClient) {
   function onSigterm() {
     handleSignal("SIGTERM");
   }
-  process.once("SIGINT", onSigint), process.once("SIGTERM", onSigterm);
+  function onSighup() {
+    handleSignal("SIGHUP");
+  }
+  process.on("SIGINT", onSigint), process.on("SIGTERM", onSigterm), process.on("SIGHUP", onSighup);
   let close = async () => {
     if (closed) return retirement ?? Promise.resolve();
     closed = !0, removeTemporarySignalHandlers(), ownershipAccepted || await retireOnce();
@@ -67666,6 +67914,20 @@ async function runWithAdmittedSessionOwnership(args) {
   let ownership = createAdmittedSessionOwnershipController(args.appsyncClient);
   return ownership.onAdmitted(args.session), ownership.run(args.launch);
 }
+var ORCHESTRATION_ORPHAN_SWEEP_STALE_THRESHOLD_MS = 600 * 1e3;
+async function triggerStartupOrphanSweep(appsyncClient, currentSessionId, staleThresholdMs = ORCHESTRATION_ORPHAN_SWEEP_STALE_THRESHOLD_MS) {
+  try {
+    return await appsyncClient.sweepOrphanSessions({
+      agentType: "CODEVIBE" /* CODEVIBE */,
+      staleThresholdMs,
+      excludeSessionIds: [currentSessionId]
+    });
+  } catch (err) {
+    return logger.warn("[cli] startup orphan sweep failed (non-fatal)", {
+      error: err?.message
+    }), 0;
+  }
+}
 async function runCompanion(args) {
   let { runCompanionMode: runCompanionMode2 } = (init_companion_mode(), __toCommonJS(companion_mode_exports));
   return runCompanionMode2({
@@ -67997,7 +68259,7 @@ ${err.message}
 `), 1;
   }
   let session = resolved.session;
-  return admissionOwnership.run(async (acceptSessionLifecycleOwnership) => {
+  return triggerStartupOrphanSweep(appsyncClient, session.sessionId), admissionOwnership.run(async (acceptSessionLifecycleOwnership) => {
     let emitter = createShellEventEmitter(appsyncClient, session), localPlanner = await buildLocalGemmaPlannerAdapter({
       state: localModelState
     });
@@ -68429,11 +68691,14 @@ function mapTeamSourceToTypedEvent(sessionId, md) {
     }
     case "team_group_resolved": {
       let outcome = teamMetaStr(md, "outcome");
-      return outcome ? { sessionId, type: "TEAM_GROUP_RESOLVED", source: "DESKTOP", isEncrypted: !0, metadata: {
+      if (!outcome) return null;
+      let completedAt = typeof md.completed_at == "string" ? md.completed_at : typeof md.completedAt == "string" ? md.completedAt : void 0, metadata = {
         team_event: "group_resolved",
         task_group_id: taskGroupId,
-        outcome
-      } } : null;
+        outcome,
+        ...completedAt ? { completed_at: completedAt } : {}
+      };
+      return { sessionId, type: "TEAM_GROUP_RESOLVED", source: "DESKTOP", isEncrypted: !0, metadata };
     }
     // NB TEAM_DECOMPOSED is emitted DIRECTLY at the launch layer
     // (launchTeamFromWorkItems, index.ts) which has no `leEmitShellEvent`, so it
@@ -69040,6 +69305,7 @@ require.main === module && main(process.argv.slice(2)).then(
   CliEntitlementError,
   CliUsageError,
   LocalModelPlannerUnavailableAdapter,
+  ORCHESTRATION_ORPHAN_SWEEP_STALE_THRESHOLD_MS,
   OrchestrationSessionBootstrapError,
   PlannerUnavailableError,
   bridgeAuthorityErrorToShellRefusal,
@@ -69065,5 +69331,6 @@ require.main === module && main(process.argv.slice(2)).then(
   resumeOrCreateSession,
   runAuditCli,
   runModelCli,
-  runWithAdmittedSessionOwnership
+  runWithAdmittedSessionOwnership,
+  triggerStartupOrphanSweep
 });