@adhdev/daemon-core 0.9.82-rc.456 → 0.9.82-rc.458

package/dist/index.mjs

@@ -404,10 +404,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "49032ec6c48a0cbe6f122e2615088b38407712b6" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "49032ec6" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.456" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-04T07:05:38.214Z" : void 0);
+  const commit = readInjected(true ? "690e14cc1bdb099a0c52d7fffef41329cc5b15b5" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "690e14cc" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.458" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-04T09:53:14.279Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -1585,6 +1585,8 @@ function normalizeConfig(raw) {
     ideSettings: isPlainObject(parsed.ideSettings) ? parsed.ideSettings : {},
     providerSourceMode: resolveProviderSourceMode(parsed.providerSourceMode, parsed.disableUpstream),
     providerDir: asOptionalString(parsed.providerDir),
+    registryUrl: asOptionalString(parsed.registryUrl),
+    providerTarballUrl: asOptionalString(parsed.providerTarballUrl),
     updateChannel: parsed.updateChannel === "preview" ? "preview" : "stable",
     terminalSizingMode: parsed.terminalSizingMode === "fit" ? "fit" : "measured"
   };
@@ -3699,7 +3701,7 @@ function buildRulesSection(coordinatorCliType) {
 - **Verify via git, not source.** Use \`mesh_git_status\` to confirm side effects. Treat agent summaries as self-reports, not verification.
 - **Limit parallelism.** Start with 1\u20132 tasks; scale only on success. Never duplicate a session because \`mesh_read_chat\` shows no final message while tool/terminal activity is ongoing. This caps *concurrent* load \u2014 it does not mean serialize independent work: when a new, independent request arrives and there is headroom under \`maxParallelTasks\`, dispatch it right away rather than waiting for an in-flight task or a user nudge (read-only diagnosis especially, since it has no merge cost).
 - **Check history first.** Call \`mesh_task_history\` at session start to avoid duplicate work and inform recovery. On failure, read task history before retrying.
-- **Sequence shared-base-moving merges.** Parallel dispatch is encouraged, but merging one worktree can advance another in-flight worktree's base \u2014 especially the oss submodule pointer \u2014 turning a clean fast-forward into a diverged rebase (patch-equivalence correctly blocks this). Before merging an in-flight worktree while siblings are also in flight, land in an intentional order, re-clone long-running worktrees from the advanced base, or expect to manually rebase + ff-only the laggards; merging an independent fix mid-flight can strand siblings into a rebase.
+- **Sequence shared-base-moving merges.** Parallel dispatch is encouraged, but merging one worktree can advance another in-flight worktree's base \u2014 especially a shared submodule pointer \u2014 turning a clean fast-forward into a diverged rebase (patch-equivalence correctly blocks this). Before merging an in-flight worktree while siblings are also in flight, land in an intentional order, re-clone long-running worktrees from the advanced base, or expect to manually rebase + ff-only the laggards; merging an independent fix mid-flight can strand siblings into a rebase.
 - **Converge branches.** After worktree tasks: refine/fast-forward, or classify as \`pushed_feature_branch_needs_merge\` / \`blocked_review\` / \`cleanup_candidate\` / \`not_mergeable\`. Clean up with \`mesh_remove_node\`.
 - **Refinery is config-driven.** \`mesh_refine_node\` must run validation from \`.adhdev/refine.{json,yaml,yml}\` or \`repo-mesh.refine.*\`. Heuristics are scaffolding only.
 - **Submodule reachability = publish-needed.** \`submodule_reachability_failed\` \u2192 classify as \`blocked_review\`, request user approval to push to submodule main, then rerun \`mesh_refine_node\`.
@@ -8922,11 +8924,15 @@ var worktree_bootstrap_config_exports = {};
 __export(worktree_bootstrap_config_exports, {
   MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS: () => MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS,
   MESH_WORKTREE_BOOTSTRAP_CONFIG_SCHEMA: () => MESH_WORKTREE_BOOTSTRAP_CONFIG_SCHEMA,
+  SUBMODULE_DEFAULT_BRANCH_FALLBACK: () => SUBMODULE_DEFAULT_BRANCH_FALLBACK,
   WORKTREE_BOOTSTRAP_STALE_RUNNING_MS: () => WORKTREE_BOOTSTRAP_STALE_RUNNING_MS,
   computeStaleInputsDigest: () => computeStaleInputsDigest,
   evaluateWorktreeBootstrapState: () => evaluateWorktreeBootstrapState,
+  getRegisteredSubmodulePaths: () => getRegisteredSubmodulePaths,
+  getSubmoduleConfiguredBranches: () => getSubmoduleConfiguredBranches,
   isWorktreeBootstrapStaleRunning: () => isWorktreeBootstrapStaleRunning,
   loadMeshWorktreeBootstrapConfig: () => loadMeshWorktreeBootstrapConfig,
+  resolveSubmoduleDefaultBranch: () => resolveSubmoduleDefaultBranch,
   runMeshWorktreeBootstrap: () => runMeshWorktreeBootstrap,
   shouldDeferDispatchForBootstrap: () => shouldDeferDispatchForBootstrap,
   validateMeshWorktreeBootstrapConfig: () => validateMeshWorktreeBootstrapConfig
@@ -8957,6 +8963,81 @@ function getRegisteredSubmodulePaths(workspace) {
   }
   return paths;
 }
+function getSubmoduleConfiguredBranches(workspace) {
+  const branchesByPath = /* @__PURE__ */ new Map();
+  try {
+    const out = execFileSync2(
+      resolveWin32Executable("git"),
+      ["config", "--file", ".gitmodules", "--list"],
+      { cwd: workspace, encoding: "utf8", timeout: 1e4, windowsHide: true }
+    );
+    const pathByName = /* @__PURE__ */ new Map();
+    const branchByName = /* @__PURE__ */ new Map();
+    for (const line of String(out).split(/\r?\n/)) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      const eq = trimmed.indexOf("=");
+      if (eq < 0) continue;
+      const key2 = trimmed.slice(0, eq);
+      const value = trimmed.slice(eq + 1).trim();
+      const match = /^submodule\.(.+)\.(path|branch)$/.exec(key2);
+      if (!match) continue;
+      const name = match[1];
+      if (match[2] === "path") {
+        const norm = value.replace(/\\/g, "/").replace(/\/+$/, "");
+        if (norm) pathByName.set(name, norm);
+      } else if (value) {
+        branchByName.set(name, value);
+      }
+    }
+    for (const [name, submodulePath] of pathByName) {
+      const branch = branchByName.get(name);
+      if (branch && branch !== ".") branchesByPath.set(submodulePath, branch);
+    }
+  } catch {
+  }
+  return branchesByPath;
+}
+function isPlausibleBranchName(name) {
+  return typeof name === "string" && name.length > 0 && !/\s/.test(name) && name !== "HEAD";
+}
+async function resolveSubmoduleDefaultBranch(opts) {
+  const remote = opts.remote?.trim() || "origin";
+  const localTimeout = opts.timeoutMs ?? 1e4;
+  const git = resolveWin32Executable("git");
+  const execFileAsync4 = promisify3(execFile3);
+  if (opts.superprojectWorkspace && opts.submodulePath) {
+    try {
+      const normalized = opts.submodulePath.replace(/\\/g, "/").replace(/\/+$/, "");
+      const configured = getSubmoduleConfiguredBranches(opts.superprojectWorkspace).get(normalized);
+      if (isPlausibleBranchName(configured)) return configured;
+    } catch {
+    }
+  }
+  try {
+    const { stdout } = await execFileAsync4(
+      git,
+      ["symbolic-ref", "--short", `refs/remotes/${remote}/HEAD`],
+      { cwd: opts.submoduleRepoPath, encoding: "utf8", timeout: localTimeout, windowsHide: true }
+    );
+    const short = String(stdout || "").trim();
+    const prefix = `${remote}/`;
+    const branch = short.startsWith(prefix) ? short.slice(prefix.length) : short;
+    if (isPlausibleBranchName(branch)) return branch;
+  } catch {
+  }
+  try {
+    const { stdout } = await execFileAsync4(
+      git,
+      ["ls-remote", "--symref", remote, "HEAD"],
+      { cwd: opts.submoduleRepoPath, encoding: "utf8", timeout: Math.max(localTimeout, 3e4), windowsHide: true }
+    );
+    const match = /^ref:\s+refs\/heads\/(\S+)\s+HEAD/m.exec(String(stdout || ""));
+    if (match && isPlausibleBranchName(match[1])) return match[1];
+  } catch {
+  }
+  return SUBMODULE_DEFAULT_BRANCH_FALLBACK;
+}
 function isCleanIgnoringSubmoduleGitlinks(porcelain, submodulePaths) {
   const lines = porcelain.split(/\r?\n/).filter((line) => line.length > 0);
   for (const line of lines) {
@@ -9199,13 +9280,14 @@ async function runMeshWorktreeBootstrap(mesh, workspace) {
   }
   return state;
 }
-var WORKTREE_BOOTSTRAP_STALE_RUNNING_MS, MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS, MESH_WORKTREE_BOOTSTRAP_CONFIG_SCHEMA, DEFAULT_TIMEOUT_MS2, DEFAULT_OUTPUT_LIMIT_BYTES, OUTPUT_SUMMARY_CHARS;
+var WORKTREE_BOOTSTRAP_STALE_RUNNING_MS, SUBMODULE_DEFAULT_BRANCH_FALLBACK, MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS, MESH_WORKTREE_BOOTSTRAP_CONFIG_SCHEMA, DEFAULT_TIMEOUT_MS2, DEFAULT_OUTPUT_LIMIT_BYTES, OUTPUT_SUMMARY_CHARS;
 var init_worktree_bootstrap_config = __esm({
   "src/mesh/worktree-bootstrap-config.ts"() {
     "use strict";
     init_resolve_executable();
     init_refine_config();
     WORKTREE_BOOTSTRAP_STALE_RUNNING_MS = 10 * 60 * 1e3;
+    SUBMODULE_DEFAULT_BRANCH_FALLBACK = "main";
     MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS = [
       ".adhdev/worktree_bootstrap.json",
       ".adhdev/worktree_bootstrap.yaml",
@@ -9822,15 +9904,24 @@ async function resolveSubmodulePushes(status, options, execute, timeoutMs) {
       results.push({ ...base, code: "submodule_status_incomplete" });
       continue;
     }
+    const remoteBranch = await resolveSubmoduleDefaultBranch({
+      submoduleRepoPath: repoPath,
+      superprojectWorkspace: status.repoRoot ?? status.workspace,
+      submodulePath: submodule.path,
+      timeoutMs
+    });
+    base.remoteBranch = remoteBranch;
+    const remoteRef = `refs/remotes/origin/${remoteBranch}`;
+    const fetchRefspec = `refs/heads/${remoteBranch}:${remoteRef}`;
     try {
-      await runGit(repoPath, ["-c", "protocol.file.allow=always", "fetch", "origin", "refs/heads/main:refs/remotes/origin/main"], { timeoutMs: timeoutMs ?? 3e4 });
+      await runGit(repoPath, ["-c", "protocol.file.allow=always", "fetch", "origin", fetchRefspec], { timeoutMs: timeoutMs ?? 3e4 });
     } catch (error) {
       results.push({ ...base, code: "submodule_fetch_failed", error: formatGitError2(error) });
       continue;
     }
     let alreadyReachable = false;
     try {
-      await runGit(repoPath, ["merge-base", "--is-ancestor", submodule.commit, "refs/remotes/origin/main"], { timeoutMs: timeoutMs ?? 15e3 });
+      await runGit(repoPath, ["merge-base", "--is-ancestor", submodule.commit, remoteRef], { timeoutMs: timeoutMs ?? 15e3 });
       alreadyReachable = true;
     } catch {
     }
@@ -9839,20 +9930,20 @@ async function resolveSubmodulePushes(status, options, execute, timeoutMs) {
       continue;
     }
     try {
-      await runGit(repoPath, ["merge-base", "--is-ancestor", "refs/remotes/origin/main", submodule.commit], { timeoutMs: timeoutMs ?? 15e3 });
+      await runGit(repoPath, ["merge-base", "--is-ancestor", remoteRef, submodule.commit], { timeoutMs: timeoutMs ?? 15e3 });
     } catch (error) {
       results.push({ ...base, pushed: false, skipped: false, code: "submodule_non_fast_forward", error: formatGitError2(error) });
       continue;
     }
-    const refspec = `${submodule.commit}:refs/heads/main`;
+    const refspec = `${submodule.commit}:refs/heads/${remoteBranch}`;
     if (!execute) {
       results.push({ ...base, pushed: false, skipped: false, code: "submodule_push_available", refspec });
       continue;
     }
     try {
       await runGit(repoPath, ["push", "origin", refspec], { timeoutMs: timeoutMs ?? 3e4 });
-      await runGit(repoPath, ["-c", "protocol.file.allow=always", "fetch", "origin", "refs/heads/main:refs/remotes/origin/main"], { timeoutMs: timeoutMs ?? 3e4 });
-      await runGit(repoPath, ["merge-base", "--is-ancestor", submodule.commit, "refs/remotes/origin/main"], { timeoutMs: timeoutMs ?? 15e3 });
+      await runGit(repoPath, ["-c", "protocol.file.allow=always", "fetch", "origin", fetchRefspec], { timeoutMs: timeoutMs ?? 3e4 });
+      await runGit(repoPath, ["merge-base", "--is-ancestor", submodule.commit, remoteRef], { timeoutMs: timeoutMs ?? 15e3 });
       results.push({ ...base, pushed: true, skipped: false, code: "submodule_pushed", refspec });
     } catch (error) {
       results.push({ ...base, pushed: false, skipped: false, code: "submodule_push_failed", refspec, error: formatGitError2(error) });
@@ -10120,6 +10211,7 @@ var init_mesh_fast_forward = __esm({
     "use strict";
     init_git_status();
     init_git_executor();
+    init_worktree_bootstrap_config();
     STATUS_OPTIONS = { refreshUpstream: true, includeSubmodules: true, timeoutMs: 15e3, forceFresh: true };
   }
 });
@@ -18495,6 +18587,9 @@ var init_approval_utils = __esm({
 });
 
 // src/logging/debug-config.ts
+function isAlwaysOnTraceCategory(category) {
+  return !!category && ALWAYS_ON_TRACE_CATEGORIES.includes(category);
+}
 function normalizeCategories(categories) {
   if (!Array.isArray(categories)) return [];
   return categories.map((category) => String(category || "").trim()).filter(Boolean);
@@ -18524,17 +18619,19 @@ function resetDebugRuntimeConfig() {
 }
 function shouldCollectTraceCategory(category) {
   const config = currentConfig;
+  if (isAlwaysOnTraceCategory(category)) return true;
   if (!config.collectDebugTrace) return false;
   if (!category) return true;
   if (config.traceCategories.length === 0) return true;
   return config.traceCategories.includes(category);
 }
-var NORMAL_TRACE_BUFFER_SIZE, DEV_TRACE_BUFFER_SIZE, DEFAULT_CONFIG2, currentConfig;
+var NORMAL_TRACE_BUFFER_SIZE, DEV_TRACE_BUFFER_SIZE, ALWAYS_ON_TRACE_CATEGORIES, DEFAULT_CONFIG2, currentConfig;
 var init_debug_config = __esm({
   "src/logging/debug-config.ts"() {
     "use strict";
     NORMAL_TRACE_BUFFER_SIZE = 200;
     DEV_TRACE_BUFFER_SIZE = 1e3;
+    ALWAYS_ON_TRACE_CATEGORIES = ["completion-gate", "fsm-transition"];
     DEFAULT_CONFIG2 = {
       logLevel: "info",
       collectDebugTrace: false,
@@ -30282,6 +30379,35 @@ var DaemonCdpInitializer = class {
 
 // src/commands/handler.ts
 init_builders();
+init_config();
+
+// src/config/registry-resolver.ts
+var DEFAULT_REGISTRY_BASE_URL = "https://api.adhf.dev/api/v1/registry";
+var DEFAULT_PROVIDER_TARBALL_URL = "https://github.com/vilmire/adhdev-providers/archive/refs/heads/main.tar.gz";
+var REGISTRY_URL_ENV_VAR = "ADHDEV_REGISTRY_URL";
+var PROVIDER_TARBALL_URL_ENV_VAR = "ADHDEV_PROVIDER_TARBALL_URL";
+function cleanString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function stripTrailingSlashes(url) {
+  return url.replace(/\/+$/, "");
+}
+function resolveRegistryBaseUrl(configuredUrl, env = process.env) {
+  const resolved = cleanString(configuredUrl) ?? cleanString(env[REGISTRY_URL_ENV_VAR]) ?? DEFAULT_REGISTRY_BASE_URL;
+  return stripTrailingSlashes(resolved);
+}
+function resolveProviderTarballUrl(configuredUrl, env = process.env) {
+  return cleanString(configuredUrl) ?? cleanString(env[PROVIDER_TARBALL_URL_ENV_VAR]) ?? DEFAULT_PROVIDER_TARBALL_URL;
+}
+function resolveProviderTarballTarget(configuredUrl, env = process.env) {
+  const url = resolveProviderTarballUrl(configuredUrl, env);
+  const parsed = new URL(url);
+  return {
+    url,
+    hostname: parsed.hostname,
+    path: parsed.pathname + (parsed.search || "")
+  };
+}
 
 // src/sessions/reconcile.ts
 function upsertSessionTarget(sessionRegistry, target) {
@@ -30597,7 +30723,7 @@ function createDebugTraceStore(options) {
   const capacity = Math.max(1, Math.floor(options.capacity || 100));
   return {
     record(event) {
-      if (!options.enabled) return null;
+      if (!options.enabled && !isAlwaysOnTraceCategory(event.category)) return null;
       const entry = createEntry(event);
       entries.push(entry);
       if (entries.length > capacity) {
@@ -35179,7 +35305,7 @@ var DaemonCommandHandler = class {
     const https = __require("https");
     const fs40 = __require("fs");
     const path44 = __require("path");
-    const REGISTRY = "https://api.adhf.dev/api/v1/registry";
+    const REGISTRY = resolveRegistryBaseUrl(loadConfig().registryUrl);
     function fetchText(url, timeoutMs) {
       return new Promise((resolve25, reject) => {
         const req = https.get(url, { headers: { "User-Agent": "adhdev-daemon", "Accept": "application/json" }, timeout: timeoutMs }, (res) => {
@@ -35541,7 +35667,7 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     const installed = this.handleListInstalledProviders({});
     if (!installed.success) return installed;
     const https = __require("https");
-    const REGISTRY = "https://api.adhf.dev/api/v1/registry";
+    const REGISTRY = resolveRegistryBaseUrl(loadConfig().registryUrl);
     function fetchJson(url) {
       return new Promise((resolve25, reject) => {
         const req = https.get(url, { headers: { "User-Agent": "adhdev-daemon", "Accept": "application/json" }, timeout: 1e4 }, (res) => {
@@ -37144,6 +37270,7 @@ var CHANNEL_SERVER_URL = {
   stable: "https://api.adhf.dev",
   preview: "https://api-preview.adhf.dev"
 };
+var VENDOR_SERVER_URLS = new Set(Object.values(CHANNEL_SERVER_URL));
 function normalizeReleaseChannel(value) {
   if (typeof value !== "string") return null;
   const normalized = value.trim().toLowerCase();
@@ -37165,7 +37292,11 @@ var daemonLifecycleHandlers = {
       const npmTag = CHANNEL_NPM_TAG[channel];
       const latest = String(execNpmCommandSync(["view", `${pkgName}@${npmTag}`, "version"], { encoding: "utf-8", timeout: 1e4 }, npmSurface)).trim();
       LOG.info("Upgrade", `Latest ${pkgName}@${npmTag}: v${latest}`);
-      updateConfig({ updateChannel: channel, serverUrl: CHANNEL_SERVER_URL[channel] });
+      const currentServerUrl = typeof loadConfig().serverUrl === "string" ? loadConfig().serverUrl.trim() : "";
+      const useVendorServerUrl = currentServerUrl === "" || VENDOR_SERVER_URLS.has(currentServerUrl);
+      updateConfig(
+        useVendorServerUrl ? { updateChannel: channel, serverUrl: CHANNEL_SERVER_URL[channel] } : { updateChannel: channel }
+      );
       let currentInstalled = null;
       try {
         const currentJson = String(execNpmCommandSync(["ls", "-g", pkgName, "--depth=0", "--json"], {
@@ -37873,6 +38004,7 @@ function applyPreLaunchTrust(trust, workingDir) {
 
 // src/providers/spec/fsm-driver.ts
 init_logger();
+init_debug_config();
 init_pty_write_chunking();
 function countNewlines(s2) {
   let n = 0;
@@ -37941,6 +38073,11 @@ var FsmDriver = class {
    *  (−1 = whole screen), or a `section:<id>` / `<region>#ignore:<pat>` string
    *  when the clause scopes to a section or declares an ignore_lines filter. */
   regionLastChangedAt = /* @__PURE__ */ new Map();
+  /** COMPLETION-EARLYNOTIFY stable-eval trace: last stable/not-stable verdict
+   *  recorded per stable region, so the trace fires only when the verdict FLIPS
+   *  (not every quiet frame). Cleared on every transition alongside
+   *  regionLastChangedAt. Diagnostic-only — never consulted by the FSM. */
+  stableVerdictCache = /* @__PURE__ */ new Map();
   /** Timer that re-runs evaluate() when a time-condition would flip true
    *  with no PTY frame to trigger it. */
   wakeTimer = null;
@@ -38276,6 +38413,7 @@ var FsmDriver = class {
     this.currentStateId = fired.to;
     this.stateEnteredAt = now;
     this.regionLastChangedAt.clear();
+    this.stableVerdictCache.clear();
     this.pushHistory(fired.to, stateById(this.spec, fired.to)?.label ?? fired.to, {
       reason: "transition",
       via: `${from}\u2192${fired.to}`,
@@ -38380,6 +38518,7 @@ var FsmDriver = class {
   trackRegionChanges(currentLines, cursor, now) {
     if (this.prevScreenLines.length === 0) return;
     const descs = this.stableRegionDescriptors();
+    const stableTraceOn = shouldCollectTraceCategory("fsm-transition");
     const needsSections = descs.some((d) => !!d.section);
     const curSections = needsSections ? resolveSections(this.spec.sections ?? {}, currentLines) : [];
     const prevSections = needsSections ? resolveSections(this.spec.sections ?? {}, this.prevScreenLines) : [];
@@ -38400,6 +38539,28 @@ var FsmDriver = class {
       const cur = filterIgnoredLines(curLines, d.ignoreRe).join("\n");
       const prev = filterIgnoredLines(prevLines, d.ignoreRe).join("\n");
       if (cur !== prev) this.regionLastChangedAt.set(d.key, now);
+      if (stableTraceOn && typeof d.holdMs === "number") {
+        const lastChanged = this.regionLastChangedAt.get(d.key) ?? this.stateEnteredAt;
+        const ageMs = now - lastChanged;
+        const verdict = ageMs >= d.holdMs;
+        if (this.stableVerdictCache.get(d.key) !== verdict) {
+          this.stableVerdictCache.set(d.key, verdict);
+          recordDebugTrace({
+            category: "fsm-transition",
+            stage: "stable-eval",
+            level: "debug",
+            payload: {
+              state: this.currentStateId,
+              regionKey: String(d.key),
+              ignorePattern: d.ignoreRe?.source ?? null,
+              fingerprintLen: cur.length,
+              ageMs,
+              holdMs: d.holdMs,
+              verdict
+            }
+          });
+        }
+      }
     }
   }
   /** Every distinct stable-region descriptor referenced by stable_ms
@@ -38915,7 +39076,8 @@ function collectStableDescriptors(when, byKey) {
   const w = when;
   if ("stable_ms" in w) {
     const key2 = stableRegionKey(w);
-    if (!byKey.has(key2)) {
+    const existing = byKey.get(key2);
+    if (!existing) {
       let ignoreRe;
       if (w.ignore_lines) {
         try {
@@ -38923,7 +39085,9 @@ function collectStableDescriptors(when, byKey) {
         } catch {
         }
       }
-      byKey.set(key2, { key: key2, section: w.section, cursor_above: w.cursor_above, ignoreRe });
+      byKey.set(key2, { key: key2, section: w.section, cursor_above: w.cursor_above, ignoreRe, holdMs: typeof w.stable_ms === "number" ? w.stable_ms : void 0 });
+    } else if (existing.holdMs === void 0 && typeof w.stable_ms === "number") {
+      existing.holdMs = w.stable_ms;
     }
     return;
   }
@@ -40695,6 +40859,7 @@ function createCliAdapter(provider, workingDir, cliArgs, extraEnv, transportFact
 
 // src/providers/cli-provider-instance.ts
 init_logger();
+init_debug_config();
 init_mesh_event_trace();
 init_control_effects();
 init_approval_utils();
@@ -41768,9 +41933,10 @@ var CliProviderInstance = class _CliProviderInstance {
     return restoredHistory.messages;
   }
   completionFinalAssistantEvidence(parsedMessages, turnStartedAt) {
+    const turnClosed = !this.hasAdapterPendingResponse();
     if (this.completionHasFinalAssistantMessage(parsedMessages, turnStartedAt)) {
       return {
-        present: true,
+        present: turnClosed,
         messages: Array.isArray(parsedMessages) ? parsedMessages : [],
         source: "parsed"
       };
@@ -41778,7 +41944,7 @@ var CliProviderInstance = class _CliProviderInstance {
     const externalMessages = this.readExternalCompletionMessages();
     if (externalMessages) {
       return {
-        present: this.completionHasFinalAssistantMessage(externalMessages, turnStartedAt),
+        present: turnClosed && this.completionHasFinalAssistantMessage(externalMessages, turnStartedAt),
         messages: externalMessages,
         source: "external-native"
       };
@@ -41877,11 +42043,9 @@ var CliProviderInstance = class _CliProviderInstance {
     if (latestVisibleStatus !== "idle") return { reason: `status:${latestVisibleStatus}`, terminal: true };
     const adapterAny = this.adapter;
     const approvalResolvedIdle = pending.previousStatus === "waiting_approval";
-    if (!approvalResolvedIdle) {
-      if (adapterAny?.isWaitingForResponse === true) return { reason: "adapter_waiting_for_response", terminal: true };
-      if (adapterAny?.currentTurnScope) return { reason: "adapter_turn_scope_active", terminal: true };
-      if (this.hasAdapterPendingResponse()) return { reason: "adapter_pending_response", terminal: true };
-    }
+    if (adapterAny?.isWaitingForResponse === true) return { reason: "adapter_waiting_for_response", terminal: !approvalResolvedIdle };
+    if (adapterAny?.currentTurnScope) return { reason: "adapter_turn_scope_active", terminal: !approvalResolvedIdle };
+    if (this.hasAdapterPendingResponse()) return { reason: "adapter_pending_response", terminal: !approvalResolvedIdle };
     const partial = typeof this.adapter.getPartialResponse === "function" ? this.adapter.getPartialResponse() : "";
     if (typeof partial === "string" && partial.trim()) return { reason: "partial_response_pending", terminal: true };
     let parsed;
@@ -42036,6 +42200,39 @@ var CliProviderInstance = class _CliProviderInstance {
       event
     };
   }
+  // COMPLETION-EARLYNOTIFY instrumentation. A session-keyed FSM-transition +
+  // completion-gate snapshot recorded into the shared debug-trace ring buffer
+  // (secret-safe, length/role/pattern-name only — never screen or bubble text).
+  // Retrieved via getRecentDebugTrace (chat_debug_bundle). Both categories are a
+  // no-op unless collectDebugTrace is on AND the category is selected, so the
+  // hot-path guards below (completionTraceOn / fsmTraceOn) keep production cost
+  // at a single boolean check.
+  completionTraceOn() {
+    return shouldCollectTraceCategory("completion-gate");
+  }
+  fsmTraceOn() {
+    return shouldCollectTraceCategory("fsm-transition");
+  }
+  recordCompletionGateTrace(stage, payload) {
+    recordDebugTrace({
+      category: "completion-gate",
+      stage,
+      level: "debug",
+      sessionId: this.instanceId,
+      providerType: this.type,
+      payload
+    });
+  }
+  recordFsmTransitionTrace(payload) {
+    recordDebugTrace({
+      category: "fsm-transition",
+      stage: "transition",
+      level: "debug",
+      sessionId: this.instanceId,
+      providerType: this.type,
+      payload
+    });
+  }
   flushCompletedDebounceIfFinalized() {
     const pending = this.completedDebouncePending;
     if (!pending) {
@@ -42048,12 +42245,27 @@ var CliProviderInstance = class _CliProviderInstance {
     LOG.debug("CLI", `[${this.type}] flush attempt: adapterStatus=${latestStatus.status} latestVisible=${latestVisibleStatus} generatingStartedAt=${this.generatingStartedAt} isWaitingForResponse=${!!this.adapter?.isWaitingForResponse} hasPartial=${!!this.adapter.getPartialResponse?.()}`);
     if (latestVisibleStatus !== "idle") {
       LOG.info("CLI", `[${this.type}] cancelled pending completed (resumed ${latestVisibleStatus})`);
+      if (this.completionTraceOn()) this.recordCompletionGateTrace("cancel", {
+        blockReason: "resumed_status",
+        latestVisibleStatus,
+        previousStatus: pending.previousStatus,
+        busyEpochAtArm: pending.busyEpochAtArm,
+        busyEpoch: this.busyEpoch
+      });
       this.completedDebouncePending = null;
       this.completedDebounceTimer = null;
       return;
     }
     if (typeof pending.busyEpochAtArm === "number" && this.busyEpoch !== pending.busyEpochAtArm) {
       LOG.info("CLI", `[${this.type}] cancelled pending completed (busy re-entry during settle: epoch ${pending.busyEpochAtArm}\u2192${this.busyEpoch})`);
+      if (this.completionTraceOn()) this.recordCompletionGateTrace("cancel", {
+        blockReason: "busy_reentry",
+        latestVisibleStatus,
+        previousStatus: pending.previousStatus,
+        busyEpochAtArm: pending.busyEpochAtArm,
+        busyEpoch: this.busyEpoch,
+        busyEpochDelta: this.busyEpoch - pending.busyEpochAtArm
+      });
       this.completedDebouncePending = null;
       this.completedDebounceTimer = null;
       return;
@@ -42061,6 +42273,14 @@ var CliProviderInstance = class _CliProviderInstance {
     const latestOutputAt = typeof latestStatus?.lastOutputAt === "number" ? latestStatus.lastOutputAt : void 0;
     if (typeof pending.lastOutputAtArm === "number" && typeof latestOutputAt === "number" && latestOutputAt > pending.lastOutputAtArm) {
       LOG.info("CLI", `[${this.type}] cancelled pending completed (new PTY output during settle: ${pending.lastOutputAtArm}\u2192${latestOutputAt})`);
+      if (this.completionTraceOn()) this.recordCompletionGateTrace("cancel", {
+        blockReason: "new_pty_output",
+        latestVisibleStatus,
+        previousStatus: pending.previousStatus,
+        lastOutputAtArm: pending.lastOutputAtArm,
+        lastOutputAt: latestOutputAt,
+        lastOutputAtDelta: latestOutputAt - pending.lastOutputAtArm
+      });
       this.completedDebouncePending = null;
       this.completedDebounceTimer = null;
       return;
@@ -42077,6 +42297,14 @@ var CliProviderInstance = class _CliProviderInstance {
           if (this.isMeshWorkerSession()) {
             traceMeshEventDrop("completion_gate_hold", this.meshTraceCtx(), `${blockReason} waited=${waitedMs}ms`);
           }
+          if (this.completionTraceOn()) this.recordCompletionGateTrace("hold", {
+            blockReason,
+            latestVisibleStatus,
+            terminal: block2.terminal === true,
+            holdForTranscript: block2.holdForTranscript === true,
+            approvalResolvedIdle: pending.previousStatus === "waiting_approval",
+            waitedMs
+          });
           pending.loggedBlockReason = blockReason;
         }
         this.scheduleCompletedDebounceFlush(COMPLETED_FINALIZATION_RETRY_MS);
@@ -42096,6 +42324,19 @@ var CliProviderInstance = class _CliProviderInstance {
       if (this.isMeshWorkerSession()) {
         traceMeshEventStage("fired", this.meshTraceCtx(), `forced after ${waitedMs}ms (${blockReason})`);
       }
+      if (this.completionTraceOn()) this.recordCompletionGateTrace("fire", {
+        path: isTranscriptEvidenceGate && !emittedAfterFinalizationTimeout ? "canon_c_decoupled" : "forced_timeout",
+        blockReason,
+        latestVisibleStatus,
+        approvalResolvedIdle: pending.previousStatus === "waiting_approval",
+        finalAssistantPresent: completionDiagnostic.finalAssistantPresent === true,
+        evidenceSource: completionDiagnostic.finalAssistantEvidenceSource ?? null,
+        lastVisibleRole: completionDiagnostic.lastVisibleRole ?? null,
+        lastVisibleContentLen: completionDiagnostic.lastVisibleContentLength ?? null,
+        emittedAfterFinalizationTimeout,
+        waitedMs,
+        busyEpoch: this.busyEpoch
+      });
       this.pushEvent({
         event: "agent:generating_completed",
         chatTitle: pending.chatTitle,
@@ -42123,6 +42364,14 @@ var CliProviderInstance = class _CliProviderInstance {
     if (this.isMeshWorkerSession()) {
       traceMeshEventStage("fired", this.meshTraceCtx(), `duration=${pending.duration}s`);
     }
+    if (this.completionTraceOn()) this.recordCompletionGateTrace("fire", {
+      path: "clean",
+      latestVisibleStatus,
+      approvalResolvedIdle: pending.previousStatus === "waiting_approval",
+      finalAssistantPresent: true,
+      duration: pending.duration,
+      busyEpoch: this.busyEpoch
+    });
     this.pushEvent({
       event: "agent:generating_completed",
       chatTitle: pending.chatTitle,
@@ -42356,6 +42605,18 @@ var CliProviderInstance = class _CliProviderInstance {
     const previousStatus = this.lastStatus;
     if (newStatus !== this.lastStatus) {
       LOG.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
+      if (this.fsmTraceOn()) this.recordFsmTransitionTrace({
+        from: this.lastStatus,
+        to: newStatus,
+        rawStatus,
+        autoApproveActive,
+        autoApproveHoldIdle,
+        autoApproveBusy: this.autoApproveBusy,
+        hasPending: this.hasAdapterPendingResponse(),
+        busyEpoch: this.busyEpoch,
+        lastOutputAt: typeof adapterStatus?.lastOutputAt === "number" ? adapterStatus.lastOutputAt : null,
+        lastScreenChangeAt: typeof adapterStatus?.lastScreenChangeAt === "number" ? adapterStatus.lastScreenChangeAt : null
+      });
       const startingToGeneratingWithActiveTurn = this.lastStatus === "starting" && newStatus === "generating" && this.hasAdapterPendingResponse();
       if (this.lastStatus === "idle" && newStatus === "generating" || startingToGeneratingWithActiveTurn) {
         if (this.completedDebouncePending && this.generatingStartedAt === 0) {
@@ -42482,6 +42743,17 @@ var CliProviderInstance = class _CliProviderInstance {
             if (this.isMeshWorkerSession()) {
               traceMeshEventStage("arm", this.meshTraceCtx(), `short-generating settle-arm (source=${shortEvidenceSource}, missingEvidence=${missingEvidence})`);
             }
+            if (this.completionTraceOn()) this.recordCompletionGateTrace("arm", {
+              branch: "short_generating",
+              previousStatus: this.lastStatus,
+              turnStartedAt: shortTurnStartedAt || null,
+              busyEpochAtArm: this.busyEpoch,
+              lastOutputAtArm: typeof adapterStatus?.lastOutputAt === "number" ? adapterStatus.lastOutputAt : null,
+              flushDelay: NATIVE_HISTORY_MESH_IDLE_SETTLE_MS,
+              evidenceSource: shortEvidenceSource,
+              missingEvidence,
+              hasFinalSummary: !!shortFinalSummary
+            });
             this.scheduleCompletedDebounceFlush(NATIVE_HISTORY_MESH_IDLE_SETTLE_MS);
           } else if (missingEvidence) {
             LOG.info("CLI", `[${this.type}] short completion suppressed: missing final assistant evidence, non-mesh session (source=${shortEvidenceSource})`);
@@ -42530,6 +42802,16 @@ var CliProviderInstance = class _CliProviderInstance {
           const meshSettleSession = this.isAutonomousMeshSession();
           const flushDelay = ownsExternalHistory ? meshSettleSession ? NATIVE_HISTORY_MESH_IDLE_SETTLE_MS : 0 : 3e3;
           LOG.debug("CLI", `[${this.type}] set completedDebouncePending duration=${duration}s ownsExternalHistory=${ownsExternalHistory} meshSettle=${meshSettleSession} flushDelay=${flushDelay}ms generatingStartedAt=${this.generatingStartedAt}`);
+          if (this.completionTraceOn()) this.recordCompletionGateTrace("arm", {
+            branch: "normal",
+            previousStatus: this.completedDebouncePending.previousStatus,
+            turnStartedAt: this.completedDebouncePending.turnStartedAt ?? null,
+            busyEpochAtArm: this.completedDebouncePending.busyEpochAtArm ?? null,
+            lastOutputAtArm: this.completedDebouncePending.lastOutputAtArm ?? null,
+            flushDelay,
+            ownsExternalHistory,
+            meshSettle: meshSettleSession
+          });
           this.scheduleCompletedDebounceFlush(flushDelay);
         }
       } else if (newStatus === "idle" && this.lastStatus === "starting") {
@@ -47534,12 +47816,17 @@ var ProviderLoader = class _ProviderLoader {
   logFn;
   versionArchive = null;
   scriptsCache = /* @__PURE__ */ new Map();
+  /**
+   * Resolved registry base URL and provider tarball URL. Resolution order:
+   * explicit config field (constructor option) → env var → vendor default.
+   * See `config/registry-resolver.ts`.
+   */
+  registryBaseUrl;
+  providerTarballUrl;
   /** Inject VersionArchive so resolve() can auto-detect installed versions */
   setVersionArchive(archive) {
     this.versionArchive = archive;
   }
-  static GITHUB_TARBALL_URL = "https://github.com/vilmire/adhdev-providers/archive/refs/heads/main.tar.gz";
-  static REGISTRY_BASE_URL = "https://api.adhf.dev/api/v1/registry";
   static META_FILE = ".meta.json";
   static REGISTRY_META_FILE = ".registry-meta.json";
   static REPO_PROVIDER_DIRNAME = "adhdev-providers";
@@ -47607,6 +47894,8 @@ var ProviderLoader = class _ProviderLoader {
   constructor(options) {
     this.logFn = options?.logFn || LOG.forComponent("Provider").asLogFn();
     this.probeStarts = options?.probeStarts ?? [process.cwd(), __dirname];
+    this.registryBaseUrl = resolveRegistryBaseUrl(options?.registryUrl);
+    this.providerTarballUrl = resolveProviderTarballUrl(options?.providerTarballUrl);
     this.defaultProvidersDir = path35.join(os25.homedir(), ".adhdev", "providers");
     const detected = this.detectDefaultUserDir();
     this.userDir = detected.path;
@@ -48639,7 +48928,7 @@ var ProviderLoader = class _ProviderLoader {
       this.log("Registry sync skipped (sourceMode=no-upstream)");
       return { updated: false };
     }
-    this.log(`Registry sync starting (${_ProviderLoader.REGISTRY_BASE_URL})...`);
+    this.log(`Registry sync starting (${this.registryBaseUrl})...`);
     const https = __require("https");
     const regMetaPath = path35.join(this.upstreamDir, _ProviderLoader.REGISTRY_META_FILE);
     let cachedChecksums = {};
@@ -48650,7 +48939,7 @@ var ProviderLoader = class _ProviderLoader {
     } catch {
     }
     try {
-      const listUrl = `${_ProviderLoader.REGISTRY_BASE_URL}/providers`;
+      const listUrl = `${this.registryBaseUrl}/providers`;
       const listBody = await new Promise((resolve25, reject) => {
         const req = https.get(listUrl, { headers: { "User-Agent": "adhdev-daemon", "Accept": "application/json" }, timeout: 1e4 }, (res) => {
           if (res.statusCode !== 200) {
@@ -48674,7 +48963,7 @@ var ProviderLoader = class _ProviderLoader {
         const { type, category, checksum, version } = entry;
         const cacheKey = `${category}/${type}`;
         if (cachedChecksums[cacheKey] === checksum) continue;
-        const dlUrl = `${_ProviderLoader.REGISTRY_BASE_URL}/providers/${type}/${version}/download`;
+        const dlUrl = `${this.registryBaseUrl}/providers/${type}/${version}/download`;
         const manifestBody = await new Promise((resolve25, reject) => {
           const req = https.get(dlUrl, { headers: { "User-Agent": "adhdev-daemon", "Accept": "application/json" }, timeout: 3e4 }, (res) => {
             if (res.statusCode !== 200) {
@@ -48741,12 +49030,13 @@ var ProviderLoader = class _ProviderLoader {
       this.log("Upstream check skipped (last check < 30min ago)");
       return { updated: false };
     }
+    const tarballTarget = resolveProviderTarballTarget(this.providerTarballUrl);
     try {
       const etag = await new Promise((resolve25, reject) => {
         const options = {
           method: "HEAD",
-          hostname: "github.com",
-          path: "/vilmire/adhdev-providers/archive/refs/heads/main.tar.gz",
+          hostname: tarballTarget.hostname,
+          path: tarballTarget.path,
           headers: { "User-Agent": "adhdev-launcher" },
           timeout: 1e4
         };
@@ -48787,7 +49077,7 @@ var ProviderLoader = class _ProviderLoader {
       this.log("Downloading latest providers from GitHub...");
       const tmpTar = path35.join(os25.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
       const tmpExtract = path35.join(os25.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
-      await this.downloadFile(_ProviderLoader.GITHUB_TARBALL_URL, tmpTar);
+      await this.downloadFile(tarballTarget.url, tmpTar);
       fs25.mkdirSync(tmpExtract, { recursive: true });
       await execAsync5(`tar -xzf "${tmpTar}" -C "${tmpExtract}"`, { timeout: 3e4 });
       const extracted = fs25.readdirSync(tmpExtract);
@@ -48887,7 +49177,7 @@ var ProviderLoader = class _ProviderLoader {
         etag,
         timestamp,
         lastCheck: new Date(timestamp).toISOString(),
-        source: _ProviderLoader.GITHUB_TARBALL_URL
+        source: this.providerTarballUrl
       }, null, 2));
     } catch {
     }
@@ -49999,6 +50289,47 @@ async function decideOssCloneSync(ossCtx, worktreeOssSha, sourceSha, rg) {
   if (await isAncestor(worktreeOssSha, sourceSha)) return "advance";
   return "skip_diverged";
 }
+async function syncClonedWorktreeSubmodules(worktreePath, sourceWorkspace, rg) {
+  const submodulePaths = getRegisteredSubmodulePaths(worktreePath);
+  if (submodulePaths.size === 0) return;
+  const sourceCtx = { workspace: sourceWorkspace, repoRoot: sourceWorkspace, isGitRepo: true };
+  const worktreeCtx = { workspace: worktreePath, repoRoot: worktreePath, isGitRepo: true };
+  const readStdout = (out) => (typeof out === "string" ? out : out?.stdout ?? "").trim();
+  for (const submodulePath of submodulePaths) {
+    try {
+      const sourceStatusOut = await rg(sourceCtx, ["submodule", "status", submodulePath], { timeoutMs: 1e4 });
+      const sourceSha = readStdout(sourceStatusOut).match(/^[+\- ]?([0-9a-f]{40})/)?.[1];
+      if (!sourceSha) continue;
+      const subCtx = {
+        workspace: `${worktreePath}/${submodulePath}`,
+        repoRoot: `${worktreePath}/${submodulePath}`,
+        isGitRepo: true
+      };
+      const worktreeSubSha = readStdout(await rg(subCtx, ["rev-parse", "HEAD"], { timeoutMs: 1e4 }));
+      if (!worktreeSubSha || worktreeSubSha === sourceSha) continue;
+      await rg(subCtx, ["fetch", `${sourceWorkspace}/${submodulePath}`, "HEAD"], { timeoutMs: 6e4 });
+      let action;
+      try {
+        action = await decideOssCloneSync(subCtx, worktreeSubSha, sourceSha, rg);
+      } catch (decideErr) {
+        action = "skip_diverged";
+        console.warn(`[mesh] ${submodulePath} submodule sync guard could not resolve ancestry (kept fresh worktree HEAD): ${decideErr?.message ?? decideErr}`);
+      }
+      if (action === "advance") {
+        await rg(subCtx, ["checkout", sourceSha], { timeoutMs: 1e4 });
+        await rg(worktreeCtx, ["add", submodulePath], { timeoutMs: 1e4 });
+        await rg(worktreeCtx, ["commit", "-m", `chore: sync ${submodulePath} to source node HEAD on clone`], { timeoutMs: 1e4 });
+        console.log(`[mesh] Advanced ${submodulePath} submodule to newer source HEAD ${sourceSha.slice(0, 8)} in worktree`);
+      } else if (action === "skip_rewind") {
+        console.warn(`[mesh] Skipped ${submodulePath} submodule rewind on clone: source node ${submodulePath} ${sourceSha.slice(0, 8)} is an ancestor of the fresh worktree ${submodulePath} ${worktreeSubSha.slice(0, 8)} \u2014 kept fresher worktree HEAD`);
+      } else if (action === "skip_diverged") {
+        console.warn(`[mesh] Skipped ${submodulePath} submodule sync on clone: source node ${submodulePath} ${sourceSha.slice(0, 8)} diverged from the fresh worktree ${submodulePath} ${worktreeSubSha.slice(0, 8)} \u2014 kept worktree HEAD (coordinator reconciles)`);
+      }
+    } catch (subErr) {
+      console.warn(`[mesh] ${submodulePath} submodule sync to source HEAD failed (best-effort):`, subErr?.message ?? subErr);
+    }
+  }
+}
 var meshCrudHandlers = {
   list_meshes: async (ctx, _args) => {
     try {
@@ -50703,42 +51034,8 @@ var meshCrudHandlers = {
             submodulesInitialized2 = true;
             const sourceWorkspace = sourceNode.repoRoot || sourceNode.workspace;
             if (sourceWorkspace) {
-              try {
-                const { runGit: rg } = await Promise.resolve().then(() => (init_git_executor(), git_executor_exports));
-                const sourceCtx = { workspace: sourceWorkspace, repoRoot: sourceWorkspace, isGitRepo: true };
-                const worktreeCtx = { workspace: result.worktreePath, repoRoot: result.worktreePath, isGitRepo: true };
-                const sourceStatusOut = await rg(sourceCtx, ["submodule", "status", "oss"], { timeoutMs: 1e4 });
-                const sourceStatusLine = (typeof sourceStatusOut === "string" ? sourceStatusOut : sourceStatusOut?.stdout ?? "").trim();
-                const sourceShaMatch = sourceStatusLine.match(/^[+\- ]?([0-9a-f]{40})/);
-                const sourceSha = sourceShaMatch?.[1];
-                if (sourceSha) {
-                  const ossCtx = { workspace: `${result.worktreePath}/oss`, repoRoot: `${result.worktreePath}/oss`, isGitRepo: true };
-                  const worktreeOssHeadOut = await rg(ossCtx, ["rev-parse", "HEAD"], { timeoutMs: 1e4 });
-                  const worktreeOssSha = (typeof worktreeOssHeadOut === "string" ? worktreeOssHeadOut : worktreeOssHeadOut?.stdout ?? "").trim();
-                  if (worktreeOssSha && worktreeOssSha !== sourceSha) {
-                    await rg(ossCtx, ["fetch", `${sourceWorkspace}/oss`, "HEAD"], { timeoutMs: 6e4 });
-                    let ossAction;
-                    try {
-                      ossAction = await decideOssCloneSync(ossCtx, worktreeOssSha, sourceSha, rg);
-                    } catch (decideErr) {
-                      ossAction = "skip_diverged";
-                      console.warn(`[mesh] oss submodule sync guard could not resolve ancestry (kept fresh worktree HEAD): ${decideErr?.message ?? decideErr}`);
-                    }
-                    if (ossAction === "advance") {
-                      await rg(ossCtx, ["checkout", sourceSha], { timeoutMs: 1e4 });
-                      await rg(worktreeCtx, ["add", "oss"], { timeoutMs: 1e4 });
-                      await rg(worktreeCtx, ["commit", "-m", "chore: sync oss to source node HEAD on clone"], { timeoutMs: 1e4 });
-                      console.log(`[mesh] Advanced oss submodule to newer source HEAD ${sourceSha.slice(0, 8)} in worktree`);
-                    } else if (ossAction === "skip_rewind") {
-                      console.warn(`[mesh] Skipped oss submodule rewind on clone: source node oss ${sourceSha.slice(0, 8)} is an ancestor of the fresh worktree oss ${worktreeOssSha.slice(0, 8)} \u2014 kept fresher worktree HEAD`);
-                    } else if (ossAction === "skip_diverged") {
-                      console.warn(`[mesh] Skipped oss submodule sync on clone: source node oss ${sourceSha.slice(0, 8)} diverged from the fresh worktree oss ${worktreeOssSha.slice(0, 8)} \u2014 kept worktree HEAD (coordinator reconciles)`);
-                    }
-                  }
-                }
-              } catch (ossErr) {
-                console.warn("[mesh] oss submodule sync to source HEAD failed (best-effort):", ossErr.message);
-              }
+              const { runGit: rg } = await Promise.resolve().then(() => (init_git_executor(), git_executor_exports));
+              await syncClonedWorktreeSubmodules(result.worktreePath, sourceWorkspace, rg);
             }
           } catch (subErr) {
             console.warn("[mesh] Submodule init failed for worktree:", subErr.message);
@@ -52172,6 +52469,26 @@ import { execFileSync as execFileSync6 } from "child_process";
 import { existsSync as existsSync40, readFileSync as readFileSync31 } from "fs";
 import { resolve as resolve19 } from "path";
 var PREVIEW_DEPLOY_RECORD = ".adhdev/preview-deploy.json";
+var PREVIEW_PIPELINE_SCRIPTS = [
+  "scripts/preview-freshness.mjs",
+  "scripts/smoke-preview-web.mjs",
+  "scripts/deploy-preview-local.mjs"
+];
+function hasDeployPreviewNpmScript(repoRoot) {
+  const pkgPath = resolve19(repoRoot, "package.json");
+  if (!existsSync40(pkgPath)) return false;
+  try {
+    const pkg = JSON.parse(readFileSync31(pkgPath, "utf8"));
+    return typeof pkg?.scripts?.["deploy:preview"] === "string";
+  } catch {
+    return false;
+  }
+}
+function isPreviewPipelineConfigured(repoRoot) {
+  if (existsSync40(resolve19(repoRoot, PREVIEW_DEPLOY_RECORD))) return true;
+  if (PREVIEW_PIPELINE_SCRIPTS.some((rel) => existsSync40(resolve19(repoRoot, rel)))) return true;
+  return hasDeployPreviewNpmScript(repoRoot);
+}
 function runGit2(repoRoot, args) {
   try {
     return execFileSync6("git", args, {
@@ -52223,6 +52540,7 @@ function readCurrentMainCommit(repoRoot) {
   return { currentMainCommit: null, currentMainCommitSource: "unknown" };
 }
 function buildPreviewFreshness(repoRoot) {
+  if (!isPreviewPipelineConfigured(repoRoot)) return null;
   const current = readCurrentMainCommit(repoRoot);
   const record = readRecord6(repoRoot);
   const lastPreviewCommit = normalizeCommit(record?.lastPreviewCommit);
@@ -55038,6 +55356,7 @@ async function runMeshRefineSubmoduleReachabilityGate(repoRoot, mergedTree, opti
         commit: gitlink.commit,
         reachable: false
       };
+      let submoduleDefaultBranch = "main";
       try {
         if (!fs30.existsSync(submodulePath)) {
           entry.error = `Submodule checkout missing at ${gitlink.path}`;
@@ -55090,9 +55409,14 @@ async function runMeshRefineSubmoduleReachabilityGate(repoRoot, mergedTree, opti
             entries.push(entry);
             continue;
           }
-          entry.remoteMainBranch = "main";
+          submoduleDefaultBranch = await resolveSubmoduleDefaultBranch({
+            submoduleRepoPath: submodulePath,
+            superprojectWorkspace: repoRoot,
+            submodulePath: gitlink.path
+          });
+          entry.remoteMainBranch = submoduleDefaultBranch;
           try {
-            await verifyRemoteMainContainsCommit(submodulePath, gitlink.commit, "main");
+            await verifyRemoteMainContainsCommit(submodulePath, gitlink.commit, submoduleDefaultBranch);
             entry.fetchedFromOrigin = true;
             entry.remoteReachable = true;
             entry.remoteMainReachable = true;
@@ -55102,17 +55426,17 @@ async function runMeshRefineSubmoduleReachabilityGate(repoRoot, mergedTree, opti
             entry.remoteMainReachable = false;
             entry.publishRequired = true;
             const details = truncateValidationOutput(e?.stderr || e?.message || String(e));
-            entry.error = `Submodule remote main reachability check failed for origin/main: ${details}`;
+            entry.error = `Submodule remote main reachability check failed for origin/${submoduleDefaultBranch}: ${details}`;
             if (options.allowAutoPublishSubmoduleMainCommits === true && entry.localReachable === true) {
               entry.autoPublishAllowed = true;
               entry.autoPublishAttempted = true;
               try {
-                const publish = await publishCommitToRemoteMain(submodulePath, gitlink.commit, "main");
+                const publish = await publishCommitToRemoteMain(submodulePath, gitlink.commit, submoduleDefaultBranch);
                 entry.autoPublishRefspec = publish.refspec;
                 entry.publishStdout = truncateValidationOutput(publish.stdout);
                 entry.publishStderr = truncateValidationOutput(publish.stderr);
                 entry.autoPublishSucceeded = true;
-                await verifyRemoteMainContainsCommit(submodulePath, gitlink.commit, "main");
+                await verifyRemoteMainContainsCommit(submodulePath, gitlink.commit, submoduleDefaultBranch);
                 entry.fetchedFromOrigin = true;
                 entry.remoteReachable = true;
                 entry.remoteMainReachable = true;
@@ -55124,12 +55448,12 @@ async function runMeshRefineSubmoduleReachabilityGate(repoRoot, mergedTree, opti
                 entry.autoPublishSucceeded = false;
                 entry.autoPublishVerified = false;
                 const publishDetails = truncateValidationOutput(publishError?.stderr || publishError?.message || String(publishError));
-                entry.error = `Submodule auto-publish to origin/main failed or could not be verified: ${publishDetails}`;
+                entry.error = `Submodule auto-publish to origin/${submoduleDefaultBranch} failed or could not be verified: ${publishDetails}`;
               }
             } else if (options.allowAutoPublishSubmoduleMainCommits === true) {
               entry.autoPublishAllowed = true;
               entry.autoPublishAttempted = false;
-              entry.autoPublishSkippedReason = entry.autoPublishSkippedReason || "candidate commit is not reachable in the source checkout or worktree submodule, so Refinery cannot push it to origin/main";
+              entry.autoPublishSkippedReason = entry.autoPublishSkippedReason || `candidate commit is not reachable in the source checkout or worktree submodule, so Refinery cannot push it to origin/${submoduleDefaultBranch}`;
             }
           }
         } catch (e) {
@@ -55137,7 +55461,7 @@ async function runMeshRefineSubmoduleReachabilityGate(repoRoot, mergedTree, opti
           entry.remoteMainReachable = false;
           entry.publishRequired = true;
           const details = truncateValidationOutput(e?.stderr || e?.message || String(e));
-          entry.error = `Submodule remote main reachability check failed for origin/main: ${details}`;
+          entry.error = `Submodule remote main reachability check failed for origin/${submoduleDefaultBranch}: ${details}`;
         }
       } catch (e) {
         entry.error = truncateValidationOutput(e?.message || String(e));
@@ -65943,7 +66267,9 @@ async function initDaemonComponents(config) {
   const providerLoader = new ProviderLoader({
     logFn: config.providerLogFn,
     sourceMode: providerSourceMode,
-    userDir: appConfig.providerDir
+    userDir: appConfig.providerDir,
+    registryUrl: appConfig.registryUrl,
+    providerTarballUrl: appConfig.providerTarballUrl
   });
   providerLoader.loadAll();
   providerLoader.registerToDetector();
@@ -66434,6 +66760,7 @@ var V1_ALL_PRIMITIVES = Object.freeze(
 );
 var V1_CONTRACT_VERSION = "1.0.0";
 export {
+  ALWAYS_ON_TRACE_CATEGORIES,
   AcpProviderInstance,
   AgentStreamPoller,
   BUILTIN_CHAT_MESSAGE_KINDS,
@@ -66665,6 +66992,7 @@ export {
   installGlobalInterceptor,
   interactivePromptFromClaudeAskUserQuestion,
   isActivityChatMessage,
+  isAlwaysOnTraceCategory,
   isBuiltinChatMessageKind,
   isCdpConnected,
   isExtensionInstalled,