@adhdev/daemon-standalone 0.9.82-rc.354 → 0.9.82-rc.356

package/dist/index.js

@@ -30036,10 +30036,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "5d100a177f412ae29a58048f0a211c3928b06910" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "5d100a17" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.354" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-22T11:32:34.147Z" : void 0);
+      const commit = readInjected(true ? "91500e054cf2b6258f6041f90c18be03ad05a8ad" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "91500e05" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.356" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-22T22:47:57.762Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -34593,9 +34593,12 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
         return [];
       }
     }
-    function updateDirectDispatchStatus(meshId, sessionId, status) {
+    function updateDirectDispatchStatus(meshId, sessionId, status, taskId) {
       try {
-        MeshRuntimeStore.getInstance().updateDirectDispatchStatus(meshId, sessionId, status);
+        if (!taskId) {
+          LOG2.warn("MeshQueue", `updateDirectDispatchStatus(${status}) for mesh ${meshId} session ${sessionId} has no taskId \u2014 falling back to session_id match (may flip a sibling dispatch row)`);
+        }
+        MeshRuntimeStore.getInstance().updateDirectDispatchStatus(meshId, sessionId, status, taskId);
       } catch {
       }
     }
@@ -35440,9 +35443,25 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
               updatedAt: r.updated_at
             }));
           }
-          updateDirectDispatchStatus(meshId, sessionId, status) {
-            if (!sessionId) return;
+          // CANON-B (dispatch identity): mesh_direct_dispatches is keyed by task_id (PK), but a
+          // single session can host several sequential direct dispatches (re-dispatch / nudge), so
+          // matching a status flip by session_id alone hits EVERY non-terminal row for that session
+          // — flipping a sibling task's row and stranding the one whose event actually fired (the
+          // assigned-stranded watchdog then requeues a task that is really still generating). When
+          // the firing event carries a taskId, target the single PK row; the session_id match is the
+          // legacy fallback only for events that arrive without a taskId.
+          updateDirectDispatchStatus(meshId, sessionId, status, taskId) {
             const now = (/* @__PURE__ */ new Date()).toISOString();
+            if (taskId) {
+              this.db.prepare(`
+                UPDATE mesh_direct_dispatches
+                SET status = @status, updated_at = @updatedAt
+                WHERE mesh_id = @meshId AND task_id = @taskId
+                  AND status NOT IN ('completed', 'failed')
+            `).run({ status, meshId, taskId, updatedAt: now });
+              return;
+            }
+            if (!sessionId) return;
             this.db.prepare(`
             UPDATE mesh_direct_dispatches
             SET status = @status, updated_at = @updatedAt
@@ -37169,7 +37188,7 @@ ${rendered}`, "utf-8");
           windowsHide: true
         }).trim();
         if (out) {
-          const matches = out.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
+          const matches = out.split(/\r?\n/).map((s2) => s2.trim()).filter(Boolean);
           const direct = matches.find((m) => DIRECT_EXEC_EXT.has(path10.extname(m).toLowerCase()));
           return direct || matches[0] || command;
         }
@@ -38521,11 +38540,29 @@ Next step: ${nextStep}`;
         (pending) => pending.event === event.event && readRefineJobId2(pending) === jobId
       );
     }
+    function isWeakCompletionMetadata(metadata) {
+      const evidenceLevel = readNonEmptyString2(metadata.evidenceLevel);
+      if (evidenceLevel === "insufficient" || evidenceLevel === "weak") return true;
+      if (metadata.reviewRecommended === true) return true;
+      const diag = readRecord4(metadata.completionDiagnostic);
+      return diag?.finalAssistantPresent === false || diag?.blockReason === "missing_final_assistant";
+    }
     function buildPendingEventFingerprint(event) {
       const metadata = readRecord4(event.metadataEvent) || {};
       if (event.event === "worktree_bootstrap_complete" || event.event === "worktree_bootstrap_failed") {
         return [event.meshId, event.event, event.nodeId || ""].join("::");
       }
+      if (TERMINAL_COMPLETION_EVENTS.has(event.event)) {
+        const terminalTaskId = readNonEmptyString2(metadata.taskId) || readNonEmptyString2(readRecord4(metadata.payload)?.taskId);
+        if (terminalTaskId) {
+          return [
+            event.meshId,
+            event.event,
+            terminalTaskId,
+            isWeakCompletionMetadata(metadata) ? "weak" : "genuine"
+          ].join("::");
+        }
+      }
       const sessionId = resolveEventSessionId(metadata);
       const providerSessionId = readNonEmptyString2(metadata.providerSessionId);
       const taskId = readNonEmptyString2(metadata.taskId) || readNonEmptyString2(readRecord4(metadata.payload)?.taskId);
@@ -38888,6 +38925,7 @@ Next step: ${nextStep}`;
     var import_path9;
     var import_crypto7;
     var REFINE_TERMINAL_EVENTS;
+    var TERMINAL_COMPLETION_EVENTS;
     var MAX_PENDING_EVENTS_BYTES;
     var MAX_PENDING_EVENTS_KEEP;
     var init_mesh_events_pending = __esm2({
@@ -38902,6 +38940,7 @@ Next step: ${nextStep}`;
         init_mesh_events_utils();
         init_dist();
         REFINE_TERMINAL_EVENTS = /* @__PURE__ */ new Set(["refine:completed", "refine:failed"]);
+        TERMINAL_COMPLETION_EVENTS = /* @__PURE__ */ new Set(["agent:generating_completed", "agent:stopped"]);
         MAX_PENDING_EVENTS_BYTES = 100 * 1024;
         MAX_PENDING_EVENTS_KEEP = 50;
       }
@@ -39230,7 +39269,7 @@ Next step: ${nextStep}`;
           evidence
         }
       });
-      updateDirectDispatchStatus(args.meshId, args.sessionId, kind === "task_completed" ? "completed" : "failed");
+      updateDirectDispatchStatus(args.meshId, args.sessionId, kind === "task_completed" ? "completed" : "failed", args.taskId);
       markSessionDeliveriesTerminal(args.meshId, args.sessionId, kind === "task_completed" ? "completed" : "failed");
       setImmediate(() => cleanupTerminalDirectDispatches());
       queuePendingMeshCoordinatorEvent({
@@ -39516,8 +39555,8 @@ Next step: ${nextStep}`;
       if (x instanceof RegExp) return x;
       if (x && typeof x === "object" && typeof x.source === "string") {
         try {
-          const s = x;
-          return new RegExp(s.source, s.flags || "");
+          const s2 = x;
+          return new RegExp(s2.source, s2.flags || "");
         } catch {
           return null;
         }
@@ -40091,6 +40130,36 @@ Next step: ${nextStep}`;
         UNRESOLVED_FORWARD_MAX_AGE_MS = 30 * 60 * 1e3;
       }
     });
+    function s(v) {
+      return typeof v === "string" && v.trim() ? v.trim() : "";
+    }
+    function meshEventTraceKey(ctx) {
+      const segs = [`task=${s(ctx.taskId) || "-"}`];
+      const eventId = s(ctx.eventId);
+      if (eventId) segs.push(`evt=${eventId}`);
+      segs.push(`sess=${s(ctx.sessionId) || "-"}`);
+      const nodeId = s(ctx.nodeId);
+      if (nodeId) segs.push(`node=${nodeId}`);
+      const meshId = s(ctx.meshId);
+      if (meshId) segs.push(`mesh=${meshId}`);
+      const event = s(ctx.event);
+      if (event) segs.push(`event=${event}`);
+      return segs.join(" ");
+    }
+    function traceMeshEventStage(stage, ctx, detail) {
+      LOG2.info(CAT, `[stage:${stage}] ${meshEventTraceKey(ctx)}${detail ? ` \u2014 ${detail}` : ""}`);
+    }
+    function traceMeshEventDrop(reason, ctx, detail) {
+      LOG2.warn(CAT, `[drop:${reason}] ${meshEventTraceKey(ctx)}${detail ? ` \u2014 ${detail}` : ""}`);
+    }
+    var CAT;
+    var init_mesh_event_trace = __esm2({
+      "src/mesh/mesh-event-trace.ts"() {
+        "use strict";
+        init_logger();
+        CAT = "EvtTrace";
+      }
+    });
     function isPlainObject22(value) {
       return !!value && typeof value === "object" && !Array.isArray(value);
     }
@@ -41884,9 +41953,9 @@ ${cleanBody}`;
     }
     function buildSessionEntries(allStates, cdpManagers, options = {}) {
       const sessions = [];
-      const ideStates = allStates.filter((s) => s.category === "ide");
-      const cliStates = allStates.filter((s) => s.category === "cli");
-      const acpStates = allStates.filter((s) => s.category === "acp");
+      const ideStates = allStates.filter((s2) => s2.category === "ide");
+      const cliStates = allStates.filter((s2) => s2.category === "cli");
+      const acpStates = allStates.filter((s2) => s2.category === "acp");
       for (const state of ideStates) {
         sessions.push(buildWorkspaceSession(state, cdpManagers, options));
         for (const ext of state.extensions) {
@@ -42370,6 +42439,15 @@ ${cleanBody}`;
       meshByWorkspaceCache.set(workspace, { mesh, cachedAt: now });
       return mesh;
     }
+    function recoverMeshIdByNodeId(nodeId) {
+      if (!nodeId) return "";
+      for (const mesh of listMeshes()) {
+        if (Array.isArray(mesh.nodes) && mesh.nodes.some((n) => meshNodeIdMatches(n, nodeId))) {
+          return readNonEmptyString2(mesh.id);
+        }
+      }
+      return "";
+    }
     function __resetIdleAutoFastForwardForTests() {
       idleAutoFastForwardLastAttempt.clear();
     }
@@ -43272,6 +43350,13 @@ ${cleanBody}`;
     function injectMeshSystemMessage(components, args) {
       const eventSessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
       const eventNodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
+      const traceCtx = {
+        taskId: args.metadataEvent.taskId,
+        sessionId: eventSessionId,
+        nodeId: eventNodeId,
+        meshId: args.meshId,
+        event: args.event
+      };
       const sourceSession = args.sourceInstanceId ? components.instanceManager.getInstance(args.sourceInstanceId) : void 0;
       const workerCoordinatorDaemonId = readNonEmptyString2(
         sourceSession?.getState()?.settings?.meshCoordinatorDaemonId
@@ -43325,6 +43410,7 @@ ${cleanBody}`;
           }
         }
         LOG2.info("MeshEvents", `Suppressed ${args.event} for intentionally cleanup-stopped session ${eventSessionId || "(unknown session)"}`);
+        traceMeshEventDrop("intentional_cleanup_stop", traceCtx);
         return { success: true, forwarded: 0, suppressed: true, intentionalCleanupStop: true };
       }
       if (args.event === "monitor:no_progress") {
@@ -43345,6 +43431,7 @@ ${cleanBody}`;
         }
         if (reconciledCompletion?.source === "no_progress_terminal_ledger_suppression") {
           LOG2.info("MeshEvents", `Suppressed no-progress monitor because terminal ledger evidence already exists for session ${eventSessionId || "(unknown session)"}`);
+          traceMeshEventDrop("no_progress_terminal_ledger_suppression", traceCtx, `terminalKind=${reconciledCompletion.terminalLedgerKind}`);
           return {
             success: true,
             forwarded: 0,
@@ -43356,6 +43443,7 @@ ${cleanBody}`;
       }
       if (isDuplicateRefineTerminalEvent(args.meshId, args.event, args.metadataEvent)) {
         LOG2.info("MeshEvents", `Suppressed duplicate ${args.event} for refine job ${readRefineJobId({ metadataEvent: args.metadataEvent })}`);
+        traceMeshEventDrop("duplicate_refine_terminal", traceCtx);
         return { success: true, forwarded: 0, suppressed: true, duplicateRefineTerminalEvent: true };
       }
       const eventTimestamp = readEventTimestamp(args.metadataEvent.timestamp);
@@ -43370,6 +43458,7 @@ ${cleanBody}`;
         });
         if (duplicateApproval) {
           LOG2.info("MeshEvents", `Suppressed duplicate approval event for mesh ${args.meshId} session ${eventSessionId}`);
+          traceMeshEventDrop("duplicate_approval", traceCtx);
           return { success: true, forwarded: 0, suppressed: true, duplicateApproval: true };
         }
       }
@@ -43389,6 +43478,7 @@ ${cleanBody}`;
             const eventFinalSummary = readNonEmptyString2(args.metadataEvent.finalSummary);
             if (terminalProviderSessionId && terminalProviderSessionId === eventProviderSessionId || terminalFinalSummary && terminalFinalSummary === eventFinalSummary || args.metadataEvent.source === "no_progress_reconciliation") {
               LOG2.info("MeshEvents", `Suppressed duplicate completion with existing terminal ledger evidence for mesh ${args.meshId} session ${eventSessionId}`);
+              traceMeshEventDrop("duplicate_completion_terminal_ledger", traceCtx);
               return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true, terminalLedgerEvidence: true };
             }
           }
@@ -43407,6 +43497,7 @@ ${cleanBody}`;
         });
         if (duplicateCompletion) {
           LOG2.info("MeshEvents", `Suppressed duplicate completion for mesh ${args.meshId} session ${eventSessionId}`);
+          traceMeshEventDrop("duplicate_completion", traceCtx);
           return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true };
         }
       }
@@ -43425,6 +43516,7 @@ ${cleanBody}`;
         });
         if (duplicateStopped) {
           LOG2.info("MeshEvents", `Suppressed duplicate stopped event for mesh ${args.meshId} session ${eventSessionId}`);
+          traceMeshEventDrop("duplicate_stopped", traceCtx);
           return { success: true, forwarded: 0, suppressed: true, duplicateStopped: true };
         }
       }
@@ -43436,7 +43528,7 @@ ${cleanBody}`;
         });
         const leaveDirectDispatchActive = !task && opts?.tentativeIfDirect === true;
         if (!leaveDirectDispatchActive) {
-          updateDirectDispatchStatus(args.meshId, sessionId, outcome);
+          updateDirectDispatchStatus(args.meshId, sessionId, outcome, eventTaskId);
         }
         markSessionDeliveriesTerminal(args.meshId, sessionId, outcome);
         setImmediate(() => cleanupTerminalDirectDispatches());
@@ -43449,7 +43541,7 @@ ${cleanBody}`;
         const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
         const providerType = readNonEmptyString2(args.metadataEvent.providerType);
         if (sessionId) {
-          directDispatchTaskIdForLedger = resolveActiveDirectDispatchTaskId(args.meshId, sessionId);
+          directDispatchTaskIdForLedger = readNonEmptyString2(args.metadataEvent.taskId) || resolveActiveDirectDispatchTaskId(args.meshId, sessionId);
           const isFalseIdle = isFalseIdleCompletion(args.metadataEvent);
           completedTaskForLedger = markSessionTerminal(sessionId, "completed", eventTimestamp, { tentativeIfDirect: isFalseIdle });
           if (nodeId && providerType) {
@@ -43532,7 +43624,8 @@ ${cleanBody}`;
           }
         }
         if (sessionId) {
-          updateDirectDispatchStatus(args.meshId, sessionId, "acked");
+          const startedTaskId = readNonEmptyString2(args.metadataEvent.taskId) || void 0;
+          updateDirectDispatchStatus(args.meshId, sessionId, "acked", startedTaskId);
           const activeDeliveries = (() => {
             try {
               return MeshRuntimeStore.getInstance().getActiveSessionDeliveries(args.meshId, sessionId);
@@ -43540,7 +43633,8 @@ ${cleanBody}`;
               return [];
             }
           })();
-          for (const d of activeDeliveries) {
+          const deliveriesToAck = startedTaskId ? activeDeliveries.filter((d) => d.taskId === startedTaskId) : activeDeliveries;
+          for (const d of deliveriesToAck) {
             updateSessionDeliveryStatus(d.id, "acked");
           }
         }
@@ -43554,7 +43648,7 @@ ${cleanBody}`;
           }
         }
         if (sessionId) {
-          directDispatchTaskIdForLedger = resolveActiveDirectDispatchTaskId(args.meshId, sessionId);
+          directDispatchTaskIdForLedger = readNonEmptyString2(args.metadataEvent.taskId) || resolveActiveDirectDispatchTaskId(args.meshId, sessionId);
           completedTaskForLedger = markSessionTerminal(sessionId, "failed");
         }
       }
@@ -43700,6 +43794,9 @@ ${cleanBody}`;
       };
       if (queuePendingMeshCoordinatorEvent(pendingEvent)) {
         LOG2.info("MeshEvents", `Queued ${args.event} for coordinator (mesh ${args.meshId}${workerCoordinatorDaemonId ? `, coordinator daemon ${workerCoordinatorDaemonId}` : ""}${workerCoordinatorSessionId ? `, coordinator session ${workerCoordinatorSessionId}` : ""})`);
+        traceMeshEventStage("queued", traceCtx, workerCoordinatorDaemonId ? `coordinatorDaemon=${workerCoordinatorDaemonId}` : "broadcast");
+      } else {
+        traceMeshEventDrop("queue_dedup", traceCtx);
       }
       return { success: true, forwarded: 0 };
     }
@@ -43710,8 +43807,23 @@ ${cleanBody}`;
       }
       const nodeId = readNonEmptyString2(payload.nodeId);
       const workspace = readNonEmptyString2(payload.workspace);
-      const meshId = readNonEmptyString2(payload.meshId) || (workspace ? readNonEmptyString2(getCachedMeshByWorkspace(workspace)?.id) : "");
-      if (!meshId) return { success: false, error: "meshId required" };
+      const meshId = readNonEmptyString2(payload.meshId) || (workspace ? readNonEmptyString2(getCachedMeshByWorkspace(workspace)?.id) : "") || recoverMeshIdByNodeId(nodeId);
+      if (!meshId) {
+        traceMeshEventDrop("meshId_required", {
+          taskId: payload.taskId,
+          sessionId: readNonEmptyString2(payload.targetSessionId) || readNonEmptyString2(payload.sessionId),
+          nodeId,
+          event: eventName
+        }, workspace ? `workspace=${workspace} unresolved` : "no workspace/nodeId");
+        return { success: false, error: "meshId required" };
+      }
+      traceMeshEventStage("received", {
+        taskId: payload.taskId,
+        sessionId: readNonEmptyString2(payload.targetSessionId) || readNonEmptyString2(payload.sessionId),
+        nodeId,
+        meshId,
+        event: eventName
+      });
       const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
       const relayModalMessage = readNonEmptyString2(payload.modalMessage);
       const relayModalButtons = Array.isArray(payload.modalButtons) ? payload.modalButtons.filter((b) => typeof b === "string" && b.trim().length > 0) : null;
@@ -43792,9 +43904,18 @@ ${cleanBody}`;
         workspace: readNonEmptyString2(routing.workspace) || readNonEmptyString2(event.workspace) || void 0
       };
       const persisted = enqueueUnresolvedDelegateForward(coordinatorDaemonId, eventName, payload);
+      const fwdTraceCtx = {
+        taskId: payload.taskId,
+        sessionId: readNonEmptyString2(payload.targetSessionId) || readNonEmptyString2(payload.sessionId),
+        nodeId: readNonEmptyString2(routing.nodeId) || readNonEmptyString2(event.meshNodeId),
+        event: eventName
+      };
+      traceMeshEventStage("outbox_enqueue", fwdTraceCtx, `coordinatorDaemon=${coordinatorDaemonId} meshId=absent`);
+      traceMeshEventStage("forward_send", fwdTraceCtx, "immediate push");
       Promise.resolve(components.dispatchMeshCommand(coordinatorDaemonId, "mesh_forward_event", payload)).then((result) => {
         if (result && result.success === false) {
           LOG2.warn("MeshEvents", `Immediate forward of ${eventName} to coordinator ${coordinatorDaemonId} rejected (${readNonEmptyString2(result.error) || "no reason"}) \u2014 left queued for retry`);
+          traceMeshEventDrop("immediate_forward_rejected", fwdTraceCtx, readNonEmptyString2(result.error) || "no reason");
           return;
         }
         if (persisted) ackUnresolvedDelegateForwardByFingerprint(coordinatorDaemonId, eventName, payload);
@@ -43862,6 +43983,14 @@ ${cleanBody}`;
           if (isUnroutableDelegateRejection(routing) && forwardUnresolvedDelegateEvent(components, routing, event)) {
             return;
           }
+          if (isUnroutableDelegateRejection(routing)) {
+            traceMeshEventDrop("unroutable", {
+              taskId: event.meshActiveTaskId ?? event.taskId,
+              sessionId: routing.sessionId,
+              nodeId: routing.nodeId,
+              event: event.event
+            }, "no coordinator anchor / mesh_unresolved");
+          }
           recordUnroutableDelegateEvent(routing, event.event);
           return;
         }
@@ -43909,6 +44038,7 @@ ${cleanBody}`;
         init_mesh_events_pending();
         init_mesh_routing();
         init_mesh_unresolved_forward_outbox();
+        init_mesh_event_trace();
         init_snapshot();
         init_repo_mesh_types();
         init_dist();
@@ -44018,6 +44148,13 @@ ${cleanBody}`;
     function injectPendingIntoCoordinator(coordinator, pending) {
       if (!coordinator || !pending.coordinatorMessage) return;
       const force = shouldForceInjectMeshEvent(pending.event);
+      traceMeshEventStage("surfaced", {
+        taskId: pending.metadataEvent?.taskId,
+        sessionId: pending.metadataEvent?.targetSessionId ?? pending.targetCoordinatorSessionId,
+        nodeId: pending.nodeId,
+        meshId: pending.meshId,
+        event: pending.event
+      }, force ? "force-inject" : "inject");
       coordinator.onEvent("send_message", {
         input: { text: pending.coordinatorMessage, textFallback: pending.coordinatorMessage },
         ...force ? { force: true } : {}
@@ -44076,6 +44213,13 @@ ${cleanBody}`;
         });
         if (reclaimed) {
           LOG2.warn("MeshReconcile", `Reclaimed stranded assigned task ${row.id} on mesh ${meshId} (node=${row.assignedNodeId ?? "?"} session=${row.assignedSessionId ?? "?"}, dispatched ${Math.round((nowMs - dispatchedAtMs) / 1e3)}s ago, never confirmed delivered \u2192 ${reclaimed.status})`);
+          traceMeshEventDrop("assigned_stranded_reclaim", {
+            taskId: row.id,
+            sessionId: row.assignedSessionId,
+            nodeId: row.assignedNodeId,
+            meshId,
+            event: "agent:generating_completed"
+          }, `unconfirmed ${Math.round((nowMs - dispatchedAtMs) / 1e3)}s \u2192 ${reclaimed.status}`);
         }
       }
     }
@@ -44235,6 +44379,13 @@ ${cleanBody}`;
         try {
           queuePendingMeshCoordinatorEvent(pending);
           LOG2.info("MeshReconcile", `Strict route hold: coordinator session ${wantSession} not live on mesh ${meshId} \u2014 re-queued (${pending.event})`);
+          traceMeshEventDrop("strict_route_hold", {
+            taskId: pending.metadataEvent?.taskId,
+            sessionId: pending.metadataEvent?.targetSessionId ?? wantSession,
+            nodeId: pending.nodeId,
+            meshId,
+            event: pending.event
+          }, `coordinatorSession=${wantSession} not live`);
         } catch (e) {
           LOG2.warn("MeshReconcile", `Strict route re-queue failed for ${pending.event} on mesh ${meshId}: ${e?.message || e}`);
         }
@@ -44258,6 +44409,13 @@ ${cleanBody}`;
           }
         });
         LOG2.warn("MeshReconcile", `Strict route expire: coordinator session ${wantSession} never returned for mesh ${meshId} \u2014 recorded to ledger (recoverable), dropped (${pending.event})`);
+        traceMeshEventDrop("strict_route_expired", {
+          taskId: pending.metadataEvent?.taskId,
+          sessionId: pending.metadataEvent?.targetSessionId ?? wantSession,
+          nodeId: pending.nodeId,
+          meshId,
+          event: pending.event
+        }, `coordinatorSession=${wantSession} never returned`);
       } catch (e) {
         LOG2.warn("MeshReconcile", `Failed to ledger-expire strict-unmatched ${pending.event} for mesh ${meshId}: ${e?.message || e}`);
       }
@@ -44269,15 +44427,24 @@ ${cleanBody}`;
       const entries = peekUnresolvedDelegateForwards();
       if (entries.length === 0) return;
       for (const entry of entries) {
+        const entryTraceCtx = {
+          taskId: entry.payload.taskId,
+          sessionId: readNonEmptyString2(entry.payload.targetSessionId) || readNonEmptyString2(entry.payload.sessionId),
+          nodeId: readNonEmptyString2(entry.payload.nodeId),
+          event: readNonEmptyString2(entry.payload.event)
+        };
         let result;
         try {
+          traceMeshEventStage("forward_send", entryTraceCtx, `retry \u2192 ${entry.coordinatorDaemonId}`);
           result = await dispatchMeshCommand(entry.coordinatorDaemonId, "mesh_forward_event", entry.payload);
         } catch (e) {
           LOG2.warn("MeshReconcile", `Retry forward to coordinator ${entry.coordinatorDaemonId} failed: ${e?.message || e} \u2014 left queued`);
+          traceMeshEventDrop("retry_forward_failed", entryTraceCtx, e?.message || String(e));
           continue;
         }
         if (result && result.success === false) {
           LOG2.warn("MeshReconcile", `Retry forward to coordinator ${entry.coordinatorDaemonId} rejected (${readNonEmptyString2(result.error) || "no reason"}) \u2014 left queued`);
+          traceMeshEventDrop("retry_forward_rejected", entryTraceCtx, readNonEmptyString2(result.error) || "no reason");
           continue;
         }
         ackUnresolvedDelegateForward(entry.id);
@@ -44523,6 +44690,7 @@ ${cleanBody}`;
         init_mesh_events_coordinator();
         init_mesh_unresolved_forward_outbox();
         init_mesh_events_utils();
+        init_mesh_event_trace();
         init_dist();
         init_mesh_work_queue();
         init_mesh_ledger();
@@ -45352,8 +45520,8 @@ ${cleanBody}`;
     }
     function isValidSource(x) {
       if (!x || typeof x !== "object") return false;
-      const s = x;
-      return typeof s.name === "string" && s.name.length > 0 && typeof s.url === "string" && s.url.length > 0 && typeof s.ref === "string" && s.ref.length > 0 && typeof s.addedAt === "string";
+      const s2 = x;
+      return typeof s2.name === "string" && s2.name.length > 0 && typeof s2.url === "string" && s2.url.length > 0 && typeof s2.ref === "string" && s2.ref.length > 0 && typeof s2.addedAt === "string";
     }
     function deriveSourceName(url2) {
       const m = url2.match(/[/:]([^/:]+)\/([^/]+?)(?:\.git)?$/);
@@ -45409,7 +45577,7 @@ ${cleanBody}`;
     }
     function sourcesProviding(category, type) {
       const inventory = inventoryExternalSources();
-      return inventory.filter((s) => (s.providers[category] || []).includes(type)).map((s) => s.sourceName);
+      return inventory.filter((s2) => (s2.providers[category] || []).includes(type)).map((s2) => s2.sourceName);
     }
     function resolveActiveSource(category, type, activeFile) {
       const candidates = sourcesProviding(category, type);
@@ -45617,10 +45785,10 @@ ${cleanBody}`;
       const footers = (spec.withFooter ?? []).map((f) => {
         if (f.kind === "regex") {
           const re = compile2(f.pattern, f.flags ?? "i");
-          return { test: (s) => re.test(s) };
+          return { test: (s2) => re.test(s2) };
         }
         const needle = f.pattern.toLowerCase();
-        return { test: (s) => s.toLowerCase().includes(needle) };
+        return { test: (s2) => s2.toLowerCase().includes(needle) };
       });
       return { prompt, footers };
     }
@@ -46495,7 +46663,7 @@ ${cont}` : cont;
           }
           resolveModal(buttonIndex) {
             const snap = this.transport.getSnapshot();
-            const parseApproval = typeof this.transport.runParseApproval === "function" ? (s) => this.transport.runParseApproval(s.recentOutputBuffer.slice(-500)) : (s) => this.runParseApproval(s);
+            const parseApproval = typeof this.transport.runParseApproval === "function" ? (s2) => this.transport.runParseApproval(s2.recentOutputBuffer.slice(-500)) : (s2) => this.runParseApproval(s2);
             let modal = this.activeModal ?? parseApproval(snap);
             if (!modal && this.runner.hasParseSession()) {
               try {
@@ -49181,22 +49349,23 @@ ${lastSnapshot}`;
             const matchesCandidate = (c, i) => c.re.test(lines[i]) && (c.prevRe === null || i > 0 && c.prevRe.test(lines[i - 1])) && (c.nextRe === null || i < total - 1 && c.nextRe.test(lines[i + 1]));
             let idx = -1;
             for (const c of candidates) {
+              let candIdx = -1;
               if (sec.anchor_last) {
                 for (let i = total - 1; i >= 0; i--) {
                   if (matchesCandidate(c, i)) {
-                    idx = i;
+                    candIdx = i;
                     break;
                   }
                 }
               } else {
                 for (let i = 0; i < total; i++) {
                   if (matchesCandidate(c, i)) {
-                    idx = i;
+                    candIdx = i;
                     break;
                   }
                 }
               }
-              if (idx !== -1) break;
+              if (candIdx !== -1 && (idx === -1 || candIdx < idx)) idx = candIdx;
             }
             if (idx !== -1) {
               from = idx;
@@ -49248,7 +49417,7 @@ ${lastSnapshot}`;
     }
     function sectionText(sections, sectionId, fullScreen) {
       if (!sectionId) return fullScreen;
-      const found = sections.find((s) => s.id === sectionId);
+      const found = sections.find((s2) => s2.id === sectionId);
       return found ? found.text : "";
     }
     function isRegexCondition(c) {
@@ -49376,6 +49545,7 @@ ${lastSnapshot}`;
           const idx = Number(m[1]);
           let label = String(m[2] ?? "").trim();
           if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
+          const current = hasCursorMarker(lines[i]);
           let j = i + 1;
           while (j < lines.length) {
             const next = lines[j];
@@ -49387,7 +49557,7 @@ ${lastSnapshot}`;
           }
           if (buttons.some((b) => b.index === idx)) continue;
           const key = keyTemplate.replace(/\{index\}/g, String(idx));
-          buttons.push({ index: idx, label, key });
+          buttons.push({ index: idx, label, key, current });
           i = j - 1;
         }
       } else {
@@ -49399,12 +49569,15 @@ ${lastSnapshot}`;
           if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
           if (buttons.some((b) => b.index === idx)) continue;
           const key = keyTemplate.replace(/\{index\}/g, String(idx));
-          buttons.push({ index: idx, label, key });
+          buttons.push({ index: idx, label, key, current: hasCursorMarker(m[0]) });
         }
       }
       buttons.sort((a, b) => a.index - b.index);
       return buttons;
     }
+    function hasCursorMarker(text) {
+      return /^\s*[❯›>]/.test(text);
+    }
     var init_evaluator = __esm2({
       "src/providers/spec/evaluator.ts"() {
         "use strict";
@@ -49414,10 +49587,10 @@ ${lastSnapshot}`;
       return !!raw && typeof raw === "object" && raw.$schema === "adhdev:cli/spec@4";
     }
     function initialState(spec) {
-      return spec.states.find((s) => s.initial) ?? spec.states[0];
+      return spec.states.find((s2) => s2.initial) ?? spec.states[0];
     }
     function stateById(spec, id) {
-      return spec.states.find((s) => s.id === id);
+      return spec.states.find((s2) => s2.id === id);
     }
     function outgoingTransitions(spec, stateId) {
       const matches = spec.transitions.filter((t) => {
@@ -49504,7 +49677,17 @@ ${lastSnapshot}`;
         const result = evaluateCondition(cond, sections, fullScreen, cursor, prevLines, legacyTrace, stateId);
         const kind = isRegex(cond) ? "regex" : "changed";
         const detail = isRegex(cond) ? `${cond.section ?? "*"}~/${cond.matches}/` : `cursor_above=${cond.cursor_above} changed=${cond.changed}`;
-        return { kind, result, detail };
+        let matchedText;
+        if (result && isRegex(cond)) {
+          try {
+            const hay = sectionText(sections, cond.section, fullScreen);
+            const re = new RegExp(cond.matches, cond.flags ?? "i");
+            const m = re.exec(hay);
+            if (m && m[0]) matchedText = m[0].replace(/\s+/g, " ").trim().slice(0, 160);
+          } catch {
+          }
+        }
+        return matchedText ? { kind, result, detail, matchedText } : { kind, result, detail };
       }
       return { kind: "all", result: false, detail: "unknown condition" };
     }
@@ -49617,17 +49800,17 @@ ${lastSnapshot}`;
       }
       const ids = /* @__PURE__ */ new Set();
       let initialCount = 0;
-      for (const [i, s] of spec.states.entries()) {
-        if (!s.id) {
+      for (const [i, s2] of spec.states.entries()) {
+        if (!s2.id) {
           errs.push(`states[${i}].id is required`);
           continue;
         }
-        if (ids.has(s.id)) errs.push(`states[${i}].id "${s.id}" is duplicated`);
-        ids.add(s.id);
-        if (!s.label) errs.push(`states[${i}].label is required`);
-        if (s.initial) initialCount += 1;
-        if (s.status && !["idle", "generating", "approval"].includes(s.status)) {
-          errs.push(`states[${i}].status "${s.status}" must be idle|generating|approval`);
+        if (ids.has(s2.id)) errs.push(`states[${i}].id "${s2.id}" is duplicated`);
+        ids.add(s2.id);
+        if (!s2.label) errs.push(`states[${i}].label is required`);
+        if (s2.initial) initialCount += 1;
+        if (s2.status && !["idle", "generating", "approval"].includes(s2.status)) {
+          errs.push(`states[${i}].status "${s2.status}" must be idle|generating|approval`);
         }
       }
       if (initialCount === 0) errs.push("exactly one state must have initial:true (none found)");
@@ -49643,10 +49826,10 @@ ${lastSnapshot}`;
         else if (!ids.has(t.to)) errs.push(`transitions[${i}].to references unknown state "${t.to}"`);
         if (t.when) errs.push(...validateCondition(t.when, sectionIds, `transitions[${i}].when`));
       }
-      for (const [i, s] of spec.states.entries()) {
-        const sec = s.extract?.title?.section;
+      for (const [i, s2] of spec.states.entries()) {
+        const sec = s2.extract?.title?.section;
         if (sec && !sectionIds.has(sec)) errs.push(`states[${i}].extract.title.section "${sec}" unknown`);
-        const bsec = s.extract?.buttons?.section;
+        const bsec = s2.extract?.buttons?.section;
         if (bsec && !sectionIds.has(bsec)) errs.push(`states[${i}].extract.buttons.section "${bsec}" unknown`);
       }
       return errs;
@@ -62273,10 +62456,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const path422 = require("path");
         const { spawnSync: spawnSync2 } = require("child_process");
         const file2 = ext.loadExternalSources();
-        if (file2.sources.some((s) => s.name === requestedName)) {
+        if (file2.sources.some((s2) => s2.name === requestedName)) {
           return { success: false, error: `source name "${requestedName}" is already registered` };
         }
-        if (file2.sources.some((s) => s.url === url2 && s.ref === ref)) {
+        if (file2.sources.some((s2) => s2.url === url2 && s2.ref === ref)) {
           return { success: false, error: `source url+ref already registered (use a different name to track another ref)` };
         }
         const sourceDir = path422.join(ext.externalRoot(), requestedName);
@@ -62338,7 +62521,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const fs322 = require("fs");
         const path422 = require("path");
         const file2 = ext.loadExternalSources();
-        const match = file2.sources.find((s) => s.name === name);
+        const match = file2.sources.find((s2) => s2.name === name);
         if (!match) return { success: false, error: `source "${name}" not registered` };
         const sourceDir = path422.join(ext.externalRoot(), name);
         if (fs322.existsSync(sourceDir)) {
@@ -62350,7 +62533,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         }
         ext.saveExternalSources({
           schema: 1,
-          sources: file2.sources.filter((s) => s.name !== name)
+          sources: file2.sources.filter((s2) => s2.name !== name)
         });
         const active = ext.loadProvidersActive();
         const filteredActive = {};
@@ -62374,10 +62557,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const file2 = ext.loadExternalSources();
         const inventory = ext.inventoryExternalSources();
         const active = ext.loadProvidersActive();
-        const sources = file2.sources.map((s) => {
-          const inv = inventory.find((e) => e.sourceName === s.name);
+        const sources = file2.sources.map((s2) => {
+          const inv = inventory.find((e) => e.sourceName === s2.name);
           return {
-            ...s,
+            ...s2,
             providers: inv?.providers ?? {}
           };
         });
@@ -62544,6 +62727,21 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     var path21 = __toESM2(require("path"));
     init_terminal_screen();
     var import_session_host_core6 = require_dist();
+    var MAX_PTY_EVENTS = 300;
+    var EVENT_CONTENT_CAP = 240;
+    function escapeControl(text) {
+      return String(text).replace(/[\x00-\x1f\x7f]/g, (ch) => {
+        const code = ch.charCodeAt(0);
+        if (ch === "\r") return "\\r";
+        if (ch === "\n") return "\\n";
+        if (ch === "	") return "\\t";
+        if (code === 27) return "\\x1b";
+        return "\\x" + code.toString(16).padStart(2, "0");
+      });
+    }
+    function capPreview(text) {
+      return text.length > EVENT_CONTENT_CAP ? text.slice(0, EVENT_CONTENT_CAP) + `\u2026(+${text.length - EVENT_CONTENT_CAP})` : text;
+    }
     var TerminalAdapter = class {
       constructor(opts, handlers) {
         this.opts = opts;
@@ -62570,6 +62768,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       screenTimer = null;
       tickTimer = null;
       lastScreen = "";
+      /** Debug-only ring buffer of PTY input/output/resize/cursor events. */
+      events = [];
+      lastCursorKey = "";
       start() {
         const env2 = this.opts.envIsComplete ? this.opts.env ?? {} : { ...process.env, ...this.opts.env ?? {} };
         this.pty = this.factory.spawn(this.opts.binary, this.opts.args ?? [], {
@@ -62578,10 +62779,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           cols: this.cols,
           rows: this.rows
         });
+        this.recordEvent("spawn", `${this.opts.binary} (${this.cols}x${this.rows})`);
         this.handlers.init?.({ pid: this.pty.pid });
         this.pty.onData((chunk) => this.onChunk(chunk));
         this.pty.onExit((info) => {
           this.stopTimers();
+          this.recordEvent("exit", `exitCode=${typeof info.exitCode === "number" ? info.exitCode : 0}`);
           this.handlers.on_exit?.({ exitCode: typeof info.exitCode === "number" ? info.exitCode : 0 });
           this.pty = null;
         });
@@ -62592,6 +62795,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       resize(cols, rows) {
         this.cols = cols;
         this.rows = rows;
+        this.recordEvent("resize", `${cols}x${rows}`);
         this.pty?.resize(cols, rows);
         this.screen.resize(rows, cols);
       }
@@ -62612,8 +62816,21 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         return { row: pos.row, col: pos.col };
       }
       send_keys(text) {
+        this.recordEvent("input", capPreview(escapeControl(text)), text.length);
         this.pty?.write(text);
       }
+      /** Debug-only: most-recent PTY input/output/resize/cursor events, oldest
+       *  first. Pure observation — never consulted by the FSM. */
+      getEventTimeline(limit = MAX_PTY_EVENTS) {
+        const n = Math.max(0, Math.min(limit, this.events.length));
+        return this.events.slice(this.events.length - n);
+      }
+      recordEvent(kind, content, bytes) {
+        const ev = { ts: Date.now(), kind, content };
+        if (typeof bytes === "number") ev.bytes = bytes;
+        this.events.push(ev);
+        if (this.events.length > MAX_PTY_EVENTS) this.events.splice(0, this.events.length - MAX_PTY_EVENTS);
+      }
       kill() {
         this.stopTimers();
         try {
@@ -62624,6 +62841,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         this.screen.dispose();
       }
       onChunk(chunk) {
+        this.recordEvent("output", capPreview(escapeControl(chunk)), chunk.length);
         try {
           this.handlers.on_pty_data?.(chunk);
         } catch {
@@ -62633,6 +62851,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         this.screenTimer = setTimeout(() => {
           this.screenTimer = null;
           const snap = this.computeScreen();
+          const cur = this.screen.getCursorPosition();
+          const curKey = `${cur.row},${cur.col}`;
+          if (curKey !== this.lastCursorKey) {
+            this.lastCursorKey = curKey;
+            this.recordEvent("cursor", `(${cur.row},${cur.col})`);
+          }
           if (snap === this.lastScreen) return;
           this.lastScreen = snap;
           try {
@@ -62711,20 +62935,40 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       }
     }
     init_logger();
-    function countNewlines(s) {
+    function countNewlines(s2) {
       let n = 0;
-      for (let i = 0; i < s.length; i += 1) if (s.charCodeAt(i) === 10) n += 1;
+      for (let i = 0; i < s2.length; i += 1) if (s2.charCodeAt(i) === 10) n += 1;
       return n;
     }
     var SUBMIT_DELAY_FLOOR_MS = 200;
     var WIN32_SUBMIT_RESEND_GAP_MS = 350;
     var WIN32_SUBMIT_MAX_RESENDS = 14;
+    var WIN32_SUBMIT_SETTLE_MS = 500;
+    var WIN32_SUBMIT_MAX_SETTLE_WAIT_MS = 1e4;
+    var WIN32_SUBMIT_SETTLE_POLL_MS = 120;
+    var WIN32_PTY_WRITE_CHUNK_CHARS = 1024;
+    var WIN32_PTY_WRITE_CHUNK_GAP_MS = 8;
     function resolveSubmitDelayMs(specBeforeSubmit, text) {
       const lines = countNewlines(text);
       const linesBonus = Math.min(800, lines * 80);
       const spec = typeof specBeforeSubmit === "number" && specBeforeSubmit > 0 ? specBeforeSubmit : 0;
       return Math.max(spec, SUBMIT_DELAY_FLOOR_MS + linesBonus);
     }
+    function chunkPreservingSurrogates(text, size) {
+      const chunks = [];
+      let offset = 0;
+      while (offset < text.length) {
+        let end = Math.min(text.length, offset + size);
+        if (end < text.length) {
+          const code = text.charCodeAt(end - 1);
+          if (code >= 55296 && code <= 56319) end -= 1;
+        }
+        if (end <= offset) end = Math.min(text.length, offset + size);
+        chunks.push(text.slice(offset, end));
+        offset = end;
+      }
+      return chunks;
+    }
     function guessExt(mime) {
       if (/png/i.test(mime)) return ".png";
       if (/jpe?g/i.test(mime)) return ".jpg";
@@ -62740,7 +62984,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           this.buildAdapterOpts(),
           {
             init: () => this.emitInitialState(),
-            on_pty_data: (chunk) => this.emit({ kind: "pty_data", chunk }),
+            on_pty_data: (chunk) => {
+              this.lastPtyDataAt = Date.now();
+              this.emit({ kind: "pty_data", chunk });
+            },
             on_screen_changed: () => this.reevaluate(),
             on_exit: ({ exitCode }) => this.handleExit(exitCode)
           }
@@ -62774,6 +63021,16 @@ ${formatManifestValidationIssues2(validation.issues)}`,
        *  WIN32_SUBMIT_* and scheduleWin32Submit). Re-arms itself until the FSM
        *  leaves idle (submitted) or the resend budget is spent. */
       win32SubmitTimer = null;
+      /** Wall-clock (ms) of the most recent raw PTY output chunk. Advances on every
+       *  on_pty_data — including the echo of text written into the composer — so the
+       *  win32 submit settle-gate can tell when input has finished landing. */
+      lastPtyDataAt = 0;
+      /** Wall-clock (ms) of the most recent win32 message-body input write. Bridges
+       *  the gap between writing a chunk and its echo so the settle-gate does not
+       *  declare "quiet" mid-write. */
+      lastWin32WriteAt = 0;
+      /** Pending paced chunk-write timer for a large win32 body (see writeWin32Body). */
+      win32WriteTimer = null;
       currentEval = null;
       stateHistory = [];
       prevStateAt = 0;
@@ -62894,6 +63151,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           clearTimeout(this.win32SubmitTimer);
           this.win32SubmitTimer = null;
         }
+        if (this.win32WriteTimer) {
+          clearTimeout(this.win32WriteTimer);
+          this.win32WriteTimer = null;
+        }
         this.specWatcher?.close();
         this.adapter.kill();
       }
@@ -62924,11 +63185,15 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       getFsmSnapshotHistory() {
         return this.fsmSnapshotHistory;
       }
+      /** Debug-only PTY input/output/resize/cursor timeline from the adapter. */
+      getEventTimeline(limit) {
+        return this.adapter.getEventTimeline(limit);
+      }
       getSections() {
         try {
           const screen = this.adapter.snapshot();
           const lines = screen.split("\n").map((l) => l.endsWith("\r") ? l.slice(0, -1) : l);
-          return resolveSections(this.spec.sections ?? {}, lines).map((s) => ({ id: s.id, text: s.text }));
+          return resolveSections(this.spec.sections ?? {}, lines).map((s2) => ({ id: s2.id, text: s2.text }));
         } catch {
           return null;
         }
@@ -63306,7 +63571,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const perChar = sm.delay_ms_per_char ?? 0;
         const beforeSubmit = resolveSubmitDelayMs(sm.delay_ms_before_submit, text);
         if (process.platform === "win32") {
-          this.adapter.send_keys(text);
+          this.writeWin32Body(text);
           this.scheduleWin32Submit(sm.submit_key, beforeSubmit);
           return;
         }
@@ -63332,20 +63597,72 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const st = stateById(this.spec, this.currentStateId);
         return st ? statusForState(st) : "idle";
       }
+      /** Record a win32 body write so the settle-gate counts it as input activity
+       *  even before the echo arrives. */
+      markWin32Write() {
+        this.lastWin32WriteAt = Date.now();
+      }
+      /** Most recent win32 input activity — a write we issued OR a PTY output chunk
+       *  (echo). The submit settle-gate waits for this to go quiet. */
+      lastWin32InputActivityAt() {
+        return Math.max(this.lastPtyDataAt, this.lastWin32WriteAt);
+      }
       /**
-       * win32 verification-based submit. Sends the submit key, waits a gap, and if
-       * the FSM is still 'idle' (the prompt did not submit — the CR was absorbed as
-       * a multiline-paste newline) resends, up to WIN32_SUBMIT_MAX_RESENDS. The
-       * first CR always fires (so a stale/edge status never suppresses the submit);
-       * subsequent resends are gated on still being idle, and stop the instant the
-       * agent leaves idle (submitted → generating / approval). This converges the
-       * nondeterministic multiline window without spamming Enter into the next turn.
+       * Write the message body to the PTY for win32, paced into bounded chunks. A
+       * single unbounded ConPTY write can overflow the input pipe and drop leading
+       * bytes; splitting it with a short inter-chunk gap keeps the console input
+       * buffer from overflowing. Small bodies still go out in a single write. Each
+       * chunk advances lastWin32WriteAt so the submit settle-gate keeps waiting until
+       * the final chunk is out and echoed.
+       */
+      writeWin32Body(text) {
+        if (this.win32WriteTimer) {
+          clearTimeout(this.win32WriteTimer);
+          this.win32WriteTimer = null;
+        }
+        if (text.length <= WIN32_PTY_WRITE_CHUNK_CHARS) {
+          this.markWin32Write();
+          this.adapter.send_keys(text);
+          return;
+        }
+        const chunks = chunkPreservingSurrogates(text, WIN32_PTY_WRITE_CHUNK_CHARS);
+        let idx = 0;
+        const writeNext = () => {
+          this.win32WriteTimer = null;
+          if (idx >= chunks.length) return;
+          this.markWin32Write();
+          this.adapter.send_keys(chunks[idx]);
+          idx += 1;
+          if (idx < chunks.length) {
+            this.win32WriteTimer = setTimeout(writeNext, WIN32_PTY_WRITE_CHUNK_GAP_MS);
+          }
+        };
+        writeNext();
+      }
+      /**
+       * win32 submit. Two phases:
+       *
+       *  Phase 1 (settle-gate): hold the first CR until the PTY output has been quiet
+       *  for WIN32_SUBMIT_SETTLE_MS after the last input write — i.e. the full
+       *  (possibly multi-KB / multiline) body has finished arriving in the composer
+       *  and echoing. Honors an initial minimum delay and is bounded by
+       *  WIN32_SUBMIT_MAX_SETTLE_WAIT_MS so a noisy screen can never hang the submit.
+       *  This is what stops a long message from being submitted half-arrived (its
+       *  leading lines lost). A short message settles almost immediately.
+       *
+       *  Phase 2 (verified resend — unchanged): send the submit key, wait a gap, and
+       *  if the FSM is still 'idle' (the CR was absorbed as a multiline-paste
+       *  newline) resend, up to WIN32_SUBMIT_MAX_RESENDS. The first CR always fires
+       *  (a stale/edge status never suppresses it); resends are gated on still being
+       *  idle and stop the instant the agent leaves idle (submitted → generating /
+       *  approval). This preserves the win32 lone-CR-swallow handling.
        */
       scheduleWin32Submit(submitKey, initialDelayMs) {
         if (this.win32SubmitTimer) {
           clearTimeout(this.win32SubmitTimer);
           this.win32SubmitTimer = null;
         }
+        const startedAt = Date.now();
         const fire = (attempt) => {
           this.win32SubmitTimer = null;
           this.adapter.send_keys(submitKey);
@@ -63358,8 +63675,20 @@ ${formatManifestValidationIssues2(validation.issues)}`,
             fire(attempt + 1);
           }, WIN32_SUBMIT_RESEND_GAP_MS);
         };
-        if (initialDelayMs > 0) this.win32SubmitTimer = setTimeout(() => fire(0), initialDelayMs);
-        else fire(0);
+        const waitForSettle = () => {
+          this.win32SubmitTimer = null;
+          const now = Date.now();
+          const quietFor = now - this.lastWin32InputActivityAt();
+          const waited = now - startedAt;
+          if (quietFor >= WIN32_SUBMIT_SETTLE_MS || waited >= WIN32_SUBMIT_MAX_SETTLE_WAIT_MS) {
+            fire(0);
+            return;
+          }
+          const recheckIn = Math.min(WIN32_SUBMIT_SETTLE_MS - quietFor, WIN32_SUBMIT_SETTLE_POLL_MS);
+          this.win32SubmitTimer = setTimeout(waitForSettle, Math.max(recheckIn, 30));
+        };
+        if (initialDelayMs > 0) this.win32SubmitTimer = setTimeout(waitForSettle, initialDelayMs);
+        else waitForSettle();
       }
       handleClickControl(controlId, payload) {
         const ctl = (this.spec.control_bar ?? []).find((c) => c.id === controlId);
@@ -63394,6 +63723,19 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (!m) return;
         const btn = m.buttons.find((b) => b.index === index);
         if (!btn) return;
+        const rule = stateById(this.spec, this.currentStateId)?.extract?.buttons;
+        if (rule?.select_mode === "arrow_keys") {
+          const from = m.buttons.find((b) => b.current)?.index ?? 1;
+          const up = rule.cursor_keys?.up ?? "\x1B[A";
+          const down = rule.cursor_keys?.down ?? "\x1B[B";
+          const delta = btn.index - from;
+          const step = delta >= 0 ? down : up;
+          const nav = step.repeat(Math.abs(delta));
+          const confirm = (rule.key_for_index || "\r").replace(/\{index\}/g, "") || "\r";
+          if (nav) this.adapter.send_keys(nav);
+          this.adapter.send_keys(confirm);
+          return;
+        }
         this.adapter.send_keys(btn.key);
       }
       handleAttachImage(blob, mime) {
@@ -63472,7 +63814,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       return out;
     }
     function flattenCond(c, out, depth) {
-      out.push(`${"  ".repeat(depth)}${c.kind} ${c.detail} = ${c.result}${c.remainingMs ? ` (${c.remainingMs}ms left)` : ""}`);
+      const matched = c.matchedText ? ` matched=${JSON.stringify(c.matchedText)}` : "";
+      out.push(`${"  ".repeat(depth)}${c.kind} ${c.detail} = ${c.result}${c.remainingMs ? ` (${c.remainingMs}ms left)` : ""}${matched}`);
       for (const child of c.children ?? []) flattenCond(child, out, depth + 1);
     }
     function findStable(c) {
@@ -64188,8 +64531,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       }
       return null;
     }
-    function oneLine(s, max) {
-      const flat = s.replace(/\s+/g, " ").trim();
+    function oneLine(s2, max) {
+      const flat = s2.replace(/\s+/g, " ").trim();
       return flat.length > max ? flat.slice(0, max - 1) + "\u2026" : flat;
     }
     function parseTimestamp(v) {
@@ -64209,10 +64552,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       return null;
     }
     function normalizeRole(r) {
-      const s = String(r ?? "").toLowerCase();
-      if (s === "user" || s === "human" || s === "user_explicit") return "user";
-      if (s === "assistant" || s === "ai" || s === "model") return "assistant";
-      if (s === "tool" || s === "tool_result" || s === "function") return "assistant";
+      const s2 = String(r ?? "").toLowerCase();
+      if (s2 === "user" || s2 === "human" || s2 === "user_explicit") return "user";
+      if (s2 === "assistant" || s2 === "ai" || s2 === "model") return "assistant";
+      if (s2 === "tool" || s2 === "tool_result" || s2 === "function") return "assistant";
       return "system";
     }
     function stringifyContent(v) {
@@ -64260,18 +64603,18 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       return (record2) => ors.some((ands) => ands.every((t) => evalTerm(t, record2)));
     }
     function parseTerm(src) {
-      let s = src.trim();
+      let s2 = src.trim();
       let negate = false;
-      if (s.startsWith("!")) {
+      if (s2.startsWith("!")) {
         negate = true;
-        s = s.slice(1).trim();
+        s2 = s2.slice(1).trim();
       }
-      const fnMatch = s.match(/^(startsWith|endsWith|contains)\s*\(\s*(.+?)\s*,\s*(.+?)\s*\)$/);
+      const fnMatch = s2.match(/^(startsWith|endsWith|contains)\s*\(\s*(.+?)\s*,\s*(.+?)\s*\)$/);
       if (fnMatch) {
         const [, op2, pathExpr, litExpr] = fnMatch;
         return { path: pathExpr, op: op2, lit: parseLiteral(litExpr), negate };
       }
-      const opMatch = s.match(/^(.+?)\s*(==|!=|>=|<=|>|<)\s*(.+)$/);
+      const opMatch = s2.match(/^(.+?)\s*(==|!=|>=|<=|>|<)\s*(.+)$/);
       if (!opMatch) return null;
       const [, lhs, op, rhsRaw] = opMatch;
       return { path: lhs.trim(), op, lit: parseLiteral(rhsRaw.trim()), negate };
@@ -64626,9 +64969,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
        * — not this code — decides how a selection is keyed for each CLI.
        */
       async selectPickerChoice(ctl, action, choiceIndex, choiceLabel) {
-        this.driver.dispatch({ kind: "click_control", control_id: ctl.id });
-        await this.waitForPickerRendered(action);
-        const options = this.extractPickerChoices(action);
+        let options = this.extractPickerChoicesIfRendered(action);
+        if (!options) {
+          this.driver.dispatch({ kind: "click_control", control_id: ctl.id });
+          await this.waitForPickerRendered(action);
+          options = this.extractPickerChoices(action);
+        }
         let index = choiceIndex;
         if ((index == null || !Number.isFinite(index)) && choiceLabel) {
           const needle = choiceLabel.trim().toLowerCase();
@@ -64641,8 +64987,27 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (index == null || !Number.isFinite(index)) {
           return { ok: false, error: "choiceIndex or choiceLabel required to select" };
         }
-        const keys = (action.submit_key || "{index}\r").replace(/\{index\}/g, String(index));
-        this.driver.dispatch({ kind: "pty_write", data: keys });
+        if (action.select_mode === "arrow_keys") {
+          const current = options.find((o) => o.current);
+          if (current == null) {
+            return {
+              ok: false,
+              error: "arrow-nav picker: current cursor row not detected on screen",
+              controlResult: { options: options.map((o) => ({ value: o.label, label: o.label, current: o.current })) }
+            };
+          }
+          const up = action.cursor_keys?.up ?? "\x1B[A";
+          const down = action.cursor_keys?.down ?? "\x1B[B";
+          const delta = index - current.index;
+          const step = delta >= 0 ? down : up;
+          const nav = step.repeat(Math.abs(delta));
+          const confirm = (action.submit_key || "\r").replace(/\{index\}/g, "") || "\r";
+          if (nav) this.driver.dispatch({ kind: "pty_write", data: nav });
+          this.driver.dispatch({ kind: "pty_write", data: confirm });
+        } else {
+          const keys = (action.submit_key || "{index}\r").replace(/\{index\}/g, String(index));
+          this.driver.dispatch({ kind: "pty_write", data: keys });
+        }
         const selected = options.find((o) => o.index === index);
         return {
           ok: true,
@@ -64654,6 +65019,20 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           }
         };
       }
+      /** Parse the picker choices only if the picker already appears rendered on
+       *  the live screen (its `wait_for` condition currently matches and at least
+       *  one choice parses). Returns the parsed choices when open, else null so
+       *  the caller knows it must send the trigger to open it. Used to de-dup the
+       *  picker open in {@link selectPickerChoice}. */
+      extractPickerChoicesIfRendered(action) {
+        const wf = action.wait_for;
+        if (wf?.regex) {
+          const re = new RegExp(wf.regex, wf.flags ?? "i");
+          if (!re.test(this.readScreenSectionText(wf.section))) return null;
+        }
+        const options = this.extractPickerChoices(action);
+        return options.length > 0 ? options : null;
+      }
       /** Poll the live screen until the picker's `wait_for` condition matches,
        *  up to a short budget. Returns true if it rendered, false on timeout. */
       async waitForPickerRendered(action) {
@@ -64701,7 +65080,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         try {
           const sections = this.driver.getSections();
           if (sectionId && sections) {
-            const hit = sections.find((s) => s.id === sectionId);
+            const hit = sections.find((s2) => s2.id === sectionId);
             if (hit) return hit.text;
           }
           return this.driver.getScreen();
@@ -64716,7 +65095,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           screen = this.driver.snapshot();
           const driverSections = this.driver.getSections?.();
           if (driverSections) {
-            sections = Object.fromEntries(driverSections.map((s) => [s.id, s.text]));
+            sections = Object.fromEntries(driverSections.map((s2) => [s2.id, s2.text]));
           } else {
             sections = this.readCurrentScreenSections(screen);
           }
@@ -64762,6 +65141,10 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           // answers "why did this rule fire" after the fact, unlike the live
           // `fsm` field which only reflects the current instant.
           fsmHistory: this.driver.getFsmSnapshotHistory?.() ?? null,
+          // PTY input/output/resize/cursor event timeline (debug-only) so the
+          // snapshot shows what we typed / what the PTY printed around each
+          // status transition. Null for drivers without the timeline.
+          eventTimeline: this.driver.getEventTimeline?.() ?? null,
           // Extended fields
           name: this.cliName,
           status: this.getStatus().status,
@@ -65126,6 +65509,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           // v4 FSM transition snapshot history — the captured pre-transition
           // evaluation table at each transition (null for v3 specs).
           fsmHistory: this.driver.getFsmSnapshotHistory?.() ?? null,
+          // PTY input/output/resize/cursor event timeline (debug-only).
+          eventTimeline: this.driver.getEventTimeline?.() ?? null,
           messages,
           committedMessages: messages
         };
@@ -65166,6 +65551,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
       return new ProviderCliAdapter(provider, workingDir, cliArgs, extraEnv, transportFactory);
     }
     init_logger();
+    init_mesh_event_trace();
     init_control_effects();
     init_approval_utils();
     init_provider_patch_state();
@@ -66209,6 +66595,23 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
         this.completedDebounceTimer = setTimeout(() => this.flushCompletedDebounceIfFinalized(), delayMs);
       }
+      // EVTTRACE (observation-only): is this a mesh worker session whose completion
+      // events must route to a coordinator? Used purely to gate trace logging so a
+      // non-mesh CLI session's completions don't add EvtTrace noise. No decision logic.
+      isMeshWorkerSession() {
+        return !!(this.settings.meshNodeFor || this.settings.meshActiveTaskId || this.settings.meshNodeId || this.settings.launchedByCoordinator);
+      }
+      // EVTTRACE correlation context for this session's completion lifecycle. taskId is
+      // the primary grep anchor; instanceId is the session fallback.
+      meshTraceCtx(event = "agent:generating_completed") {
+        return {
+          taskId: this.settings.meshActiveTaskId,
+          sessionId: this.instanceId,
+          nodeId: this.settings.meshNodeId,
+          meshId: this.settings.meshNodeFor,
+          event
+        };
+      }
       flushCompletedDebounceIfFinalized() {
         const pending = this.completedDebouncePending;
         if (!pending) {
@@ -66229,24 +66632,33 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         if (block2) {
           const blockReason = block2.reason;
           const waitedMs = Date.now() - pending.firstObservedAt;
-          LOG2.debug("CLI", `[${this.type}] finalization block: reason=${blockReason} terminal=${block2.terminal} waitedMs=${waitedMs} maxWait=${COMPLETED_FINALIZATION_MAX_WAIT_MS}`);
-          if (block2.terminal && !block2.allowTimeout || waitedMs < COMPLETED_FINALIZATION_MAX_WAIT_MS) {
+          const isTranscriptEvidenceGate = block2.allowTimeout === true;
+          LOG2.debug("CLI", `[${this.type}] finalization block: reason=${blockReason} terminal=${block2.terminal} allowTimeout=${isTranscriptEvidenceGate} waitedMs=${waitedMs} maxWait=${COMPLETED_FINALIZATION_MAX_WAIT_MS}`);
+          if (!isTranscriptEvidenceGate && (block2.terminal || waitedMs < COMPLETED_FINALIZATION_MAX_WAIT_MS)) {
             if (pending.loggedBlockReason !== blockReason) {
               LOG2.info("CLI", `[${this.type}] waiting to emit completed until transcript finalizes (${blockReason})`);
+              if (this.isMeshWorkerSession()) {
+                traceMeshEventDrop("completion_gate_hold", this.meshTraceCtx(), `${blockReason} waited=${waitedMs}ms`);
+              }
               pending.loggedBlockReason = blockReason;
             }
             this.scheduleCompletedDebounceFlush(COMPLETED_FINALIZATION_RETRY_MS);
             return;
           }
+          const emittedAfterFinalizationTimeout = waitedMs >= COMPLETED_FINALIZATION_MAX_WAIT_MS;
           const completionDiagnostic = this.buildCompletedFinalizationDiagnostic({
             blockReason,
             latestStatus,
             latestVisibleStatus,
             waitedMs,
             pending,
-            emittedAfterFinalizationTimeout: true
+            emittedAfterFinalizationTimeout
           });
-          LOG2.warn("CLI", `[${this.type}] emitting completed event after ${waitedMs}ms without finalized assistant turn (${blockReason})`);
+          completionDiagnostic.decoupledImmediateEmit = isTranscriptEvidenceGate && !emittedAfterFinalizationTimeout;
+          LOG2.warn("CLI", `[${this.type}] emitting completed event (${isTranscriptEvidenceGate && !emittedAfterFinalizationTimeout ? "CANON-C decoupled-immediate, transcript pending" : `after ${waitedMs}ms`}) without finalized assistant turn (${blockReason})`);
+          if (this.isMeshWorkerSession()) {
+            traceMeshEventStage("fired", this.meshTraceCtx(), `forced after ${waitedMs}ms (${blockReason})`);
+          }
           this.pushEvent({
             event: "agent:generating_completed",
             chatTitle: pending.chatTitle,
@@ -66269,6 +66681,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           return;
         }
         LOG2.info("CLI", `[${this.type}] completed in ${pending.duration}s`);
+        if (this.isMeshWorkerSession()) {
+          traceMeshEventStage("fired", this.meshTraceCtx(), `duration=${pending.duration}s`);
+        }
         this.pushEvent({
           event: "agent:generating_completed",
           chatTitle: pending.chatTitle,
@@ -66507,6 +66922,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
               if (missingEvidence && !hasMeshContext) {
                 LOG2.info("CLI", `[${this.type}] short completion suppressed: missing final assistant evidence, no mesh context (source=${shortEvidenceSource})`);
               } else {
+                if (this.isMeshWorkerSession()) {
+                  traceMeshEventStage("fired", this.meshTraceCtx(), `short-generating idle (source=${shortEvidenceSource})`);
+                }
                 this.pushEvent({
                   event: "agent:generating_completed",
                   chatTitle,
@@ -66583,6 +67001,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const monitorParsedStatus = parsedStatus;
         for (const me of monitorEvents) {
           if (me.type === "monitor:no_progress" && this.completionHasFinalAssistantMessage(monitorParsedStatus?.messages) && !this.hasAdapterPendingResponse() && !hasNonEmptyCliModalButtons(monitorParsedStatus?.activeModal ?? monitorParsedStatus?.modal)) {
+            if (this.isMeshWorkerSession()) {
+              traceMeshEventStage("fired", this.meshTraceCtx(), "no_progress_monitor_final_summary");
+            }
             this.pushEvent({
               event: "agent:generating_completed",
               chatTitle,
@@ -66623,6 +67044,12 @@ ${formatManifestValidationIssues2(validation.issues)}`,
           workspace: typeof event.workspace === "string" && event.workspace.trim() ? event.workspace : this.workingDir,
           providerSessionId: typeof event.providerSessionId === "string" && event.providerSessionId.trim() ? event.providerSessionId : this.providerSessionId
         };
+        if (this.isMeshWorkerSession() && this.settings.meshActiveTaskId) {
+          const existingTaskId = typeof enrichedEvent.taskId === "string" && enrichedEvent.taskId.trim() ? enrichedEvent.taskId : void 0;
+          if (!existingTaskId) {
+            enrichedEvent.taskId = this.settings.meshActiveTaskId;
+          }
+        }
         if (this.context?.emitProviderEvent) {
           this.context.emitProviderEvent(enrichedEvent);
         } else {
@@ -70422,7 +70849,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
       if (buf.length === 0) return null;
       const strings = extractStringsFromBuffer(buf);
-      const meaningful = strings.filter((s) => s.length >= MIN_PRINTABLE_RUN && /\w/.test(s));
+      const meaningful = strings.filter((s2) => s2.length >= MIN_PRINTABLE_RUN && /\w/.test(s2));
       if (meaningful.length === 0) return null;
       const content = meaningful.join("\n");
       const sourceMtimeMs = statMtimeMs3(filePath);
@@ -70628,10 +71055,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
       };
     }
     function normalizeHermesRole(r) {
-      const s = String(r ?? "").toLowerCase();
-      if (s === "user" || s === "human") return "user";
-      if (s === "assistant" || s === "ai" || s === "model") return "assistant";
-      if (s === "tool" || s === "tool_result" || s === "function") return "assistant";
+      const s2 = String(r ?? "").toLowerCase();
+      if (s2 === "user" || s2 === "human") return "user";
+      if (s2 === "assistant" || s2 === "ai" || s2 === "model") return "assistant";
+      if (s2 === "tool" || s2 === "tool_result" || s2 === "function") return "assistant";
       return "system";
     }
     function createNativeHistoryDispatcher(reader) {
@@ -70855,10 +71282,10 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function normalizeRole2(r) {
-      const s = String(r ?? "").toLowerCase();
-      if (s === "user" || s === "human") return "user";
-      if (s === "assistant" || s === "ai" || s === "model") return "assistant";
-      if (s === "tool" || s === "tool_result" || s === "function") return "assistant";
+      const s2 = String(r ?? "").toLowerCase();
+      if (s2 === "user" || s2 === "human") return "user";
+      if (s2 === "assistant" || s2 === "ai" || s2 === "model") return "assistant";
+      if (s2 === "tool" || s2 === "tool_result" || s2 === "function") return "assistant";
       return "system";
     }
     function registerProviderScriptRootSafely(root) {
@@ -70876,7 +71303,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
         const actionType = ctl?.action?.type;
         if (!id || !actionType) return;
         const label = typeof ctl?.label === "string" && ctl.label.trim() ? ctl.label : id;
-        const visibleWhenState = Array.isArray(ctl?.visible_when_state) ? ctl.visible_when_state.filter((s) => typeof s === "string") : void 0;
+        const visibleWhenState = Array.isArray(ctl?.visible_when_state) ? ctl.visible_when_state.filter((s2) => typeof s2 === "string") : void 0;
         if (actionType === "open_picker") {
           out.push({
             id,
@@ -77762,7 +78189,7 @@ ${mergeTreeErr?.stderr || ""}`;
               const base = validationSummary.failureCode === "missing_dependencies" ? "Refinery validation dependencies are missing; merge/refine was not attempted. Configure validation.bootstrapCommands if Refinery should bootstrap dependencies before validation." : validationSummary.failureCode === "dependency_bootstrap_failed" ? "Refinery dependency/bootstrap command failed; merge/refine was not attempted." : validationSummary.failureCode === "spawn_resolution_failed" ? validationSummary.spawnResolutionError || "Refinery validation command could not be spawned (executable not found); merge/refine was not attempted." : "Refinery validation gate failed; merge/refine was not attempted.";
               if (!firstFailedCmd) return base;
               const cmdName = typeof firstFailedCmd.displayCommand === "string" ? firstFailedCmd.displayCommand : typeof firstFailedCmd.command === "string" ? [firstFailedCmd.command, ...Array.isArray(firstFailedCmd.args) ? firstFailedCmd.args : []].join(" ").trim() : typeof firstFailedCmd.cmd === "string" ? firstFailedCmd.cmd : "";
-              const rawOutput = [firstFailedCmd.stdout, firstFailedCmd.stderr, firstFailedCmd.output].filter((s) => typeof s === "string" && s.length > 0).join("\n");
+              const rawOutput = [firstFailedCmd.stdout, firstFailedCmd.stderr, firstFailedCmd.output].filter((s2) => typeof s2 === "string" && s2.length > 0).join("\n");
               const tail = rawOutput.length > 800 ? rawOutput.slice(-800) : rawOutput;
               return [
                 base,
@@ -78513,7 +78940,7 @@ ${hintLines.join("\n")}` : "",
             convergence = "blocked_review";
           }
           const fbcs = result.finalBranchConvergenceState && typeof result.finalBranchConvergenceState === "object" ? result.finalBranchConvergenceState : void 0;
-          const stage = Array.isArray(result.refineStages) ? result.refineStages.filter((s) => s.status === "failed").map((s) => s.stage).filter(Boolean).pop() : void 0;
+          const stage = Array.isArray(result.refineStages) ? result.refineStages.filter((s2) => s2.status === "failed").map((s2) => s2.stage).filter(Boolean).pop() : void 0;
           results.push({
             nodeId: node.id,
             workspace: node.workspace,
@@ -79510,7 +79937,7 @@ ${hintLines.join("\n")}` : "",
               return {
                 success: true,
                 screenLineCount: lines.length,
-                sections: resolved.map((s) => ({ id: s.id, fromLine: s.fromLine, toLine: s.toLine, text: s.text }))
+                sections: resolved.map((s2) => ({ id: s2.id, fromLine: s2.fromLine, toLine: s2.toLine, text: s2.text }))
               };
             } catch (e) {
               return { success: false, error: `resolve failed: ${e.message}` };
@@ -80079,7 +80506,7 @@ ${hintLines.join("\n")}` : "",
             if (!meshId) return { success: false, error: "meshId required" };
             try {
               const { getMeshQueueStats: getMeshQueueStats2, getQueue: getQueue2, describeTaskDependencyState: describeTaskDependencyState2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
-              const status = Array.isArray(args?.status) ? args.status.map((s) => typeof s === "string" ? s.trim() : "").filter(Boolean) : void 0;
+              const status = Array.isArray(args?.status) ? args.status.map((s2) => typeof s2 === "string" ? s2.trim() : "").filter(Boolean) : void 0;
               const rawQueue = getQueue2(meshId, { status });
               const statusById = new Map(getQueue2(meshId).map((task) => [task.id, task.status]));
               const queue = rawQueue.map((task) => Array.isArray(task.dependsOn) && task.dependsOn.length > 0 ? { ...task, ...describeTaskDependencyState2(task, statusById) } : task);
@@ -80360,7 +80787,7 @@ ${hintLines.join("\n")}` : "",
               nodeDaemonId = typeof node?.daemonId === "string" ? node.daemonId.trim() : void 0;
             }
             const selfDaemonId = this.deps.statusInstanceId;
-            const isRemote = nodeDaemonId && selfDaemonId && nodeDaemonId !== selfDaemonId;
+            const isRemote = nodeDaemonId && selfDaemonId && !daemonIdsEquivalent(nodeDaemonId, selfDaemonId);
             if (isRemote && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
               const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "fast_forward_mesh_node", {
                 ...typeof args === "object" && args !== null ? args : {},
@@ -80394,7 +80821,7 @@ ${hintLines.join("\n")}` : "",
               nodeDaemonId = typeof node?.daemonId === "string" ? node.daemonId.trim() : void 0;
             }
             const selfDaemonId = this.deps.statusInstanceId;
-            const isRemote = nodeDaemonId && selfDaemonId && nodeDaemonId !== selfDaemonId;
+            const isRemote = nodeDaemonId && selfDaemonId && !daemonIdsEquivalent(nodeDaemonId, selfDaemonId);
             if (isRemote && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
               const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "get_mesh_node_logs", {
                 ...typeof args === "object" && args !== null ? args : {},
@@ -80442,7 +80869,7 @@ ${hintLines.join("\n")}` : "",
               const forwardNode = meshRecordForForward?.mesh?.nodes?.find((n) => meshNodeIdMatches(n, nodeId));
               const nodeDaemonId = typeof forwardNode?.daemonId === "string" ? forwardNode.daemonId.trim() : void 0;
               const selfDaemonId = this.deps.statusInstanceId;
-              const isRemote = nodeDaemonId && selfDaemonId && nodeDaemonId !== selfDaemonId;
+              const isRemote = nodeDaemonId && selfDaemonId && !daemonIdsEquivalent(nodeDaemonId, selfDaemonId);
               if (isRemote && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
                 const callerCoordinatorDaemonId = typeof args?.coordinatorDaemonId === "string" && args.coordinatorDaemonId.trim() ? args.coordinatorDaemonId.trim() : void 0;
                 const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "refine_mesh_node", {
@@ -80529,7 +80956,7 @@ ${hintLines.join("\n")}` : "",
               let worktreeCleanup;
               if (node?.isLocalWorktree) {
                 const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : void 0;
-                const isRemoteWorktree = nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch;
+                const isRemoteWorktree = nodeDaemonId && !daemonIdsEquivalent(nodeDaemonId, this.deps.statusInstanceId) && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch;
                 if (isRemoteWorktree) {
                   const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "remove_mesh_node", {
                     ...typeof args === "object" && args !== null ? args : {},
@@ -80611,7 +81038,7 @@ ${hintLines.join("\n")}` : "",
               const sourceNode = mesh.nodes?.find((n) => meshNodeIdMatches(n, sourceNodeId));
               if (!sourceNode) return { success: false, error: `Source node '${sourceNodeId}' not found in mesh` };
               const sourceDaemonId = typeof sourceNode.daemonId === "string" ? sourceNode.daemonId.trim() : void 0;
-              if (sourceDaemonId && sourceDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
+              if (sourceDaemonId && !daemonIdsEquivalent(sourceDaemonId, this.deps.statusInstanceId) && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
                 const forwarded = await this.deps.dispatchMeshCommand(sourceDaemonId, "clone_mesh_node", {
                   ...typeof args === "object" && args !== null ? args : {},
                   _meshDirectDispatch: true
@@ -80853,7 +81280,7 @@ ${hintLines.join("\n")}` : "",
               if (!node) return { success: false, error: `Node '${nodeId}' not found in mesh` };
               if (!node.isLocalWorktree) return { success: false, error: "Node is not a local worktree node" };
               const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : void 0;
-              if (nodeDaemonId && nodeDaemonId !== this.deps.statusInstanceId && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
+              if (nodeDaemonId && !daemonIdsEquivalent(nodeDaemonId, this.deps.statusInstanceId) && this.deps.dispatchMeshCommand && !args?._meshDirectDispatch) {
                 const forwarded = await this.deps.dispatchMeshCommand(nodeDaemonId, "retry_mesh_node_bootstrap", {
                   ...typeof args === "object" && args !== null ? args : {},
                   _meshDirectDispatch: true
@@ -82061,16 +82488,16 @@ ${ptyResult.output.slice(-2e3)}`);
         const now = this.lastStatusSentAt;
         const target = opts?.p2pOnly ? "P2P" : serverConnected ? "P2P+Server" : "P2P";
         const allStates = this.deps.instanceManager.collectAllStates();
-        const ideStates = allStates.filter((s) => s.category === "ide");
-        const cliStates = allStates.filter((s) => s.category === "cli");
-        const acpStates = allStates.filter((s) => s.category === "acp");
-        const ideSummary = ideStates.map((s) => {
-          const msgs = s.activeChat?.messages?.length || 0;
-          const exts = s.extensions.length;
-          return `${s.type}(${s.status},${msgs}msg,${exts}ext)`;
+        const ideStates = allStates.filter((s2) => s2.category === "ide");
+        const cliStates = allStates.filter((s2) => s2.category === "cli");
+        const acpStates = allStates.filter((s2) => s2.category === "acp");
+        const ideSummary = ideStates.map((s2) => {
+          const msgs = s2.activeChat?.messages?.length || 0;
+          const exts = s2.extensions.length;
+          return `${s2.type}(${s2.status},${msgs}msg,${exts}ext)`;
         }).join(", ");
-        const cliSummary = cliStates.map((s) => `${s.type}(${s.status})`).join(", ");
-        const acpSummary = acpStates.map((s) => `${s.type}(${s.status})`).join(", ");
+        const cliSummary = cliStates.map((s2) => `${s2.type}(${s2.status})`).join(", ");
+        const acpSummary = acpStates.map((s2) => `${s2.type}(${s2.status})`).join(", ");
         const logLevel = opts?.p2pOnly ? "debug" : "info";
         const baseSummary = `IDE: ${ideStates.length} [${ideSummary}] CLI: ${cliStates.length} [${cliSummary}] ACP: ${acpStates.length} [${acpSummary}]`;
         const summaryChanged = baseSummary !== this.lastStatusSummary;
@@ -82181,10 +82608,10 @@ ${ptyResult.output.slice(-2e3)}`);
         }
         return false;
       }
-      simpleHash(s) {
+      simpleHash(s2) {
         let h = 2166136261;
-        for (let i = 0; i < s.length; i++) {
-          h ^= s.charCodeAt(i);
+        for (let i = 0; i < s2.length; i++) {
+          h ^= s2.charCodeAt(i);
           h = h * 16777619 >>> 0;
         }
         return h.toString(36);
@@ -83392,7 +83819,7 @@ ${ptyResult.output.slice(-2e3)}`);
       * Per-category status collect
       */
       collectStatesByCategory(category) {
-        return this.collectAllStates().filter((s) => s.category === category);
+        return this.collectAllStates().filter((s2) => s2.category === category);
       }
       // ─── Tick engine ─────────────────────────────────
       /**
@@ -85278,9 +85705,9 @@ async (params) => {
     function findCliTarget(ctx, type, instanceId) {
       if (!ctx.instanceManager) return null;
       const cliStates = ctx.instanceManager.collectAllStates().filter(isCliTargetState);
-      if (instanceId) return cliStates.find((s) => s.instanceId === instanceId) || null;
+      if (instanceId) return cliStates.find((s2) => s2.instanceId === instanceId) || null;
       if (!type) return cliStates[cliStates.length - 1] || null;
-      const matches = cliStates.filter((s) => s.type === type);
+      const matches = cliStates.filter((s2) => s2.type === type);
       return matches[matches.length - 1] || null;
     }
     function getCliTargetBundle(ctx, type, instanceId) {
@@ -85643,20 +86070,20 @@ async (params) => {
         return;
       }
       const allStates = ctx.instanceManager.collectAllStates();
-      const cliStates = allStates.filter((s) => s.category === "cli" || s.category === "acp");
-      const result = cliStates.map((s) => ({
-        instanceId: s.instanceId,
-        type: s.type,
-        name: s.name,
-        category: s.category,
-        status: s.status,
-        mode: s.mode,
-        workspace: s.workspace,
-        messageCount: s.activeChat?.messages?.length || 0,
-        lastMessage: s.activeChat?.messages?.slice(-1)[0] || null,
-        activeModal: s.activeChat?.activeModal || null,
-        pendingEvents: s.pendingEvents || [],
-        settings: s.settings
+      const cliStates = allStates.filter((s2) => s2.category === "cli" || s2.category === "acp");
+      const result = cliStates.map((s2) => ({
+        instanceId: s2.instanceId,
+        type: s2.type,
+        name: s2.name,
+        category: s2.category,
+        status: s2.status,
+        mode: s2.mode,
+        workspace: s2.workspace,
+        messageCount: s2.activeChat?.messages?.length || 0,
+        lastMessage: s2.activeChat?.messages?.slice(-1)[0] || null,
+        activeModal: s2.activeChat?.activeModal || null,
+        pendingEvents: s2.pendingEvents || [],
+        settings: s2.settings
       }));
       ctx.json(res, 200, { instances: result, count: result.length });
     }
@@ -85745,9 +86172,9 @@ async (params) => {
       }
       if (ctx.instanceManager) {
         const allStates = ctx.instanceManager.collectAllStates();
-        const cliStates = allStates.filter((s) => s.category === "cli" || s.category === "acp");
-        for (const s of cliStates) {
-          ctx.sendCliSSE({ event: "snapshot", providerType: s.type, status: s.status, instanceId: s.instanceId });
+        const cliStates = allStates.filter((s2) => s2.category === "cli" || s2.category === "acp");
+        for (const s2 of cliStates) {
+          ctx.sendCliSSE({ event: "snapshot", providerType: s2.type, status: s2.status, instanceId: s2.instanceId });
         }
       }
       _req.on("close", () => {
@@ -85763,7 +86190,7 @@ async (params) => {
       const target = findCliTarget(ctx, type);
       if (!target) {
         const allStates = ctx.instanceManager.collectAllStates();
-        ctx.json(res, 404, { error: `No running instance for: ${type}`, available: allStates.filter((s) => s.category === "cli" || s.category === "acp").map((s) => s.type) });
+        ctx.json(res, 404, { error: `No running instance for: ${type}`, available: allStates.filter((s2) => s2.category === "cli" || s2.category === "acp").map((s2) => s2.type) });
         return;
       }
       const instance = ctx.instanceManager.getInstance(target.instanceId);
@@ -85809,7 +86236,7 @@ async (params) => {
         const allStates = ctx.instanceManager.collectAllStates();
         ctx.json(res, 404, {
           error: `No running instance for: ${type}`,
-          available: allStates.filter((s) => s.category === "cli" || s.category === "acp").map((s) => s.type)
+          available: allStates.filter((s2) => s2.category === "cli" || s2.category === "acp").map((s2) => s2.type)
         });
         return;
       }
@@ -86612,7 +87039,7 @@ async (params) => {
               child.write("\x1B[12;1R");
               ctx.log("Terminal CPR request (\\x1b[6n) intercepted in PTY, responding with dummy coordinates [12;1R]");
             }
-            checkAutoApproval(data, (s) => child.write(s));
+            checkAutoApproval(data, (s2) => child.write(s2));
             sendAutoImplSSE(ctx, { event: "output", data: { chunk: data, stream: "stdout" } });
             scheduleAutoStopForVerification();
           });
@@ -86625,7 +87052,7 @@ async (params) => {
             stdout += chunk;
             clearAutoStopTimer();
             if (chunk.includes("\x1B[6n")) child.stdin?.write("\x1B[1;1R");
-            checkAutoApproval(chunk, (s) => child.stdin?.write(s));
+            checkAutoApproval(chunk, (s2) => child.stdin?.write(s2));
             sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stdout" } });
             scheduleAutoStopForVerification();
           });
@@ -86633,7 +87060,7 @@ async (params) => {
             const chunk = d.toString();
             stderr += chunk;
             clearAutoStopTimer();
-            checkAutoApproval(chunk, (s) => child.stdin?.write(s));
+            checkAutoApproval(chunk, (s2) => child.stdin?.write(s2));
             sendAutoImplSSE(ctx, { event: "output", data: { chunk, stream: "stderr" } });
             scheduleAutoStopForVerification();
           });
@@ -87446,59 +87873,59 @@ data: ${JSON.stringify(msg.data)}
       // ─── Route Table ─────────────────────────────────────
       routes = [
         // Static routes
-        { method: "GET", pattern: "/api/providers", handler: (q, s) => this.handleListProviders(q, s) },
-        { method: "GET", pattern: "/api/providers/source-config", handler: (q, s) => this.handleGetProviderSourceConfig(q, s) },
-        { method: "POST", pattern: "/api/providers/source-config", handler: (q, s) => this.handleSetProviderSourceConfig(q, s) },
-        { method: "GET", pattern: "/api/providers/versions", handler: (q, s) => this.handleDetectVersions(q, s) },
-        { method: "POST", pattern: "/api/providers/reload", handler: (q, s) => this.handleReload(q, s) },
-        { method: "POST", pattern: "/api/cdp/evaluate", handler: (q, s) => this.handleCdpEvaluate(q, s) },
-        { method: "POST", pattern: "/api/cdp/click", handler: (q, s) => this.handleCdpClick(q, s) },
-        { method: "POST", pattern: "/api/cdp/dom/query", handler: (q, s) => this.handleCdpDomQuery(q, s) },
-        { method: "POST", pattern: "/api/cdp/dom/inspect", handler: (q, s) => this.handleDomInspect(q, s) },
-        { method: "POST", pattern: "/api/cdp/dom/children", handler: (q, s) => this.handleDomChildren(q, s) },
-        { method: "POST", pattern: "/api/cdp/dom/analyze", handler: (q, s) => this.handleDomAnalyze(q, s) },
-        { method: "POST", pattern: "/api/cdp/dom/find-text", handler: (q, s) => this.handleFindByText(q, s) },
-        { method: "POST", pattern: "/api/cdp/dom/find-common", handler: (q, s) => this.handleFindCommon(q, s) },
-        { method: "GET", pattern: "/api/cdp/screenshot", handler: (q, s) => this.handleScreenshot(q, s) },
-        { method: "GET", pattern: "/api/cdp/targets", handler: (q, s) => this.handleCdpTargets(q, s) },
-        { method: "POST", pattern: "/api/scripts/run", handler: (q, s) => this.handleScriptsRun(q, s) },
-        { method: "GET", pattern: "/api/status", handler: (q, s) => this.handleStatus(q, s) },
-        { method: "POST", pattern: "/api/watch/start", handler: (q, s) => this.handleWatchStart(q, s) },
-        { method: "POST", pattern: "/api/watch/stop", handler: (q, s) => this.handleWatchStop(q, s) },
-        { method: "GET", pattern: "/api/watch/events", handler: (q, s) => this.handleSSE(q, s) },
-        { method: "POST", pattern: "/api/scaffold", handler: (q, s) => this.handleScaffold(q, s) },
+        { method: "GET", pattern: "/api/providers", handler: (q, s2) => this.handleListProviders(q, s2) },
+        { method: "GET", pattern: "/api/providers/source-config", handler: (q, s2) => this.handleGetProviderSourceConfig(q, s2) },
+        { method: "POST", pattern: "/api/providers/source-config", handler: (q, s2) => this.handleSetProviderSourceConfig(q, s2) },
+        { method: "GET", pattern: "/api/providers/versions", handler: (q, s2) => this.handleDetectVersions(q, s2) },
+        { method: "POST", pattern: "/api/providers/reload", handler: (q, s2) => this.handleReload(q, s2) },
+        { method: "POST", pattern: "/api/cdp/evaluate", handler: (q, s2) => this.handleCdpEvaluate(q, s2) },
+        { method: "POST", pattern: "/api/cdp/click", handler: (q, s2) => this.handleCdpClick(q, s2) },
+        { method: "POST", pattern: "/api/cdp/dom/query", handler: (q, s2) => this.handleCdpDomQuery(q, s2) },
+        { method: "POST", pattern: "/api/cdp/dom/inspect", handler: (q, s2) => this.handleDomInspect(q, s2) },
+        { method: "POST", pattern: "/api/cdp/dom/children", handler: (q, s2) => this.handleDomChildren(q, s2) },
+        { method: "POST", pattern: "/api/cdp/dom/analyze", handler: (q, s2) => this.handleDomAnalyze(q, s2) },
+        { method: "POST", pattern: "/api/cdp/dom/find-text", handler: (q, s2) => this.handleFindByText(q, s2) },
+        { method: "POST", pattern: "/api/cdp/dom/find-common", handler: (q, s2) => this.handleFindCommon(q, s2) },
+        { method: "GET", pattern: "/api/cdp/screenshot", handler: (q, s2) => this.handleScreenshot(q, s2) },
+        { method: "GET", pattern: "/api/cdp/targets", handler: (q, s2) => this.handleCdpTargets(q, s2) },
+        { method: "POST", pattern: "/api/scripts/run", handler: (q, s2) => this.handleScriptsRun(q, s2) },
+        { method: "GET", pattern: "/api/status", handler: (q, s2) => this.handleStatus(q, s2) },
+        { method: "POST", pattern: "/api/watch/start", handler: (q, s2) => this.handleWatchStart(q, s2) },
+        { method: "POST", pattern: "/api/watch/stop", handler: (q, s2) => this.handleWatchStop(q, s2) },
+        { method: "GET", pattern: "/api/watch/events", handler: (q, s2) => this.handleSSE(q, s2) },
+        { method: "POST", pattern: "/api/scaffold", handler: (q, s2) => this.handleScaffold(q, s2) },
         // CLI Debug routes
-        { method: "GET", pattern: "/api/cli/status", handler: (q, s) => this.handleCliStatus(q, s) },
-        { method: "POST", pattern: "/api/cli/launch", handler: (q, s) => this.handleCliLaunch(q, s) },
-        { method: "POST", pattern: "/api/cli/send", handler: (q, s) => this.handleCliSend(q, s) },
-        { method: "POST", pattern: "/api/cli/exercise", handler: (q, s) => this.handleCliExercise(q, s) },
-        { method: "POST", pattern: "/api/cli/fixture/capture", handler: (q, s) => this.handleCliFixtureCapture(q, s) },
-        { method: "POST", pattern: "/api/cli/fixture/replay", handler: (q, s) => this.handleCliFixtureReplay(q, s) },
-        { method: "POST", pattern: "/api/cli/resolve", handler: (q, s) => this.handleCliResolve(q, s) },
-        { method: "POST", pattern: "/api/cli/raw", handler: (q, s) => this.handleCliRaw(q, s) },
-        { method: "POST", pattern: "/api/cli/stop", handler: (q, s) => this.handleCliStop(q, s) },
-        { method: "GET", pattern: "/api/cli/events", handler: (q, s) => this.handleCliSSE(q, s) },
-        { method: "GET", pattern: /^\/api\/cli\/debug\/([^/]+)$/, handler: (q, s, p) => this.handleCliDebug(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/cli\/trace\/([^/]+)$/, handler: (q, s, p) => this.handleCliTrace(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/cli\/fixtures\/([^/]+)$/, handler: (q, s, p) => this.handleCliFixtureList(p[0], q, s) },
+        { method: "GET", pattern: "/api/cli/status", handler: (q, s2) => this.handleCliStatus(q, s2) },
+        { method: "POST", pattern: "/api/cli/launch", handler: (q, s2) => this.handleCliLaunch(q, s2) },
+        { method: "POST", pattern: "/api/cli/send", handler: (q, s2) => this.handleCliSend(q, s2) },
+        { method: "POST", pattern: "/api/cli/exercise", handler: (q, s2) => this.handleCliExercise(q, s2) },
+        { method: "POST", pattern: "/api/cli/fixture/capture", handler: (q, s2) => this.handleCliFixtureCapture(q, s2) },
+        { method: "POST", pattern: "/api/cli/fixture/replay", handler: (q, s2) => this.handleCliFixtureReplay(q, s2) },
+        { method: "POST", pattern: "/api/cli/resolve", handler: (q, s2) => this.handleCliResolve(q, s2) },
+        { method: "POST", pattern: "/api/cli/raw", handler: (q, s2) => this.handleCliRaw(q, s2) },
+        { method: "POST", pattern: "/api/cli/stop", handler: (q, s2) => this.handleCliStop(q, s2) },
+        { method: "GET", pattern: "/api/cli/events", handler: (q, s2) => this.handleCliSSE(q, s2) },
+        { method: "GET", pattern: /^\/api\/cli\/debug\/([^/]+)$/, handler: (q, s2, p) => this.handleCliDebug(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/cli\/trace\/([^/]+)$/, handler: (q, s2, p) => this.handleCliTrace(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/cli\/fixtures\/([^/]+)$/, handler: (q, s2, p) => this.handleCliFixtureList(p[0], q, s2) },
         // Dynamic routes (provider :type param)
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/script$/, handler: (q, s, p) => this.handleRunScript(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/files$/, handler: (q, s, p) => this.handleListFiles(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/file$/, handler: (q, s, p) => this.handleReadFile(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/file$/, handler: (q, s, p) => this.handleWriteFile(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/source$/, handler: (q, s, p) => this.handleSource(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/save$/, handler: (q, s, p) => this.handleSave(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/typeAndSend$/, handler: (q, s, p) => this.handleTypeAndSend(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/typeAndSendAt$/, handler: (q, s, p) => this.handleTypeAndSendAt(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/config$/, handler: (q, s, p) => this.handleProviderConfig(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/dom-context$/, handler: (q, s, p) => this.handleDomContext(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/auto-implement$/, handler: (q, s, p) => this.handleAutoImplement(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/auto-implement\/cancel$/, handler: (q, s, p) => this.handleAutoImplCancel(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/auto-implement\/status$/, handler: (q, s, p) => this.handleAutoImplSSE(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/spawn-test$/, handler: (q, s, p) => this.handleSpawnTest(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/validate$/, handler: (q, s, p) => this.handleValidate(p[0], q, s) },
-        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/acp-chat$/, handler: (q, s, p) => this.handleAcpChat(p[0], q, s) },
-        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/script-hints$/, handler: (q, s, p) => this.handleScriptHints(p[0], q, s) }
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/script$/, handler: (q, s2, p) => this.handleRunScript(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/files$/, handler: (q, s2, p) => this.handleListFiles(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/file$/, handler: (q, s2, p) => this.handleReadFile(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/file$/, handler: (q, s2, p) => this.handleWriteFile(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/source$/, handler: (q, s2, p) => this.handleSource(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/save$/, handler: (q, s2, p) => this.handleSave(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/typeAndSend$/, handler: (q, s2, p) => this.handleTypeAndSend(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/typeAndSendAt$/, handler: (q, s2, p) => this.handleTypeAndSendAt(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/config$/, handler: (q, s2, p) => this.handleProviderConfig(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/dom-context$/, handler: (q, s2, p) => this.handleDomContext(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/auto-implement$/, handler: (q, s2, p) => this.handleAutoImplement(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/auto-implement\/cancel$/, handler: (q, s2, p) => this.handleAutoImplCancel(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/auto-implement\/status$/, handler: (q, s2, p) => this.handleAutoImplSSE(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/spawn-test$/, handler: (q, s2, p) => this.handleSpawnTest(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/validate$/, handler: (q, s2, p) => this.handleValidate(p[0], q, s2) },
+        { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/acp-chat$/, handler: (q, s2, p) => this.handleAcpChat(p[0], q, s2) },
+        { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/script-hints$/, handler: (q, s2, p) => this.handleScriptHints(p[0], q, s2) }
       ];
       matchRoute(method, pathname) {
         for (const route of this.routes) {
@@ -88093,14 +88520,14 @@ data: ${JSON.stringify(msg.data)}
           warnings.push(...validation.warnings);
           if (config2.settings) {
             for (const [key, val] of Object.entries(config2.settings)) {
-              const s = val;
-              if (!s.type) errors.push(`settings.${key}: missing type`);
-              else if (!["boolean", "number", "string", "select"].includes(s.type))
-                errors.push(`settings.${key}: invalid type '${s.type}'`);
-              if (s.default === void 0) warnings.push(`settings.${key}: no default value`);
-              if (s.type === "number" && s.min !== void 0 && s.max !== void 0 && s.min > s.max)
-                errors.push(`settings.${key}: min (${s.min}) > max (${s.max})`);
-              if (s.type === "select" && (!s.options || !Array.isArray(s.options) || s.options.length === 0))
+              const s2 = val;
+              if (!s2.type) errors.push(`settings.${key}: missing type`);
+              else if (!["boolean", "number", "string", "select"].includes(s2.type))
+                errors.push(`settings.${key}: invalid type '${s2.type}'`);
+              if (s2.default === void 0) warnings.push(`settings.${key}: no default value`);
+              if (s2.type === "number" && s2.min !== void 0 && s2.max !== void 0 && s2.min > s2.max)
+                errors.push(`settings.${key}: min (${s2.min}) > max (${s2.max})`);
+              if (s2.type === "select" && (!s2.options || !Array.isArray(s2.options) || s2.options.length === 0))
                 errors.push(`settings.${key}: select type requires options[]`);
             }
           }