@adhdev/daemon-standalone 1.0.28-rc.20 → 1.0.28-rc.22

package/dist/index.js

@@ -33311,10 +33311,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "284a88d08b7bb93b250385f4da9c523fb4d8fd68" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "284a88d0" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.28-rc.20" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-07-28T17:20:58.778Z" : void 0);
+      const commit = readInjected(true ? "dc10211420f1723bac639bd4dc2cfc2dd3fe0c81" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "dc102114" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.28-rc.22" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-07-29T00:52:17.964Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -37343,6 +37343,12 @@ ${error48.message || ""}`;
     function noteDroppedSuspension(reason) {
       metrics.suspensionsDropped[reason] = (metrics.suspensionsDropped[reason] ?? 0) + 1;
     }
+    function noteRedriveBlocked(reason) {
+      metrics.redriveBlockedByReason[reason] = (metrics.redriveBlockedByReason[reason] ?? 0) + 1;
+    }
+    function noteTargetPinCleared(reason) {
+      metrics.targetPinClearedByReason[reason] = (metrics.targetPinClearedByReason[reason] ?? 0) + 1;
+    }
     function logSuspensionOnce(level, key2, message) {
       if (suspensionLogKeys.has(key2)) return;
       if (suspensionLogKeys.size < MAX_SUSPENSION_LOG_KEYS) suspensionLogKeys.add(key2);
@@ -38070,7 +38076,9 @@ ${error48.message || ""}`;
           suspensionsDropped: {},
           reorderedGeneratingSuppressed: 0,
           redriveBlockedBySuspension: 0,
-          suspensionConsumedRecovered: 0
+          suspensionConsumedRecovered: 0,
+          redriveBlockedByReason: {},
+          targetPinClearedByReason: {}
         };
         MAX_SUSPENSION_LOG_KEYS = 200;
         suspensionLogKeys = /* @__PURE__ */ new Set();
@@ -40204,6 +40212,7 @@ Next step: ${nextStep}`;
       deleteDirectDispatchesByTaskId: () => deleteDirectDispatchesByTaskId,
       describeTaskDependencyState: () => describeTaskDependencyState,
       enqueueTask: () => enqueueTask,
+      expireTaskTargetPin: () => expireTaskTargetPin,
       getActiveDirectDispatches: () => getActiveDirectDispatches,
       getMeshQueueRevision: () => getMeshQueueRevision,
       getMeshQueueStats: () => getMeshQueueStats,
@@ -40906,6 +40915,24 @@ Next step: ${nextStep}`;
       if (result?.missionAffected) scheduleMissionCloseCandidateCheck(meshId, [result.entry, ...result.cascaded]);
       return result ? result.entry : null;
     }
+    function expireTaskTargetPin(meshId, taskId, opts) {
+      requireMeshHostQueueOwner(opts);
+      return withQueueLock(meshId, () => {
+        const entry = MeshRuntimeStore.getInstance().findQueueEntryById(meshId, taskId);
+        if (!entry) return null;
+        if (entry.status !== "pending") return null;
+        if (!entry.targetSessionId && !entry.targetNodeId) return null;
+        const clearedSession = entry.targetSessionId;
+        const clearedNode = opts?.clearTargetNode ? entry.targetNodeId : void 0;
+        delete entry.targetSessionId;
+        if (opts?.clearTargetNode) delete entry.targetNodeId;
+        entry.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+        if (opts?.reason) entry.requeueReason = opts.reason;
+        MeshRuntimeStore.getInstance().updateQueueEntry(entry);
+        LOG2.warn("MeshQueue", `Expired stale target pin on task ${taskId} (mesh ${meshId}): cleared${clearedSession ? ` targetSessionId=${clearedSession}` : ""}${clearedNode ? ` targetNodeId=${clearedNode}` : ""} (${opts?.reason ?? "target_pin_expired"}) \u2014 the task is now claimable by any compatible session`);
+        return entry;
+      });
+    }
     function reclaimStrandedAssignedTask(meshId, taskId, opts) {
       requireMeshHostQueueOwner(opts);
       const result = withQueueLock(meshId, () => {
@@ -54072,6 +54099,10 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
       }
       return isWithinCloneBootstrapGrace(targetNodeId);
     }
+    function targetPinAgeMs(task, nowMs = Date.now()) {
+      const anchorMs = Date.parse(task.requeuedAt || task.createdAt || "");
+      return Number.isFinite(anchorMs) ? nowMs - anchorMs : null;
+    }
     function resolveDeadTargetVerdict(components, meshId, mesh, task) {
       const NOT_DEAD = { dead: false, nodeDead: false, reason: "" };
       const targetSessionId = readNonEmptyString(task.targetSessionId);
@@ -54643,11 +54674,29 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
               clearTargetNode: deadTarget.nodeDead
             });
             if (requeued) {
+              noteTargetPinCleared(deadTarget.reason);
               LOG2.warn("MeshQueue", `DEAD-TARGET-SELFHEAL: task ${task.id} (mesh ${meshId}) was pinned to a dead target (${deadTarget.reason}); requeued${deadTarget.nodeDead ? " and unpinned node" : ""} (requeueCount=${requeued.requeueCount ?? "?"}, status=${requeued.status}).`);
             }
             markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_dead_requeued" });
             continue;
           }
+          const pinAgeMs = targetPinAgeMs(task);
+          if (pinAgeMs !== null && pinAgeMs >= TARGET_SESSION_PIN_TTL_MS) {
+            const expired = expireTaskTargetPin(meshId, task.id, { reason: "target_session_pin_expired_unclaimed" });
+            if (expired) {
+              noteTargetPinCleared("target_session_pin_expired_unclaimed");
+              traceMeshEventDrop("target_session_pin_expired", {
+                taskId: task.id,
+                sessionId: readNonEmptyString(task.targetSessionId),
+                nodeId: readNonEmptyString(task.targetNodeId),
+                meshId,
+                event: "agent:ready"
+              }, `unclaimed ${Math.round(pinAgeMs / 1e3)}s \u2265 ttl ${Math.round(TARGET_SESSION_PIN_TTL_MS / 1e3)}s \u2192 pin cleared, claimable`);
+              LOG2.warn("MeshQueue", `TARGET-PIN-TTL: task ${task.id} (mesh ${meshId}) stayed pinned-but-unclaimed for ${Math.round(pinAgeMs / 1e3)}s (ttl ${Math.round(TARGET_SESSION_PIN_TTL_MS / 1e3)}s); expired the stale target pin so a compatible session can claim it.`);
+            }
+            markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_pin_expired" });
+            continue;
+          }
           markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_constraint" });
           continue;
         }
@@ -55278,6 +55327,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
     var TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON;
     var lastActionableSkipNotified;
     var DEAD_TARGET_GRACE_MS;
+    var TARGET_SESSION_PIN_TTL_MS;
     var init_mesh_queue_assignment = __esm2({
       "src/mesh/mesh-queue-assignment.ts"() {
         "use strict";
@@ -55343,6 +55393,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
         TRANSIENT_TARGET_NODE_BOOTSTRAP_PENDING_REASON = "target_node_bootstrap_pending";
         lastActionableSkipNotified = /* @__PURE__ */ new Map();
         DEAD_TARGET_GRACE_MS = 6e4;
+        TARGET_SESSION_PIN_TTL_MS = 15 * 6e4;
       }
     });
     function readSettings(state) {
@@ -59573,21 +59624,28 @@ ${cleanBody}`;
       }
     }
     async function pollAssignedTaskInTurnProgress(components, mesh, row) {
+      return (await pollAssignedTaskActivity(components, mesh, row)).inTurnProgress;
+    }
+    async function pollAssignedTaskActivity(components, mesh, row) {
+      const NONE = { inTurnProgress: false, lastAgentActivityMs: null };
       const sessionId = readNonEmptyString(row.assignedSessionId);
       const nodeId = readNonEmptyString(row.assignedNodeId);
-      if (!sessionId || !nodeId) return false;
+      if (!sessionId || !nodeId) return NONE;
       const dispatchedAtMs = Date.parse(readNonEmptyString(row.dispatchTimestamp));
-      if (!Number.isFinite(dispatchedAtMs)) return false;
+      if (!Number.isFinite(dispatchedAtMs)) return NONE;
       const payload = await runSessionEvidenceCollection(sessionId, () => fetchAssignedTaskChatTail(components, mesh, row));
-      if (!payload) return false;
+      if (!payload) return NONE;
       const messages = Array.isArray(payload.messages) ? payload.messages : [];
-      return messages.some((msg) => {
-        if (!msg) return false;
-        if (msg.role === "user" || msg.role === "system") return false;
+      let lastAgentActivityMs = null;
+      for (const msg of messages) {
+        if (!msg) continue;
+        if (msg.role === "user" || msg.role === "system") continue;
         const ts2 = readChatMessageTimestampMs(msg);
-        if (typeof ts2 !== "number" || !Number.isFinite(ts2)) return false;
-        return ts2 >= dispatchedAtMs;
-      });
+        if (typeof ts2 !== "number" || !Number.isFinite(ts2)) continue;
+        if (ts2 < dispatchedAtMs) continue;
+        if (lastAgentActivityMs === null || ts2 > lastAgentActivityMs) lastAgentActivityMs = ts2;
+      }
+      return { inTurnProgress: lastAgentActivityMs !== null, lastAgentActivityMs };
     }
     async function pollAssignedTaskTerminalEvidence(components, mesh, row, opts) {
       const sessionId = readNonEmptyString(row.assignedSessionId);
@@ -60053,6 +60111,7 @@ ${cleanBody}`;
         if (attempt.terminalOutcome) return false;
         const attemptSessionId = readNonEmptyString(attempt.sessionId);
         if (attemptSessionId && !sessionIdsEquivalent(attemptSessionId, sessionId)) return false;
+        if (typeof row.dispatchNonce === "number" && typeof attempt.dispatchNonce === "number" && row.dispatchNonce !== attempt.dispatchNonce) return false;
       }
       const nodeId = readNonEmptyString(row.assignedNodeId);
       const coordinatorDaemonId = readNonEmptyString(attempt?.coordinatorDaemonId);
@@ -60205,6 +60264,26 @@ ${cleanBody}`;
             const redriveProfile = row.assignedSessionId ? resolveAssignedTranscriptProfile(components, row) : void 0;
             if (redriveProfile?.emitsPtyTurnEvents === false && await pollAssignedTaskInTurnProgress(components, { id: meshId, nodes: mesh.nodes }, row)) {
               deliveredUnconsumedUnknownStreak.delete(shortStreakKey);
+              try {
+                recordTurnAck({
+                  meshId,
+                  taskId: row.id,
+                  kind: "consumed",
+                  sessionId: row.assignedSessionId,
+                  legacy: {
+                    ...typeof row.dispatchNonce === "number" ? { dispatchNonce: row.dispatchNonce } : {},
+                    ...row.assignedNodeId ? { nodeId: row.assignedNodeId } : {},
+                    ...row.assignedProviderType ? { providerType: row.assignedProviderType } : {}
+                  },
+                  evidence: {
+                    source: "native_source_activity",
+                    profileClass: redriveProfile.class,
+                    profileTiming: redriveProfile.timing
+                  }
+                });
+              } catch {
+              }
+              noteRedriveBlocked("native_source_activity");
               traceMeshEventDrop("short_redrive_deferred_native_source_progress", {
                 taskId: row.id,
                 sessionId: row.assignedSessionId,
@@ -60440,6 +60519,70 @@ ${cleanBody}`;
             }, `${reclaimReason} \u2192 transcript ${terminalEvidence.outcome}${propagated ? " propagated" : ""}`);
             continue;
           }
+          const currentAttempt = (() => {
+            try {
+              return store.getCurrentTurnAttempt(meshId, row.id);
+            } catch {
+              return null;
+            }
+          })();
+          const attemptStage = readNonEmptyString(currentAttempt?.stage);
+          if (currentAttempt && !currentAttempt.terminalOutcome && (attemptStage === "generating" || attemptStage === "waiting_approval" || attemptStage === "waiting_choice" || attemptStage === "finalizing")) {
+            deliveredNoTurnUnknownStreak.delete(streakKey);
+            noteRedriveBlocked("active_attempt_stage");
+            traceMeshEventDrop("redrive_blocked_active_attempt", {
+              taskId: row.id,
+              sessionId: row.assignedSessionId,
+              nodeId: row.assignedNodeId,
+              meshId,
+              event: "agent:generating_completed"
+            }, `attempt stage ${attemptStage} \u2014 live turn, ${reclaimReason} suppressed`);
+            continue;
+          }
+          const noTurnProfile = row.assignedSessionId ? resolveAssignedTranscriptProfile(components, row) : void 0;
+          if (noTurnProfile?.emitsPtyTurnEvents === false) {
+            const activity = await pollAssignedTaskActivity(components, { id: meshId, nodes: mesh.nodes }, row);
+            if (activity.inTurnProgress && activity.lastAgentActivityMs !== null && nowMs - activity.lastAgentActivityMs <= NATIVE_SOURCE_ACTIVITY_STALE_MS) {
+              deliveredNoTurnUnknownStreak.delete(streakKey);
+              try {
+                recordTurnAck({
+                  meshId,
+                  taskId: row.id,
+                  kind: "consumed",
+                  sessionId: row.assignedSessionId,
+                  legacy: {
+                    ...typeof row.dispatchNonce === "number" ? { dispatchNonce: row.dispatchNonce } : {},
+                    ...row.assignedNodeId ? { nodeId: row.assignedNodeId } : {},
+                    ...row.assignedProviderType ? { providerType: row.assignedProviderType } : {}
+                  },
+                  evidence: {
+                    source: "native_source_activity",
+                    profileClass: noTurnProfile.class,
+                    profileTiming: noTurnProfile.timing
+                  }
+                });
+              } catch {
+              }
+              noteRedriveBlocked("native_source_activity");
+              traceMeshEventDrop("redrive_blocked_native_source_activity", {
+                taskId: row.id,
+                sessionId: row.assignedSessionId,
+                nodeId: row.assignedNodeId,
+                meshId,
+                event: "agent:generating_completed"
+              }, `${noTurnProfile.class}_fresh_activity \u2014 consumed promoted, ${reclaimReason} suppressed`);
+              continue;
+            }
+            if (activity.inTurnProgress) {
+              traceMeshEventStage("native_source_activity_stale", {
+                taskId: row.id,
+                sessionId: row.assignedSessionId,
+                nodeId: row.assignedNodeId,
+                meshId,
+                event: "agent:generating_completed"
+              }, `${noTurnProfile.class} quiet >${Math.round(NATIVE_SOURCE_ACTIVITY_STALE_MS / 1e3)}s \u2192 ${reclaimReason} proceeds`);
+            }
+          }
           const reclaimedLost = reclaimStrandedAssignedTask(meshId, row.id, {
             reason: reclaimReason,
             ageMs: nowMs - dispatchedAtMs
@@ -61005,6 +61148,7 @@ ${cleanBody}`;
     var heldEventLedgerRecorded;
     var ASSIGNED_STRANDED_DEADLINE_MS;
     var DELIVERED_NO_TURN_DEADLINE_MS;
+    var NATIVE_SOURCE_ACTIVITY_STALE_MS;
     var ASSIGNED_DELIVERED_UNCONSUMED_REDRIVE_MS;
     var RECLAIM_UNKNOWN_GRACE_TICKS;
     var deliveredNoTurnUnknownStreak;
@@ -61055,6 +61199,7 @@ ${cleanBody}`;
         heldEventLedgerRecorded = /* @__PURE__ */ new Set();
         ASSIGNED_STRANDED_DEADLINE_MS = 5 * 6e4;
         DELIVERED_NO_TURN_DEADLINE_MS = 15 * 6e4;
+        NATIVE_SOURCE_ACTIVITY_STALE_MS = 10 * 6e4;
         ASSIGNED_DELIVERED_UNCONSUMED_REDRIVE_MS = 25e3;
         RECLAIM_UNKNOWN_GRACE_TICKS = 3;
         deliveredNoTurnUnknownStreak = /* @__PURE__ */ new Map();
@@ -67899,6 +68044,7 @@ ${lastSnapshot}`;
       isOperatingNoteTombstoned: () => isOperatingNoteTombstoned,
       isP2pRelayTransportFailure: () => isP2pRelayTransportFailure,
       isPathInside: () => isPathInside,
+      isPreviewReleaseChannel: () => isPreviewReleaseChannel,
       isRestartBlockingPresentation: () => isRestartBlockingPresentation,
       isSessionHostLiveRuntime: () => import_session_host_core4.isSessionHostLiveRuntime,
       isSessionHostRecoverySnapshot: () => import_session_host_core4.isSessionHostRecoverySnapshot,
@@ -68209,6 +68355,28 @@ ${lastSnapshot}`;
       });
       return { promptId, answers };
     }
+    function interactivePromptContentFingerprint(questions) {
+      let hash2 = 2166136261;
+      const mix = (text) => {
+        for (let i = 0; i < text.length; i += 1) {
+          hash2 ^= text.charCodeAt(i);
+          hash2 = Math.imul(hash2, 16777619) >>> 0;
+        }
+      };
+      for (const question of questions) {
+        mix(question.question);
+        mix(question.multiSelect ? "
multi" : "
single");
+        for (const option of question.options) {
+          mix("");
+          mix(option.label);
+        }
+        mix("");
+      }
+      return hash2.toString(16).padStart(8, "0");
+    }
+    function stableClaudeTuiPromptId(questions) {
+      return `ask-user-tui-${interactivePromptContentFingerprint(questions)}`;
+    }
     function buildClaudeInteractiveToolResult(response) {
       return JSON.stringify({
         type: "user",
@@ -72936,8 +73104,23 @@ ${effect.notification.body || ""}`.trim();
     function stripTrailingSlashes(url2) {
       return url2.replace(/\/+$/, "");
     }
-    function resolveRegistryBaseUrl(configuredUrl, env2 = process.env) {
-      const resolved = cleanString(configuredUrl) ?? cleanString(env2[REGISTRY_URL_ENV_VAR]) ?? DEFAULT_REGISTRY_BASE_URL;
+    var REGISTRY_API_PATH = "/api/v1/registry";
+    function deriveRegistryBaseUrlFromServerUrl(serverUrl) {
+      const cleaned = cleanString(serverUrl);
+      if (!cleaned) return void 0;
+      const stripped = stripTrailingSlashes(cleaned);
+      let parsed;
+      try {
+        parsed = new URL(stripped);
+      } catch {
+        return void 0;
+      }
+      if (parsed.protocol !== "https:" && parsed.protocol !== "http:") return void 0;
+      if (stripped.endsWith(REGISTRY_API_PATH)) return stripped;
+      return `${stripped}${REGISTRY_API_PATH}`;
+    }
+    function resolveRegistryBaseUrl(configuredUrl, env2 = process.env, serverUrl) {
+      const resolved = cleanString(configuredUrl) ?? cleanString(env2[REGISTRY_URL_ENV_VAR]) ?? deriveRegistryBaseUrlFromServerUrl(serverUrl) ?? DEFAULT_REGISTRY_BASE_URL;
       return stripTrailingSlashes(resolved);
     }
     function resolveProviderTarballUrl(configuredUrl, env2 = process.env) {
@@ -78004,7 +78187,8 @@ ${effect.notification.body || ""}`.trim();
         const https = require("https");
         const fs47 = require("fs");
         const path50 = require("path");
-        const REGISTRY = resolveRegistryBaseUrl(loadConfig2().registryUrl);
+        const cfg = loadConfig2();
+        const REGISTRY = resolveRegistryBaseUrl(cfg.registryUrl, process.env, cfg.serverUrl);
         function fetchText(url2, timeoutMs) {
           return new Promise((resolve28, reject) => {
             const req = https.get(url2, { headers: { "User-Agent": "adhdev-daemon", "Accept": "application/json" }, timeout: timeoutMs }, (res) => {
@@ -78374,7 +78558,8 @@ ${formatManifestValidationIssues2(validation.issues)}`,
         const installed = this.handleListInstalledProviders({});
         if (!installed.success) return installed;
         const https = require("https");
-        const REGISTRY = resolveRegistryBaseUrl(loadConfig2().registryUrl);
+        const cfg = loadConfig2();
+        const REGISTRY = resolveRegistryBaseUrl(cfg.registryUrl, process.env, cfg.serverUrl);
         function fetchJson(url2) {
           return new Promise((resolve28, reject) => {
             const req = https.get(url2, { headers: { "User-Agent": "adhdev-daemon", "Accept": "application/json" }, timeout: 1e4 }, (res) => {
@@ -85059,10 +85244,15 @@ ${body}
         if (!screenText.includes("Enter to select")) return;
         if (headers.length === 0) {
           const prompt = detectClaudeAskUserQuestionPromptFromTuiPages([{ screenText }], {
-            promptId: `ask-user-${this.providerSessionId || "claude"}-${Date.now()}`,
+            // REBIND OPTION FIDELITY (rc.20): provisional id — replaced with the
+            // content-addressed stable id below, so the SAME picker re-captured
+            // after a daemon restart keeps the SAME promptId and pre-restart
+            // answers still bind to the options they were issued against.
+            promptId: "ask-user-tui-pending",
             providerType: this.cliType
           });
           if (!prompt) return;
+          prompt.promptId = stableClaudeTuiPromptId(prompt.questions);
           this.activeInteractivePrompt = prompt;
           this.interactivePromptTransport = "tui";
           this.interactivePromptLostAt = null;
@@ -85170,10 +85360,14 @@ ${body}
           }
         }
         const prompt = detectClaudeAskUserQuestionPromptFromTuiPages(pages, {
-          promptId: `ask-user-${this.providerSessionId || "claude"}-${Date.now()}`,
+          // REBIND OPTION FIDELITY (rc.20): provisional id — replaced with the
+          // content-addressed stable id below (same rationale as the
+          // headerless capture in maybeCaptureClaudeTuiPrompt).
+          promptId: "ask-user-tui-pending",
           providerType: this.cliType
         });
         if (!prompt) return;
+        prompt.promptId = stableClaudeTuiPromptId(prompt.questions);
         this.activeInteractivePrompt = prompt;
         this.interactivePromptTransport = "tui";
         this.interactivePromptLostAt = null;
@@ -86662,6 +86856,12 @@ ${body}
           }
         } else if (event === "interactive_prompt_response" && data) {
           try {
+            const heldPromptId = typeof this.activeInteractivePrompt?.promptId === "string" && this.activeInteractivePrompt.promptId ? this.activeInteractivePrompt.promptId : "";
+            const incomingPromptId = typeof data?.promptId === "string" ? data.promptId.trim() : "";
+            if (heldPromptId && incomingPromptId && incomingPromptId !== heldPromptId) {
+              LOG2.warn("CLI", `[${this.type}] interactive_prompt_response REJECTED: stale promptId "${incomingPromptId}" does not match active prompt "${heldPromptId}" \u2014 answer not applied (no index/default fallback); re-answer against the active promptId`);
+              return;
+            }
             const response = this.activeInteractivePrompt && this.activeInteractivePrompt.promptId === data?.promptId && Array.isArray(data?.answers) ? resolveInteractivePromptResponse(this.activeInteractivePrompt, data) : normalizeInteractivePromptResponse2(data);
             if (this.activeInteractivePrompt?.promptId === response.promptId) {
               this.activeInteractivePrompt = null;
@@ -91615,6 +91815,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
           if (coordinatorEntry?.meshId) {
             restoredSettings.meshCoordinatorFor = coordinatorEntry.meshId;
           }
+          const recordMeshNodeFor = typeof record2.meshNodeFor === "string" && record2.meshNodeFor.trim() ? record2.meshNodeFor.trim() : "";
+          const recordMeshNodeId = typeof record2.meshNodeId === "string" && record2.meshNodeId.trim() ? record2.meshNodeId.trim() : "";
+          if (recordMeshNodeFor) restoredSettings.meshNodeFor = recordMeshNodeFor;
+          if (recordMeshNodeId) {
+            restoredSettings.meshNodeId = recordMeshNodeId;
+            restoredSettings.meshLastNodeId = recordMeshNodeId;
+          }
+          if (record2.launchedByCoordinator === true) restoredSettings.launchedByCoordinator = true;
           try {
             await this.registerCliInstance(
               record2.runtimeId,
@@ -94291,9 +94499,14 @@ Run 'adhdev doctor' for detailed diagnostics.`
         this.providerType = providerType;
       }
     };
-    function resolveProviderChannel(configured, env2 = process.env) {
+    function isPreviewReleaseChannel(releaseChannel) {
+      const normalized = typeof releaseChannel === "string" ? releaseChannel.trim().toLowerCase() : "";
+      return normalized === "preview" || normalized === "next";
+    }
+    function resolveProviderChannel(configured, env2 = process.env, releaseChannel) {
       const raw = configured && configured.trim() || (env2[PROVIDER_CHANNEL_ENV_VAR] ?? "").trim();
-      return raw === "preview" ? "preview" : "stable";
+      if (raw) return raw === "preview" ? "preview" : "stable";
+      return isPreviewReleaseChannel(releaseChannel) ? "preview" : DEFAULT_PROVIDER_CHANNEL;
     }
     function partitionChannelEntries(entries) {
       const activatable = [];
@@ -94718,6 +94931,15 @@ Run 'adhdev doctor' for detailed diagnostics.`
             `channel metadata for "${channel}" has an unexpected shape (missing providers array)`
           );
         }
+        if (channel === "preview") {
+          const echo = typeof body.channel === "string" ? body.channel.trim().toLowerCase() : "";
+          if (echo !== channel) {
+            throw new ProviderChannelError(
+              "CHANNEL_METADATA_MISMATCH",
+              `registry response for channel "preview" ${typeof body.channel === "string" ? `echoes channel "${body.channel}"` : "omits the top-level channel echo"} \u2014 the registry does not honor the channel contract (legacy/stable payload); refusing to treat its rows as preview, last-known-good preserved`
+            );
+          }
+        }
         const entries = [];
         for (const raw of body.providers) {
           if (!raw || typeof raw.type !== "string" || typeof raw.version !== "string" || typeof raw.category !== "string") {
@@ -95086,10 +95308,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
        * the resolved provider channel is 'stable' (production mode).
        */
       static UNVERIFIED_TARBALL_ENV_VAR = "ADHDEV_PROVIDER_ALLOW_UNVERIFIED_TARBALL";
-      /** Resolved explicit provider channel (absent/ambiguous → 'stable'). */
+      /** Resolved provider channel (explicit config/env wins; otherwise derived from the daemon release channel; absent/ambiguous → 'stable'). */
       channel;
       allowUnverifiedTarball;
       channelStore;
+      channelSyncIO;
       probeStarts = [];
       siblingLogged = false;
       siblingRefusalLogged = false;
@@ -95169,11 +95392,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
       constructor(options) {
         this.logFn = options?.logFn || LOG2.forComponent("Provider").asLogFn();
         this.probeStarts = options?.probeStarts ?? [process.cwd(), __dirname];
-        this.registryBaseUrl = resolveRegistryBaseUrl(options?.registryUrl);
+        this.registryBaseUrl = resolveRegistryBaseUrl(options?.registryUrl, process.env, options?.serverUrl);
         this.providerTarballUrl = resolveProviderTarballUrl(options?.providerTarballUrl);
-        this.channel = resolveProviderChannel(options?.channel);
+        this.channel = resolveProviderChannel(options?.channel, process.env, options?.updateChannel);
         this.allowUnverifiedTarball = options?.allowUnverifiedTarball === true || process.env[_ProviderLoader.UNVERIFIED_TARBALL_ENV_VAR] === "1";
         this.channelStore = options?.channelStore === null ? null : options?.channelStore ?? new ProviderChannelStore(ProviderChannelStore.defaultRoot(), this.logFn);
+        this.channelSyncIO = options?.channelSyncIO;
         this.defaultProvidersDir = path41.join(getConfigDir2(), "providers");
         const detected = this.detectDefaultUserDir();
         this.userDir = detected.path;
@@ -95437,7 +95661,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
           store: this.channelStore,
           registryBaseUrl: this.registryBaseUrl,
           providerTarballUrl: this.providerTarballUrl,
-          logFn: this.logFn
+          logFn: this.logFn,
+          ...this.channelSyncIO
         });
         const targetTypes = collectSyncTargetTypes(this.upstreamDir, this.channelStore, this.channel);
         const report = await runtime.sync({ channel: this.channel, targetTypes });
@@ -95452,6 +95677,39 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
         return report;
       }
+      /**
+       * Number of valid active pointers on the resolved channel (0 = empty or
+       * disabled store). Corrupt pointer files are excluded by the store.
+       */
+      countVerifiedChannelPointers() {
+        if (!this.channelStore) return 0;
+        try {
+          return this.channelStore.listPointers(this.channel).pointers.size;
+        } catch {
+          return 0;
+        }
+      }
+      /**
+       * Bounded one-shot first sync for an empty verified channel store.
+       *
+       * Closes the rc.20 preview activation gap: a daemon whose provider channel
+       * newly derives to a channel with an EMPTY store (e.g. updateChannel=preview
+       * while providerChannel defaulted to stable) would otherwise sit at 0 active
+       * providers until a manual check_provider_updates. Runs at most one
+       * verified sync per call, only when the resolved channel has no pointers
+       * AND there are installed (.upstream) providers to sync. Fail-closed: any
+       * registry/transport failure activates nothing (last-known-good preserved)
+       * and is retried on the next boot or via check_provider_updates. Never
+       * invoked from any status path.
+       *
+       * Returns the sync report, or null when the first-sync gate did not apply.
+       */
+      async maybeFirstSyncVerifiedChannel() {
+        if (!this.channelStore) return null;
+        if (this.countVerifiedChannelPointers() > 0) return null;
+        if (!this.hasUpstream()) return null;
+        return this.syncVerifiedChannel();
+      }
       /**
        * Roll a provider back to its previously activated verified object. Pure
        * local pointer flip — no network. Returns the new active digest, or null
@@ -97061,6 +97319,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
         return 0;
       }
     };
+    init_config();
     function normalizeMacAppPath(appPath) {
       const trimmed = String(appPath || "").trim();
       if (!trimmed) return null;
@@ -97102,8 +97361,16 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
     var _providerLoader = null;
     function getProviderLoader() {
       if (!_providerLoader) {
-        _providerLoader = new ProviderLoader({ logFn: () => {
-        } });
+        const appConfig = loadConfig2();
+        _providerLoader = new ProviderLoader({
+          logFn: () => {
+          },
+          // Suppress logs during launch
+          registryUrl: appConfig.registryUrl,
+          serverUrl: appConfig.serverUrl,
+          channel: appConfig.providerChannel,
+          updateChannel: appConfig.updateChannel
+        });
         _providerLoader.loadAll();
         _providerLoader.registerToDetector();
       }
@@ -99667,6 +99934,25 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
         if (!instance) return { success: false, error: `No running instance for session ${sessionId}` };
         const isFriendlyArrayForm = rawResponse && typeof rawResponse === "object" && Array.isArray(rawResponse.answers);
         const payload = isFriendlyArrayForm ? rawResponse : normalizeInteractivePromptResponse2(rawResponse);
+        const heldPrompt = (() => {
+          try {
+            const state = instance.getState?.();
+            return state?.activeChat?.activeInteractivePrompt ?? state?.activeInteractivePrompt ?? null;
+          } catch {
+            return null;
+          }
+        })();
+        const heldPromptId = typeof heldPrompt?.promptId === "string" && heldPrompt.promptId.trim() ? heldPrompt.promptId.trim() : "";
+        const incomingPromptId = typeof payload?.promptId === "string" ? payload.promptId.trim() : "";
+        if (heldPromptId && incomingPromptId && incomingPromptId !== heldPromptId) {
+          return {
+            success: false,
+            error: `Stale promptId "${incomingPromptId}" \u2014 the session's active question is "${heldPromptId}". The answer was NOT applied; re-answer with mesh_answer_question against the active promptId.`,
+            waitingChoice: true,
+            promptId: heldPromptId,
+            stalePromptId: incomingPromptId
+          };
+        }
         ctx.deps.instanceManager.sendEvent(sessionId, "interactive_prompt_response", payload);
         return { success: true };
       }
@@ -113259,7 +113545,13 @@ data: ${JSON.stringify(msg.data)}
           workspace: record2.workspace,
           cliArgs: Array.isArray(record2.meta?.cliArgs) ? record2.meta.cliArgs : [],
           providerSessionId: typeof record2.meta?.providerSessionId === "string" ? String(record2.meta.providerSessionId) : void 0,
-          managedBy: typeof record2.meta?.managedBy === "string" ? String(record2.meta.managedBy) : void 0
+          managedBy: typeof record2.meta?.managedBy === "string" ? String(record2.meta.managedBy) : void 0,
+          // Session-level mesh membership (rc.20 rebound relay envelope) —
+          // surfaced so restoreHostedSessions can re-apply it to the rebuilt
+          // instance settings. Task-level markers stay out (see the descriptor).
+          meshNodeFor: typeof record2.meta?.meshNodeFor === "string" && record2.meta.meshNodeFor.trim() ? String(record2.meta.meshNodeFor).trim() : void 0,
+          meshNodeId: typeof record2.meta?.meshNodeId === "string" && record2.meta.meshNodeId.trim() ? String(record2.meta.meshNodeId).trim() : void 0,
+          launchedByCoordinator: record2.meta?.launchedByCoordinator === true ? true : void 0
         }));
       } finally {
         await client.close().catch(() => {
@@ -113778,12 +114070,22 @@ data: ${JSON.stringify(msg.data)}
         sourceMode: providerSourceMode,
         userDir: appConfig.providerDir,
         registryUrl: appConfig.registryUrl,
+        serverUrl: appConfig.serverUrl,
         providerTarballUrl: appConfig.providerTarballUrl,
         channel: appConfig.providerChannel,
+        updateChannel: appConfig.updateChannel,
         allowUnverifiedTarball: appConfig.providerAllowUnverifiedTarball
       });
       providerLoader.loadAll();
       providerLoader.registerToDetector();
+      void providerLoader.maybeFirstSyncVerifiedChannel().then((report) => {
+        if (!report) return;
+        if (report.status === "error") {
+          LOG2.warn("Init", `Verified channel first-sync failed (last-known-good preserved): ${report.errors.map((e) => e.code).join(", ") || "unknown"}`);
+        } else if (report.activated.length > 0) {
+          LOG2.info("Init", `Verified channel first-sync activated ${report.activated.length} providers (${providerLoader.channel})`);
+        }
+      }).catch((e) => LOG2.warn("Init", `Verified channel first-sync error: ${e?.message || e}`));
       setDefaultProviderLoader(providerLoader);
       const versionArchive = new VersionArchive();
       providerLoader.setVersionArchive(versionArchive);