@adhdev/daemon-core 0.9.82-rc.457 → 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 ? "29441f596e5efe1972b874e0fb5b3d380c9d9bda" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "29441f59" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.457" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-04T08:51:27.287Z" : 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;
 }
@@ -3701,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\`.
@@ -8924,12 +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
@@ -8960,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) {
@@ -9202,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",
@@ -9825,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 {
     }
@@ -9842,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) });
@@ -10123,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 };
   }
 });
@@ -18498,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);
@@ -18527,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,
@@ -30629,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) {
@@ -55262,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}`;
@@ -55314,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;
@@ -55326,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;
@@ -55348,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) {
@@ -55361,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));
@@ -66660,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,
@@ -66891,6 +66992,7 @@ export {
   installGlobalInterceptor,
   interactivePromptFromClaudeAskUserQuestion,
   isActivityChatMessage,
+  isAlwaysOnTraceCategory,
   isBuiltinChatMessageKind,
   isCdpConnected,
   isExtensionInstalled,