chatroom-cli 1.77.4 → 1.78.1

package/dist/index.js

@@ -77263,14 +77263,21 @@ function getFileReferenceProofOfCompletionExample() {
 }
 
 // ../../services/backend/prompts/utils/handoff-quality-principles.ts
-function getHandoffQualityPrinciplesCommentBlock() {
-  const bullets = HANDOFF_QUALITY_PRINCIPLES.map((p) => `- ${p.name}: ${p.description}`).join(`
-`);
-  return `<!-- Demonstrate adherence to:
-${bullets}
--->`;
+function getHandoffQualityPrinciplesTemplateBlock() {
+  const lines = HANDOFF_QUALITY_PRINCIPLES.flatMap((p) => [
+    `- **${p.name}:** <how this work demonstrates ${p.name.toLowerCase()}, or Not Applicable>`,
+    `<!-- ${p.name}: ${p.description} -->`,
+    ""
+  ]);
+  return lines.join(`
+`).trimEnd();
 }
-var HANDOFF_QUALITY_PRINCIPLES, PROOF_OF_PRINCIPLES_HEADING_H2 = "## Proof of Principles", PROOF_OF_PRINCIPLES_HEADING_H3 = "### Proof of Principles";
+function getHandoffQualityPrinciplesSectionBlock() {
+  return `${PROOF_OF_PRINCIPLES_HEADING_H2}
+${PROOF_OF_PRINCIPLES_MANDATORY_COMMENT}
+${getHandoffQualityPrinciplesTemplateBlock()}`;
+}
+var HANDOFF_QUALITY_PRINCIPLES, PROOF_OF_PRINCIPLES_HEADING_H2 = "## Proof of Principles", PROOF_OF_PRINCIPLES_MANDATORY_COMMENT = '<!-- REQUIRED: Complete every principle below. Write an explanation or "Not Applicable" for each — do not omit this section or skip any principle bullet. -->';
 var init_handoff_quality_principles = __esm(() => {
   HANDOFF_QUALITY_PRINCIPLES = [
     {
@@ -77302,7 +77309,7 @@ var init_handoff_quality_principles = __esm(() => {
 
 // ../../services/backend/prompts/utils/handoff-section-guidance.ts
 function getHandoffReportTemplateIntro(templateLabel) {
-  return `**${templateLabel}** — include every section that applies to this handoff. **Omit sections that do not apply** — do not write \`Not Applicable\` as filler:`;
+  return `**${templateLabel}** — complete every section below. Do not omit sections, principles, or XML wrappers:`;
 }
 function getDelegationBriefIntro() {
   return `**Delegation Brief (Planner → Builder)** — paste into the handoff message. Include every field that applies. **Omit fields that do not apply** — do not write \`Not Applicable\` as filler.`;
@@ -77342,9 +77349,7 @@ ${getHandoffReportTemplateIntro("Handoff Template (Builder → Planner)")}
 - [ ] I confirm that I have seen this template at the start of this task, before implementing or modifying any code
 ${getRoleGuidanceDisclosureBlock(roleGuidanceContext)}
 
-${PROOF_OF_PRINCIPLES_HEADING_H2}
-${getHandoffQualityPrinciplesCommentBlock()}
-<how this work follows the principles above — localized changes, readable structure, correctness provable from source then tests>
+${getHandoffQualityPrinciplesSectionBlock()}
 
 ## Proof of Completion
 ${getDelegationBriefDisclosureBlock()}
@@ -77355,10 +77360,12 @@ ${getFileReferenceProofOfCompletionExample()}
 ${CODE_CHANGE_VERIFICATION_CONFIRMATION}
 
 ## Blockers / questions
-<anything needing planner decision. Omit if none.>
+<!-- REQUIRED. List blockers, or write "Not Applicable". Do not omit this section. -->
+<anything needing planner decision>
 
 ## Notes for review
-<specific areas for planner to check. Omit if none.>
+<!-- REQUIRED. List review notes, or write "Not Applicable". Do not omit this section. -->
+<specific areas for planner to check>
 \`\`\``;
 }
 var init_builder_to_planner = __esm(() => {
@@ -77372,26 +77379,29 @@ function getEnhancerToPlannerHandoffTemplate() {
 
 ${getHandoffReportTemplateIntro("Planning Feedback (Enhancer → Planner)")}
 
-The planner sent you three XML sections: \`<user-message>\`, \`<grounding>\`, and a draft \`<builder-handoff>\`. Your job is **critical review** of all three — tighten their thinking toward a high-quality eventual handoff to the user. Do not explore the codebase or invent new scope.
+The planner sent you three XML sections. Your job is **advisory adversarial review** — raise risks, challenge assumptions, and help the planner align with user intent. **Do not prescribe file-level changes or rewrite their builder brief.** The planner makes the final call.
 
 \`\`\`markdown
 ## Summary
-<one paragraph: overall assessment of the planner's check-in — strengths and the main gaps to address>
+<one paragraph: overall assessment — strengths, main risks, and whether the approach is sound>
+
+## User intent alignment
+<does the planner's reading of the user request match what was asked? misreadings or missing constraints?>
 
-## User intent assessment
-<mistakes or misreadings in what the user may want; clarify the correct interpretation>
+## Risks &amp; failure modes
+<what could go wrong if they proceed as planned? common pitfalls for this kind of work?>
 
 ## Knowledge gaps
-<facts, context, or research the planner is missing or has not surfaced>
+<facts, context, or research the planner should verify — advisory questions, not answers from codebase>
 
-## Reasoning & logic
-<logical errors, weak inference chains, contradictions, or unsupported conclusions>
+## Reasoning review
+<logical errors, weak inference, contradictions — challenge assumptions>
 
-## Alignment with user handoff
-<how to tighten the research and conclusions so the eventual planner→user report will be accurate, complete, and well-justified>
+## Questions for the planner
+<specific questions they should answer before delegating — not instructions disguised as questions>
 
-## Recommended next steps
-<concrete actions for the planner: what to research, revise, validate, or decide before proceeding>
+## Alignment with eventual user handoff
+<will this approach produce a credible planner→user report? what's missing for user-facing completeness?>
 \`\`\`
 
 Return only the feedback markdown — no preamble. Follow this structure; omit sections that truly do not apply.`;
@@ -77510,11 +77520,11 @@ ${getFileReferenceGuidanceComment()}
 <builder-handoff>
 <your complete, filled-in Delegation Brief for builder review — every section with real content, not placeholders>
 
-Follow the **Handoff to \`builder\`** template structure (Summary, Goal, Files to implement, Requirements, etc.). The enhancer critiques this draft before you delegate.
+Follow the **Handoff to \`builder\`** template structure (Summary, Goal, approach, Requirements, etc.). The enhancer reviews **approach and scope** — not line-by-line file edits. Keep file references for context, but expect advisory feedback on risks and gaps, not a rewritten brief.
 </builder-handoff>
 \`\`\`
 
-After the enhancer returns feedback, you will receive it as a new planner task. Revise grounding and the builder handoff as needed, then proceed to \`builder\` or \`user\` as appropriate.`;
+After the enhancer returns **advisory** feedback, you make the **final call** — incorporate valid critiques, ignore what doesn't apply, then proceed to \`builder\` or \`user\`. Do not re-check with the enhancer for this slice; one round only.`;
 }
 var init_planner_to_enhancer = () => {};
 
@@ -77541,84 +77551,113 @@ var init_context_disclosure = () => {};
 // ../../services/backend/prompts/utils/unresolved-decisions.ts
 function getUnresolvedDecisionsSectionBlock() {
   return `## Unresolved Decisions
-<!-- Decisions that need user input before work can proceed. Omit this section when there are no open decisions. -->
+<!-- REQUIRED. List open decisions needing user input, or write "Not Applicable" if none. Do not omit this section. -->
 - <decision or question — options considered, recommendation if any>
 <Carry forward decisions still open from earlier handoffs in this chatroom. Remove items the user has resolved. Do not decide on the user's behalf unless they explicitly asked you to.>`;
 }
 
-// ../../services/backend/prompts/teams/duo/handoff-templates/planner-to-user.ts
-function getPlannerToUserReportTemplate(roleGuidanceContext) {
-  return `${getHandoffRecipientVisibilityCallout("user")}
-
-${getHandoffReportTemplateIntro("Report Template (Planner → User)")}
-
-\`\`\`markdown
+// ../../services/backend/prompts/utils/handoff-report-template-body.ts
+function getHandoffReportTemplateBody(roleGuidanceContext) {
+  return `<handoff-overview>
 ## Summary
 <what was accomplished, in plain terms — no references to prior messages>
 
+## What changed
+<high-level view of what changed since the user's message>
+</handoff-overview>
+
+<!-- UI collapses proofs, direction, and notes by default; overview and action required are expanded -->
+
+<handoff-proofs>
 ## Template Disclosure Confirmation
 - [ ] I confirm that I have seen this template at the start of any planning, before working on or delegating any task to the team
 ${getRoleGuidanceDisclosureBlock(roleGuidanceContext)}
 
 ## Proof of Planning
-<!-- Demonstrate the goal was decomposed into actionable steps with clear outcomes before implementation. -->
+<!-- REQUIRED. List planning steps, or write "Not Applicable" for trivial single-step tasks. Do not omit this section. -->
 - <step 1: concrete artifact or outcome>
 - <step 2: concrete artifact or outcome>
-<Omit for trivial single-step tasks.>
-
-## What changed
-<high-level view of what changed since the user's message before the detailed proofs below>
 
-${PROOF_OF_PRINCIPLES_HEADING_H3}
-${getHandoffQualityPrinciplesCommentBlock()}
-<how this work follows the principles above — localized changes, readable structure, correctness provable from source then tests>
+${getHandoffQualityPrinciplesSectionBlock()}
 
-### Proof of Completion
+## Proof of Completion
 ${getContextReadDisclosureBlock(roleGuidanceContext)}
 ${getFileReferenceProofOfCompletionExample()}
 <evidence the goal was met — list every file you (or the builder) modified>
 
 ## Backlog Tasks Implemented
+<!-- REQUIRED. List backlog items addressed, or write "Not Applicable" if none were in scope. Do not omit this section. -->
 - \`backlog-item-id\` — <backlog item title/summary and how this work addresses it>
-<Omit if no backlog items were in scope.>
 
 ## Backlog Pending User Review Confirmation
+<!-- REQUIRED. Complete the attestation, or write "Not Applicable" if no backlog items apply. Do not omit this section. -->
 - [ ] I confirm that every backlog item implemented in this work has been moved to \`pending_user_review\` via \`chatroom backlog mark-for-review\` after the feature was verified end-to-end and a PR was raised for user review
 - PR URL(s): <link to PR(s)>
-<Omit this section if no backlog items apply.>
+
+## Code Change Verification
+${CODE_CHANGE_VERIFICATION_CONFIRMATION}
+</handoff-proofs>
+
+<handoff-direction>
+## What exists today
+<!-- REQUIRED. Describe current state after this work, or write "Not Applicable". Do not omit this section. -->
+<current state after this work — what the user can now do, what is in place, how the system behaves>
 
 ## Key Technical Decisions
+<!-- REQUIRED. List decisions, or write "Not Applicable". Do not omit this section. -->
 - <schema design, modules, interfaces, domain entities — what you chose and why>
 
 ## Key Tradeoffs
+<!-- REQUIRED. List tradeoffs, or write "Not Applicable". Do not omit this section. -->
 - <what was weighed against what, and why you chose this path>
 
-## Tech Debt Observed
-- <issues noticed but intentionally left out of scope of this change>
-
 ## System Design
-<include a mermaid diagram when the change has non-trivial structure; omit for trivial changes>
+<!-- REQUIRED. Include a mermaid diagram when the change has non-trivial structure, or write "Not Applicable". Do not omit this section. -->
 
 \`\`\`mermaid
 flowchart TD
     A[Component] --> B[Component]
 \`\`\`
+</handoff-direction>
 
-## Code Change Verification
-${CODE_CHANGE_VERIFICATION_CONFIRMATION}
+<handoff-notes>
+## Notes
+<!-- REQUIRED. Write notes, or "Not Applicable" if none. Do not omit this section. -->
+<anything the user should know — context, caveats, or observations not covered above>
+</handoff-notes>
+
+<handoff-action>
+## Tech Debt Observed
+<!-- REQUIRED. List tech debt, or write "Not Applicable". Do not omit this section. -->
+- <issues noticed but intentionally left out of scope of this change>
 
 ${getUnresolvedDecisionsSectionBlock()}
 
-## Notes
-<anything the user should know — context, caveats, or observations not covered above. Omit if none.>
-\`\`\``;
+## Manual steps
+<!-- REQUIRED. List manual steps outside the system, or write "Not Applicable". Do not omit this section. -->
+<steps the user must take outside the system — deploy, configure credentials, run commands, verify in production, etc.>
+</handoff-action>`;
 }
-var init_planner_to_user = __esm(() => {
+var init_handoff_report_template_body = __esm(() => {
   init_context_disclosure();
   init_handoff_quality_principles();
   init_role_guidance_disclosure();
 });
 
+// ../../services/backend/prompts/teams/duo/handoff-templates/planner-to-user.ts
+function getPlannerToUserReportTemplate(roleGuidanceContext) {
+  return `${getHandoffRecipientVisibilityCallout("user")}
+
+${getHandoffReportTemplateIntro("Report Template (Planner → User)")}
+
+\`\`\`markdown
+${getHandoffReportTemplateBody(roleGuidanceContext)}
+\`\`\``;
+}
+var init_planner_to_user = __esm(() => {
+  init_handoff_report_template_body();
+});
+
 // ../../services/backend/prompts/teams/duo/handoff-templates/index.ts
 function getDuoHandoffTemplate(query) {
   const getter = DUO_HANDOFF_TEMPLATES[`${query.fromRole.toLowerCase()}:${query.toRole.toLowerCase()}`];
@@ -77655,70 +77694,11 @@ function getSoloToUserReportTemplate(roleGuidanceContext) {
 ${getHandoffReportTemplateIntro("Report Template (Solo → User)")}
 
 \`\`\`markdown
-## Summary
-<what was accomplished, in plain terms — no references to prior messages>
-
-## Template Disclosure Confirmation
-- [ ] I confirm that I have seen this template at the start of any planning, before implementing any code for this task
-${getRoleGuidanceDisclosureBlock(roleGuidanceContext)}
-
-## Proof of Planning
-<!-- Demonstrate the goal was decomposed into actionable steps with clear outcomes before implementation. -->
-- <step 1: concrete artifact or outcome>
-- <step 2: concrete artifact or outcome>
-<Omit for trivial single-step tasks.>
-
-## What changed
-<high-level view of what changed since the user's message before the detailed proofs below>
-
-${PROOF_OF_PRINCIPLES_HEADING_H3}
-${getHandoffQualityPrinciplesCommentBlock()}
-<how this work follows the principles above — localized changes, readable structure, correctness provable from source then tests>
-
-### Proof of Completion
-${getContextReadDisclosureBlock(roleGuidanceContext)}
-${getFileReferenceProofOfCompletionExample()}
-<evidence the goal was met — list every file you modified>
-
-## Backlog Tasks Implemented
-- \`backlog-item-id\` — <backlog item title/summary and how this work addresses it>
-<Omit if no backlog items were in scope.>
-
-## Backlog Pending User Review Confirmation
-- [ ] I confirm that every backlog item implemented in this work has been moved to \`pending_user_review\` via \`chatroom backlog mark-for-review\` after the feature was verified end-to-end and a PR was raised for user review
-- PR URL(s): <link to PR(s)>
-<Omit this section if no backlog items apply.>
-
-## Key Technical Decisions
-- <schema design, modules, interfaces, domain entities — what you chose and why>
-
-## Key Tradeoffs
-- <what was weighed against what, and why you chose this path>
-
-## Tech Debt Observed
-- <issues noticed but intentionally left out of scope of this change>
-
-## System Design
-<include a mermaid diagram when the change has non-trivial structure; omit for trivial changes>
-
-\`\`\`mermaid
-flowchart TD
-    A[Component] --> B[Component]
-\`\`\`
-
-## Code Change Verification
-${CODE_CHANGE_VERIFICATION_CONFIRMATION}
-
-${getUnresolvedDecisionsSectionBlock()}
-
-## Notes
-<anything the user should know — context, caveats, or observations not covered above. Omit if none.>
+${getHandoffReportTemplateBody(roleGuidanceContext)}
 \`\`\``;
 }
 var init_solo_to_user = __esm(() => {
-  init_context_disclosure();
-  init_handoff_quality_principles();
-  init_role_guidance_disclosure();
+  init_handoff_report_template_body();
 });
 
 // ../../services/backend/prompts/teams/solo/handoff-templates/index.ts
@@ -99304,6 +99284,30 @@ var init_assigned_task_snapshot_store = __esm(() => {
   rows = [];
 });
 
+// src/commands/machine/daemon-start/restart-orchestrator-in-flight.ts
+function roleKey2(chatroomId, role) {
+  return `${chatroomId}:${role.toLowerCase()}`;
+}
+function markRestartOrchestratorInFlight(chatroomId, role, correlationId) {
+  inFlight.set(roleKey2(chatroomId, role), correlationId);
+}
+function clearRestartOrchestratorInFlight(chatroomId, role, correlationId) {
+  const key = roleKey2(chatroomId, role);
+  if (correlationId !== undefined && inFlight.get(key) !== correlationId)
+    return;
+  inFlight.delete(key);
+}
+function isRestartOrchestratorInFlight(chatroomId, role) {
+  return inFlight.has(roleKey2(chatroomId, role));
+}
+function filterSnapshotsExcludingRestartInFlight(snapshots) {
+  return snapshots.filter((row) => !isRestartOrchestratorInFlight(row.chatroomId, row.agentConfig.role));
+}
+var inFlight;
+var init_restart_orchestrator_in_flight = __esm(() => {
+  inFlight = new Map;
+});
+
 // src/commands/machine/daemon-start/native-task-delivery-coordinator.ts
 class NativeTaskDeliveryCoordinator {
   onSessionLost(params) {
@@ -99316,6 +99320,8 @@ class NativeTaskDeliveryCoordinator {
     getRoleDeliveryState().resetDeliveryState(chatroomId, role);
   }
   tryInjectNextForRole(chatroomId, role) {
+    if (isRestartOrchestratorInFlight(chatroomId, role))
+      return;
     const session2 = getNativeDeliverySession();
     if (!session2)
       return;
@@ -99335,7 +99341,10 @@ class NativeTaskDeliveryCoordinator {
     });
   }
   reconcileAssignedTasks(params) {
-    const { tasks, runtime: runtime4, effectContext: effectContext2, agentMgr, sessionDeps, machineId } = params;
+    const tasks = filterSnapshotsExcludingRestartInFlight(params.tasks);
+    if (tasks.length === 0)
+      return;
+    const { runtime: runtime4, effectContext: effectContext2, agentMgr, sessionDeps, machineId } = params;
     const deliveryState = getRoleDeliveryState();
     const ledger = getNativeDeliveryLedger();
     const pendingFirst = [...tasks].sort((a, b) => {
@@ -99424,6 +99433,8 @@ function resetRoleDeliveryState(chatroomId, role) {
   getRoleDeliveryState().resetDeliveryState(chatroomId, role);
 }
 function notifyNativeTurnIdle(params) {
+  if (isRestartOrchestratorInFlight(params.chatroomId, params.role))
+    return;
   logNativeDeliveryPrimary(params.role, params.chatroomId);
   getNativeTaskDeliveryCoordinator().tryInjectNextForRole(params.chatroomId, params.role);
 }
@@ -99436,6 +99447,7 @@ var init_native_task_delivery_coordinator = __esm(() => {
   init_api3();
   init_assigned_task_snapshot_store();
   init_convex_error();
+  init_restart_orchestrator_in_flight();
 });
 
 // src/commands/machine/daemon-start/restart-orchestrator.ts
@@ -99458,14 +99470,6 @@ async function waitForHarnessSessionId(deps, event, pid) {
   if (initial?.harnessSessionId) {
     return initial.harnessSessionId;
   }
-  await deps.session.backend.mutation(api.machines.emitHarnessSessionAwaiting, {
-    sessionId: deps.session.sessionId,
-    machineId: deps.session.machineId,
-    chatroomId: event.chatroomId,
-    role: event.role,
-    pid,
-    timeoutMs: HARNESS_SESSION_READY_TIMEOUT_MS
-  });
   const deadline = Date.now() + HARNESS_SESSION_READY_TIMEOUT_MS;
   while (Date.now() < deadline) {
     const slot = deps.agentMgr.getSlot(event.chatroomId, event.role);
@@ -99474,14 +99478,6 @@ async function waitForHarnessSessionId(deps, event, pid) {
     }
     await sleep5(100);
   }
-  await deps.session.backend.mutation(api.machines.emitHarnessSessionTimeout, {
-    sessionId: deps.session.sessionId,
-    machineId: deps.session.machineId,
-    chatroomId: event.chatroomId,
-    role: event.role,
-    pid,
-    timeoutMs: HARNESS_SESSION_READY_TIMEOUT_MS
-  });
   await deps.agentMgr.stop({
     chatroomId: event.chatroomId,
     role: event.role,
@@ -99576,15 +99572,14 @@ async function deliverPendingTasks(deps, event) {
 }
 async function runRestartOrchestrator(deps, event) {
   const { chatroomId, role } = event;
+  markRestartOrchestratorInFlight(chatroomId, role, event.correlationId);
   try {
-    await emitPhase(deps, event, "reset");
     resetRoleDeliveryState(chatroomId, role);
     await deps.agentMgr.stop({
       chatroomId,
       role,
       reason: "user.restart"
     });
-    await emitPhase(deps, event, "spawn");
     const spawnResult = await exports_Effect.runPromise(deps.agentMgr.ensureRunning({
       chatroomId,
       role,
@@ -99598,23 +99593,12 @@ async function runRestartOrchestrator(deps, event) {
       await emitPhase(deps, event, "failed", spawnResult.error ?? "spawn failed");
       return;
     }
-    await emitPhase(deps, event, "await_session");
     const harnessSessionId = await waitForHarnessSessionId(deps, event, spawnResult.pid);
     if (!harnessSessionId) {
       await emitPhase(deps, event, "failed", "harnessSessionId timeout");
       return;
     }
-    await deps.session.backend.mutation(api.machines.emitHarnessSessionReady, {
-      sessionId: deps.session.sessionId,
-      machineId: deps.session.machineId,
-      chatroomId,
-      role,
-      harnessSessionId,
-      pid: spawnResult.pid
-    });
     await forceNativeWaiting(deps, event);
-    await emitPhase(deps, event, "ready");
-    await emitPhase(deps, event, "deliver");
     const deliveredTaskIds = await deliverPendingTasks(deps, event);
     await deps.session.backend.mutation(api.machines.emitRestartCompleted, {
       sessionId: deps.session.sessionId,
@@ -99624,10 +99608,11 @@ async function runRestartOrchestrator(deps, event) {
       correlationId: event.correlationId,
       deliveredTaskIds
     });
-    await emitPhase(deps, event, "completed");
   } catch (err) {
     console.warn(`[RestartOrchestrator] failed for ${role}@${chatroomId}: ${getErrorMessage(err)}`);
     await emitPhase(deps, event, "failed", getErrorMessage(err));
+  } finally {
+    clearRestartOrchestratorInFlight(chatroomId, role, event.correlationId);
   }
 }
 var init_restart_orchestrator = __esm(() => {
@@ -99641,6 +99626,7 @@ var init_restart_orchestrator = __esm(() => {
   init_native_task_injector();
   init_api3();
   init_convex_error();
+  init_restart_orchestrator_in_flight();
 });
 
 // src/events/daemon/agent/on-request-restart-agent.ts
@@ -100762,6 +100748,17 @@ async function openFinder(workingDir) {
   execFireAndForget(`${cmd} ${escapeShellArg(workingDir)}`, "open-finder");
   return { success: true };
 }
+async function openCursor(workingDir) {
+  const available = await isCliAvailable("cursor");
+  if (!available) {
+    return {
+      success: false,
+      error: "Cursor CLI (cursor) not found. Install via: Cursor → Cmd+Shift+P → 'Shell Command: Install cursor in PATH'"
+    };
+  }
+  execFireAndForget(`cursor ${escapeShellArg(workingDir)}`, "open-cursor");
+  return { success: true };
+}
 async function openGithubDesktop(workingDir) {
   const available = await isCliAvailable("github");
   if (!available) {
@@ -100836,6 +100833,7 @@ var init_execute_local_action = __esm(() => {
   actionHandlers = {
     "open-vscode": openVscode,
     "open-finder": openFinder,
+    "open-cursor": openCursor,
     "open-github-desktop": openGithubDesktop,
     "git-discard-file": gitDiscardFileAction,
     "git-discard-all": gitDiscardAllAction,
@@ -103256,7 +103254,7 @@ var init_open_pending_session = __esm(() => {
 
 // src/commands/machine/daemon-start/direct-harness/session-subscriber.ts
 function startSessionSubscriber(daemonSession, wsClient2, deps) {
-  const inFlight = new Set;
+  const inFlight2 = new Set;
   const unsub = wsClient2.onUpdate(api.daemon.directHarness.sessions.listPendingSessionsForMachine, {
     sessionId: daemonSession.sessionId,
     machineId: daemonSession.machineId
@@ -103265,9 +103263,9 @@ function startSessionSubscriber(daemonSession, wsClient2, deps) {
       return;
     for (const session2 of pendingSessions) {
       const rowId = session2._id;
-      if (inFlight.has(rowId))
+      if (inFlight2.has(rowId))
         continue;
-      inFlight.add(rowId);
+      inFlight2.add(rowId);
       (async () => {
         const harnessName = session2.opencode?.harnessName ?? "opencode-sdk";
         const agent = session2.opencode?.lastUsedConfig?.agent ?? "build";
@@ -103278,7 +103276,7 @@ function startSessionSubscriber(daemonSession, wsClient2, deps) {
           harnessName,
           lastUsedConfig: { agent, ...model ? { model } : {} }
         }, { logPrefix: "[direct-harness]", handleProviderIdEvents: true });
-      })().finally(() => inFlight.delete(rowId));
+      })().finally(() => inFlight2.delete(rowId));
     }
   }, (err) => {
     console.warn("[direct-harness] Session subscription error:", err instanceof Error ? err.message : String(err));
@@ -103813,21 +103811,21 @@ var init_prompt_subscriber2 = __esm(() => {
 
 // src/commands/machine/daemon-start/agentic-query/session-subscriber.ts
 function startSessionSubscriber2(daemonSession, wsClient2, deps) {
-  const inFlight = new Set;
+  const inFlight2 = new Set;
   const unsub = wsClient2.onUpdate(api.daemon.agenticQuery.runs.pendingForMachine, { sessionId: daemonSession.sessionId, machineId: daemonSession.machineId }, (pendingSessions) => {
     if (!pendingSessions || pendingSessions.length === 0)
       return;
     for (const session2 of pendingSessions) {
       const rowId = session2.runId;
-      if (inFlight.has(rowId))
+      if (inFlight2.has(rowId))
         continue;
-      inFlight.add(rowId);
+      inFlight2.add(rowId);
       openPendingHarnessSession(daemonSession, deps, {
         rowId: session2.runId,
         workspaceId: session2.workspaceId,
         harnessName: session2.harnessName,
         lastUsedConfig: session2.lastUsedConfig
-      }, { logPrefix: "[agentic-query]", handleProviderIdEvents: false }).finally(() => inFlight.delete(rowId));
+      }, { logPrefix: "[agentic-query]", handleProviderIdEvents: false }).finally(() => inFlight2.delete(rowId));
     }
   }, (err) => {
     console.warn("[agentic-query] Session subscription error:", err instanceof Error ? err.message : String(err));
@@ -104120,12 +104118,12 @@ var init_wait_for_enhancer_job = __esm(() => {
 
 // src/commands/machine/daemon-start/enhancer/job-subscriber.ts
 function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, wsClient2, agentServices) {
-  const inFlight = new Set;
+  const inFlight2 = new Set;
   const unsub = wsClient2.onUpdate(api.daemon.enhancer.index.pendingForMachine, { sessionId, machineId }, (jobs) => {
     for (const job of jobs ?? []) {
-      if (inFlight.has(job.jobId))
+      if (inFlight2.has(job.jobId))
         continue;
-      inFlight.add(job.jobId);
+      inFlight2.add(job.jobId);
       (async () => {
         let claimed = false;
         let chatroomId = job.chatroomId;
@@ -104213,7 +104211,7 @@ function startEnhancerJobSubscriber(sessionId, machineId, convexUrl, backend2, w
             });
           }
         } finally {
-          inFlight.delete(job.jobId);
+          inFlight2.delete(job.jobId);
           if (spawnResult && service3) {
             try {
               await service3.stop(spawnResult.pid);
@@ -114533,6 +114531,8 @@ async function nudgeStuckTasks(tasks, now, cooldown, runtime4, effectContext2, a
 }
 async function reviveNativeTasks(tasks, localHealth, now, cooldown, runtime4, effectContext2, agentMgr, sessionDeps, machineId) {
   for (const row of listNativeTasksNeedingRevive(tasks, localHealth, now, cooldown)) {
+    if (isRestartOrchestratorInFlight(row.chatroomId, row.agentConfig.role))
+      continue;
     await clearStuckStoppingSlotIfNeeded(agentMgr, row.chatroomId, row.agentConfig.role);
     const full = await fetchTaskForAction(sessionDeps, machineId, row);
     if (!full)
@@ -114541,6 +114541,7 @@ async function reviveNativeTasks(tasks, localHealth, now, cooldown, runtime4, ef
   }
 }
 async function processTasksUpdate(tasks, runtime4, effectContext2, cooldown, agentMgr, sessionDeps, machineId, _pass) {
+  tasks = filterSnapshotsExcludingRestartInFlight(tasks);
   if (tasks.length === 0)
     return;
   const now = Date.now();
@@ -114577,7 +114578,7 @@ function runLocalStoreReconcilePass(params) {
   const { stopped, monitorPassInFlight, agentMgr, runtime: runtime4, effectContext: effectContext2, sessionDeps, machineId } = params;
   if (stopped || monitorPassInFlight)
     return;
-  const deliverable = listDeliverablePendingFromStore(agentMgr);
+  const deliverable = filterSnapshotsExcludingRestartInFlight(listDeliverablePendingFromStore(agentMgr));
   if (deliverable.length === 0)
     return;
   const first = deliverable[0];
@@ -114720,6 +114721,7 @@ var init_task_monitor = __esm(() => {
   init_esm();
   init_daemon_services();
   init_native_ready_invariant();
+  init_restart_orchestrator_in_flight();
   init_native_task_delivery_coordinator();
   init_native_task_injector_logic();
   init_task_monitor_logic();
@@ -116379,4 +116381,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=550B12123AE171BD64756E2164756E21
+//# debugId=F542CAE8E215492E64756E2164756E21