@adhdev/daemon-core 0.9.82-rc.437 → 0.9.82-rc.439

package/dist/index.js

@@ -409,10 +409,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "07c5209009300611151cd8363b63b4b066b6ecec" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "07c52090" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.437" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-07-01T00:49:44.850Z" : void 0);
+  const commit = readInjected(true ? "065287032ac520cf8950f90025e1758b873723b1" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "06528703" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.439" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-07-01T04:55:17.522Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -2863,16 +2863,21 @@ __export(mesh_config_exports, {
   createMesh: () => createMesh,
   createMeshHostPairingToken: () => createMeshHostPairingToken,
   deleteMesh: () => deleteMesh,
+  getMagiKindPanel: () => getMagiKindPanel,
   getMagiPanel: () => getMagiPanel,
   getMesh: () => getMesh,
   getMeshByRepo: () => getMeshByRepo,
+  listMagiKindPanels: () => listMagiKindPanels,
   listMagiPanels: () => listMagiPanels,
   listMeshes: () => listMeshes,
   markMeshHostPairingJoined: () => markMeshHostPairingJoined,
   normalizeMagiPanel: () => normalizeMagiPanel,
+  normalizeMagiSlots: () => normalizeMagiSlots,
   normalizeRepoIdentity: () => normalizeRepoIdentity,
+  removeMagiKindPanel: () => removeMagiKindPanel,
   removeMagiPanel: () => removeMagiPanel,
   removeNode: () => removeNode,
+  setMagiKindPanel: () => setMagiKindPanel,
   tokenIdForManualPairing: () => tokenIdForManualPairing,
   updateMesh: () => updateMesh,
   updateNode: () => updateNode,
@@ -3288,11 +3293,13 @@ function normalizeMagiPanel(config) {
       throw new Error(`invalid_magi_panel: member[${idx}].provider is required`);
     }
     const nodeId = typeof m.nodeId === "string" && m.nodeId.trim() ? m.nodeId.trim() : void 0;
+    const model = typeof m.model === "string" && m.model.trim() ? m.model.trim() : void 0;
     const capabilityTags = normalizeCapabilityTags(m.capabilityTags);
     const n = normalizeReplicaCount(m.n);
     return {
       provider,
       ...nodeId ? { nodeId } : {},
+      ...model ? { model } : {},
       ...capabilityTags ? { capabilityTags } : {},
       ...n !== void 0 ? { n } : {}
     };
@@ -3345,7 +3352,78 @@ function removeMagiPanel(name) {
   saveMeshConfig(stored);
   return true;
 }
-var import_fs3, import_path3, import_crypto3, mergeMeshPolicy, MAX_MAGI_PANEL_MEMBERS;
+function normalizeMagiTaskKindKey(raw) {
+  const s2 = typeof raw === "string" ? raw.trim().toLowerCase() : "";
+  if (!MAGI_KIND_PANEL_KINDS.includes(s2)) {
+    throw new Error(`invalid_magi_kind_panel: task_kind must be one of ${MAGI_KIND_PANEL_KINDS.join(" / ")} (got '${s2 || "(empty)"}')`);
+  }
+  return s2;
+}
+function normalizeMagiSlots(slots) {
+  if (!Array.isArray(slots) || slots.length === 0) {
+    throw new Error("invalid_magi_kind_panel: slots must be a non-empty array");
+  }
+  if (slots.length > MAX_MAGI_KIND_SLOTS) {
+    throw new Error(`invalid_magi_kind_panel: too many slots (max ${MAX_MAGI_KIND_SLOTS})`);
+  }
+  return slots.map((entry, idx) => {
+    if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+      throw new Error(`invalid_magi_kind_panel: slot[${idx}] must be an object`);
+    }
+    const s2 = entry;
+    const provider = typeof s2.provider === "string" ? s2.provider.trim() : "";
+    if (!provider) {
+      throw new Error(`invalid_magi_kind_panel: slot[${idx}].provider is required`);
+    }
+    const nodeId = typeof s2.nodeId === "string" && s2.nodeId.trim() ? s2.nodeId.trim() : void 0;
+    const model = typeof s2.model === "string" && s2.model.trim() ? s2.model.trim() : void 0;
+    const capabilityTags = normalizeCapabilityTags(s2.capabilityTags);
+    const n = normalizeReplicaCount(s2.n);
+    return {
+      provider,
+      ...nodeId ? { nodeId } : {},
+      ...model ? { model } : {},
+      ...capabilityTags ? { capabilityTags } : {},
+      ...n !== void 0 ? { n } : {}
+    };
+  });
+}
+function listMagiKindPanels() {
+  return loadMeshConfig().magiKindPanels ?? {};
+}
+function getMagiKindPanel(kind) {
+  let key2;
+  try {
+    key2 = normalizeMagiTaskKindKey(kind);
+  } catch {
+    return void 0;
+  }
+  return loadMeshConfig().magiKindPanels?.[key2];
+}
+function setMagiKindPanel(kind, slots) {
+  const key2 = normalizeMagiTaskKindKey(kind);
+  const normalized = normalizeMagiSlots(slots);
+  const stored = loadMeshConfig();
+  const map = stored.magiKindPanels ?? {};
+  map[key2] = normalized;
+  stored.magiKindPanels = map;
+  saveMeshConfig(stored);
+  return normalized;
+}
+function removeMagiKindPanel(kind) {
+  let key2;
+  try {
+    key2 = normalizeMagiTaskKindKey(kind);
+  } catch {
+    return false;
+  }
+  const stored = loadMeshConfig();
+  if (!stored.magiKindPanels || !stored.magiKindPanels[key2]) return false;
+  delete stored.magiKindPanels[key2];
+  saveMeshConfig(stored);
+  return true;
+}
+var import_fs3, import_path3, import_crypto3, mergeMeshPolicy, MAX_MAGI_PANEL_MEMBERS, MAGI_KIND_PANEL_KINDS, MAX_MAGI_KIND_SLOTS;
 var init_mesh_config = __esm({
   "src/config/mesh-config.ts"() {
     "use strict";
@@ -3358,6 +3436,8 @@ var init_mesh_config = __esm({
     init_mesh_host_ownership();
     mergeMeshPolicy = mergeAndNormalizePolicy;
     MAX_MAGI_PANEL_MEMBERS = 24;
+    MAGI_KIND_PANEL_KINDS = ["claim_audit", "rca", "design", "freeform"];
+    MAX_MAGI_KIND_SLOTS = 24;
   }
 });
 
@@ -3421,6 +3501,7 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
   sections.push(TOOLS_SECTION);
   sections.push(TOOL_EXPOSURE_PREFLIGHT_SECTION);
   sections.push(WORKFLOW_SECTION);
+  sections.push(ONBOARDING_SECTION);
   sections.push(buildRulesSection(coordinatorCliType));
   return sections.join("\n\n");
 }
@@ -3453,6 +3534,7 @@ function expandPromptPlaceholders(template, ctx) {
     policy: buildPolicySection(mergeAndNormalizePolicy(void 0, mesh.policy)),
     tools: TOOLS_SECTION,
     workflow: WORKFLOW_SECTION,
+    onboarding: ONBOARDING_SECTION,
     rules: buildRulesSection(coordinatorCliType),
     toolExposurePreflight: TOOL_EXPOSURE_PREFLIGHT_SECTION
   };
@@ -3611,7 +3693,7 @@ function buildRulesSection(coordinatorCliType) {
 - **Never fabricate tool results.** Always call the actual tool.
 - **Keep the user informed.** One or two sentences after each delegation round.${coordinatorNote}`;
 }
-var fs2, os2, path8, TOOLS_SECTION, TOOL_EXPOSURE_PREFLIGHT_SECTION, WORKFLOW_SECTION;
+var fs2, os2, path8, TOOLS_SECTION, TOOL_EXPOSURE_PREFLIGHT_SECTION, WORKFLOW_SECTION, ONBOARDING_SECTION;
 var init_coordinator_prompt = __esm({
   "src/mesh/coordinator-prompt.ts"() {
     "use strict";
@@ -3643,7 +3725,12 @@ var init_coordinator_prompt = __esm({
 | \`mesh_clone_node\` | Create a worktree node for isolated parallel branch work |
 | \`mesh_refine_node\` | Validate and merge a completed worktree node back into its base branch |
 | \`mesh_remove_node\` | Remove a node (cleans up worktree if applicable) |
-| \`mesh_cleanup_sessions\` | Manually clean up delegated session records for a node |`;
+| \`mesh_cleanup_sessions\` | Manually clean up delegated session records for a node |
+| \`mesh_init\` | Guided onboarding for a fresh repo: dry-run scan \u2192 suggest \`.adhdev/*\` configs (refine/bootstrap/change-impact) + providerPriority + current-config echo; gated write on approval |
+| \`mesh_reinit\` | Re-onboard an already-configured repo: re-suggest with overwrite semantics + current-vs-suggested diff; dry-run preview first, per-section approval before write |
+| \`mesh_write_mesh_json_config\` | Gated write of \`.adhdev/mesh.json\` (repo coordinator-prompt config) from the mesh entry \u2014 dry-run/overwrite like mesh_init |
+| \`mesh_magi_kind_panel_set\` | Bind a task_kind \u2192 MAGI kind-panel slots (machine-local, wholesale replacement \u2014 approve current-vs-new first) |
+| \`mesh_magi_kind_panel_list\` | List configured task_kind \u2192 MAGI kind-panel slot bindings (machine-local, read-only) |`;
     TOOL_EXPOSURE_PREFLIGHT_SECTION = `## Tool Exposure Preflight
 
 Before doing any coordinator work, confirm that the actual callable tool list includes \`mesh_status\` and the other \`mesh_*\` tools from the table above. If this Repo Mesh coordinator prompt is present but the callable \`mesh_*\` tools are missing, the MCP server/tool manifest is stale or not injected yet. Do not substitute terminal/file/git tools, do not inspect or edit the repository directly, and do not continue as a non-mesh local coding agent. Stop immediately and tell the user to run \`/reload-mcp\` or start a fresh coordinator session so ADHDev can reconnect \`adhdev-mesh\`.`;
@@ -3676,6 +3763,28 @@ Follow these recovery rules:
 2. **If "Max retries exceeded"**: Do NOT retry on the same node. Either reassign the task to a different node, or inform the user that the task requires manual intervention.
 3. **If no recovery context**: The stop may be intentional (normal completion). Use \`mesh_read_chat\` once to verify, then move on.
 4. **Always record what happened**: After handling a failure, briefly note the outcome in your report to the user.`;
+    ONBOARDING_SECTION = `## Onboarding / Reinit
+
+When the user asks to **set up / configure / onboard** this repo for Repo Mesh (or to **re-init / reconfigure** an already-onboarded repo), run ONE guided, approval-gated conversation. You draft, the user approves, the daemon writes. Never auto-write a heuristic suggestion without an explicit user approval turn.
+
+**Save scopes \u2014 label every draft with its scope before asking for approval:**
+- **repo-file (commit target)** \u2014 \`.adhdev/refine.json\`, \`.adhdev/worktree_bootstrap.json\`, \`.adhdev/change-impact.json\`, \`.adhdev/mesh.json\`. These are committed to the repository and shared with every machine/contributor.
+- **machine-local** \u2014 MAGI kind\u2192panel bindings and named MAGI panels, node providerPriority (\`~/.adhdev/meshes.json\`). These stay on this machine and are NOT committed.
+
+**Guided sequence:**
+1. **Scan (dry-run)** \u2014 Call \`mesh_init\` (write=false, the default). It returns per-domain suggested configs for refine / worktree_bootstrap / change-impact, a recommended providerPriority, AND \`currentConfig\` \u2014 the currently-saved config per domain (repo files + machine-local \`magiKindPanels\`). Nothing is written.
+2. **Present drafts** \u2014 For each domain, show the user the suggested config with its **save scope label** (repo-file vs machine-local). When \`currentConfig\` already has a saved value for a domain (init on a partially-onboarded repo, or any reinit), present a **current-vs-suggested diff**, not just the suggestion.
+3. **Approve \u2192 gated write** \u2014 Only after the user approves, call the matching gated-write tool:
+   - repo \`.adhdev/*\` config files \u2192 \`mesh_init\` with \`write=true\` (and \`overwrite=true\` ONLY for domains the user approved replacing).
+   - \`.adhdev/mesh.json\` (coordinator prompt / operating notes) \u2192 \`mesh_write_mesh_json_config\` (write=true, overwrite only if approved).
+   - machine-local MAGI kind\u2192panel slots \u2192 \`mesh_magi_kind_panel_set\` (write=true). NOTE: a kind binding is a **wholesale replacement** of that kind's slot list \u2014 present the current-vs-new slots first.
+   - machine-local named MAGI panels \u2192 \`mesh_magi_panel_set\`. providerPriority \u2192 apply via node policy update.
+
+**init vs reinit:**
+- **\`mesh_init\`** \u2014 for a fresh, never-onboarded repo. Existing config files are kept (existing-wins) unless the user explicitly approves overwrite. Use for first-time setup.
+- **\`mesh_reinit\`** \u2014 for a repo that is already onboarded and needs its config refreshed. It re-suggests with OVERWRITE semantics and returns the current-vs-suggested \`currentConfig\` echo. Its first call is a DRY-RUN preview: you MUST present the per-section current-vs-suggested diff and get EXPLICIT per-section approval before re-invoking with write=true. Overwrite is a wholesale replacement, so it silently drops operator hand-edits if you skip the diff \u2014 never do that.
+
+`;
   }
 });
 
@@ -5278,6 +5387,7 @@ function enqueueTask(meshId, message, opts) {
       ...dependsOn.length > 0 ? { dependsOn } : {},
       ...typeof opts?.missionId === "string" && opts.missionId.trim() ? { missionId: opts.missionId.trim() } : {},
       ...typeof opts?.consensusGroupId === "string" && opts.consensusGroupId.trim() ? { consensusGroupId: opts.consensusGroupId.trim() } : {},
+      ...typeof opts?.model === "string" && opts.model.trim() ? { model: opts.model.trim() } : {},
       ...typeof opts?.sourceCoordinatorSessionId === "string" && opts.sourceCoordinatorSessionId.trim() ? { sourceCoordinatorSessionId: opts.sourceCoordinatorSessionId.trim() } : {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -12977,7 +13087,10 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
             launchResult2 = await components.dispatchMeshCommand(launchTarget.daemonId, "launch_cli", {
               cliType: resolved.providerType,
               dir: node.workspace,
-              settings: remoteSettings
+              settings: remoteSettings,
+              // MAGI-KIND-PANEL model axis: forward the task's model override so the
+              // remote worker session launches with it (initialModel). Best-effort.
+              ...typeof task.model === "string" && task.model.trim() ? { initialModel: task.model.trim() } : {}
             });
           } catch (e) {
             markAutoLaunch(meshId, task.id, { status: "failed", reason: `remote_launch_dispatch_failed: ${e?.message || String(e)}`, nodeId, providerType: resolved.providerType });
@@ -13003,7 +13116,10 @@ async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
         const launchResult = await components.cliManager.handleCliCommand("launch_cli", {
           cliType: resolved.providerType,
           dir: node.workspace,
-          settings: launchSettings
+          settings: launchSettings,
+          // MAGI-KIND-PANEL model axis: local launch forwards the task's model
+          // override as initialModel (CLI → modelLaunchArgs; ACP → setConfigOption).
+          ...typeof task.model === "string" && task.model.trim() ? { initialModel: task.model.trim() } : {}
         });
         if (!launchResult?.success) {
           const reason = launchResult?.error || "launch_cli_failed";
@@ -18261,6 +18377,11 @@ var init_provider_schema = __esm({
           minimum: 0,
           description: "Delay between pasting prompt text and pressing Enter."
         },
+        modelLaunchArgs: {
+          type: "array",
+          items: { type: "string" },
+          description: "Template for expanding an initialModel selection into launch args. '{{model}}' is substituted with the model string (e.g. ['--model', '{{model}}'] \u2192 --model opus). Applied at launch when a model is requested for this CLI provider (MAGI kind-panel model axis). Absent \u2192 no launch-time model selection."
+        },
         scriptCallBudgetMs: {
           type: "integer",
           minimum: 1,
@@ -23813,6 +23934,7 @@ __export(index_exports, {
   getLedgerDir: () => getLedgerDir,
   getLedgerSummary: () => getLedgerSummary,
   getLogLevel: () => getLogLevel,
+  getMagiKindPanel: () => getMagiKindPanel,
   getMagiPanel: () => getMagiPanel,
   getMesh: () => getMesh,
   getMeshByRepo: () => getMeshByRepo,
@@ -23869,6 +23991,7 @@ __export(index_exports, {
   launchWithCdp: () => launchWithCdp,
   listCoordinatorsForWorkspace: () => listCoordinatorsForWorkspace,
   listHostedCliRuntimes: () => listHostedCliRuntimes,
+  listMagiKindPanels: () => listMagiKindPanels,
   listMagiPanels: () => listMagiPanels,
   listMeshMissionSummaries: () => listMeshMissionSummaries,
   listMeshes: () => listMeshes,
@@ -23904,6 +24027,7 @@ __export(index_exports, {
   normalizeInteractivePrompt: () => normalizeInteractivePrompt,
   normalizeInteractivePromptResponse: () => normalizeInteractivePromptResponse,
   normalizeMagiPanel: () => normalizeMagiPanel,
+  normalizeMagiSlots: () => normalizeMagiSlots,
   normalizeManagedStatus: () => normalizeManagedStatus,
   normalizeMeshCapabilityTags: () => normalizeMeshCapabilityTags,
   normalizeMeshDaemonRole: () => normalizeMeshDaemonRole,
@@ -23941,6 +24065,7 @@ __export(index_exports, {
   recordMeshToolCall: () => recordMeshToolCall,
   registerExtensionProviders: () => registerExtensionProviders,
   registerMeshCoordinator: () => registerMeshCoordinator,
+  removeMagiKindPanel: () => removeMagiKindPanel,
   removeMagiPanel: () => removeMagiPanel,
   removeNode: () => removeNode,
   removeWorktree: () => removeWorktree,
@@ -23975,6 +24100,7 @@ __export(index_exports, {
   saveState: () => saveState,
   setDebugRuntimeConfig: () => setDebugRuntimeConfig,
   setLogLevel: () => setLogLevel,
+  setMagiKindPanel: () => setMagiKindPanel,
   setupIdeInstance: () => setupIdeInstance,
   shouldAutoRestoreHostedSessionsOnStartup: () => shouldAutoRestoreHostedSessionsOnStartup,
   shouldCollectTraceCategory: () => shouldCollectTraceCategory,
@@ -28541,6 +28667,16 @@ function callProviderNativeHistoryRead(agentType, canonicalHistory, scripts, his
   const result = fn({
     agentType,
     sessionId: normalizedSessionId,
+    // Arm the native-history executor's session pin guard. When the
+    // instance is already bound to a provider session, pass that id as
+    // `providerSessionId` so the executor rejects any *other* newest
+    // session it would otherwise pick (hermes ≥0.14 creates a fresh
+    // `sessions` row per internal sub-session, so an unpinned
+    // newest-wins query drifts to a different id on every read →
+    // re-bind churn + unbounded history re-hydration). When there is no
+    // bound id yet (first-bind / workspace-only discovery) this is '',
+    // which leaves the guard disarmed so discovery still works.
+    providerSessionId: normalizedSessionId,
     historySessionId: normalizedSessionId,
     workspace,
     format: canonicalHistory?.format,
@@ -38956,24 +39092,28 @@ function executeSqlite(src, input) {
     return null;
   }
   try {
-    let sessionRow;
-    try {
-      const sessionFloorSeconds = typeof input.sessionStartedAtMs === "number" ? Math.floor(input.sessionStartedAtMs / 1e3) : 0;
-      const stmt = db.prepare(src.session_query);
+    const requested = input.providerSessionId || "";
+    let sessionId;
+    if (requested) {
+      sessionId = requested;
+    } else {
+      let sessionRow;
       try {
-        sessionRow = stmt.get(sessionFloorSeconds);
+        const sessionFloorSeconds = typeof input.sessionStartedAtMs === "number" ? Math.floor(input.sessionStartedAtMs / 1e3) : 0;
+        const stmt = db.prepare(src.session_query);
+        try {
+          sessionRow = stmt.get(sessionFloorSeconds);
+        } catch {
+          sessionRow = stmt.get();
+        }
       } catch {
-        sessionRow = stmt.get();
+        return null;
       }
-    } catch {
-      return null;
+      if (!sessionRow) return null;
+      const sessionIdRaw = Object.values(sessionRow)[0];
+      sessionId = sessionIdRaw == null ? "" : String(sessionIdRaw);
     }
-    if (!sessionRow) return null;
-    const sessionIdRaw = Object.values(sessionRow)[0];
-    const sessionId = sessionIdRaw == null ? "" : String(sessionIdRaw);
     if (!sessionId) return null;
-    const requested = input.providerSessionId || "";
-    if (requested && sessionId !== requested) return null;
     const messageRows = db.prepare(src.message_query).all(sessionId);
     if (!messageRows || messageRows.length === 0) return null;
     const mtime = safeMtimeMs(resolved);
@@ -42415,7 +42555,9 @@ var CliProviderInstance = class _CliProviderInstance {
       typeof data.providerSessionId === "string" ? data.providerSessionId : ""
     );
     if (patchedProviderSessionId) {
-      this.promoteProviderSessionId(patchedProviderSessionId);
+      this.promoteProviderSessionId(patchedProviderSessionId, {
+        authoritative: data.sessionEvent === "new_session"
+      });
     }
     if (data.sessionEvent === "new_session") {
       this.runtimeMessages = [];
@@ -42710,9 +42852,13 @@ ${effect.notification.body || ""}`.trim();
     }
     return lines.join("\n");
   }
-  promoteProviderSessionId(sessionId) {
+  promoteProviderSessionId(sessionId, opts = {}) {
     const nextSessionId = String(sessionId || "").trim();
     if (!nextSessionId || nextSessionId === this.providerSessionId) return;
+    if (this.providerSessionId && !opts.authoritative) {
+      LOG.debug("CLI", `[${this.type}] ignoring non-authoritative session id ${nextSessionId} (bound to ${this.providerSessionId})`);
+      return;
+    }
     const previousHistorySessionId = this.providerSessionId || this.instanceId;
     const previousProviderSessionId = this.providerSessionId;
     this.providerSessionId = nextSessionId;
@@ -44347,6 +44493,11 @@ function expandResumeArgs(template, sessionId) {
   if (!Array.isArray(template) || template.length === 0) return void 0;
   return template.map((part) => part === "{{id}}" ? sessionId : part);
 }
+function expandModelLaunchArgs(template, model) {
+  const m = typeof model === "string" ? model.trim() : "";
+  if (!m || !Array.isArray(template) || template.length === 0) return void 0;
+  return template.map((part) => part === "{{model}}" ? m : part);
+}
 function readSubcommandSessionId(args, subcommands) {
   const resumeIndex = args.findIndex((arg) => subcommands.includes(arg));
   if (resumeIndex < 0) return void 0;
@@ -44739,7 +44890,12 @@ Run 'adhdev doctor' for detailed diagnostics.`
     if (provider) {
       console.log(colorize("cyan", `  \u{1F4E6} Using provider: ${provider.name} (${provider.type})`));
     }
-    const sessionBinding = resolveCliSessionBinding(provider, normalizedType, cliArgs, options?.resumeSessionId);
+    const modelLaunchArgs = expandModelLaunchArgs(provider?.modelLaunchArgs, initialModel);
+    const cliArgsWithModel = modelLaunchArgs ? [...modelLaunchArgs, ...cliArgs || []] : cliArgs;
+    if (initialModel && !modelLaunchArgs) {
+      LOG.warn("CLI", `[${normalizedType}] initialModel='${initialModel}' requested but provider declares no modelLaunchArgs template \u2014 launching without model selection.`);
+    }
+    const sessionBinding = resolveCliSessionBinding(provider, normalizedType, cliArgsWithModel, options?.resumeSessionId);
     const resolvedCliArgs = sessionBinding.cliArgs;
     const instanceManager = this.deps.getInstanceManager();
     if (provider && instanceManager) {
@@ -46618,23 +46774,30 @@ function loadMessagesForSession(db, sessionId) {
   }
   return out;
 }
-function readSession4(sessionPath) {
+function readSession4(sessionPath, requestedSessionId) {
   if (!sessionPath) return null;
   if (sessionPath === HERMES_STATE_DB) {
     const db = openDb();
     if (!db) return null;
     try {
-      const row = db.prepare(
-        `SELECT id, started_at FROM sessions
-                 WHERE source = 'cli' AND message_count > 0
-                 ORDER BY started_at DESC LIMIT 1`
-      ).get();
-      if (!row) return null;
-      const messages2 = loadMessagesForSession(db, row.id);
+      const pinned = String(requestedSessionId || "").trim();
+      let sessionId2;
+      if (pinned) {
+        sessionId2 = pinned;
+      } else {
+        const row = db.prepare(
+          `SELECT id, started_at FROM sessions
+                     WHERE source = 'cli' AND message_count > 0
+                     ORDER BY started_at DESC LIMIT 1`
+        ).get();
+        if (!row) return null;
+        sessionId2 = String(row.id);
+      }
+      const messages2 = loadMessagesForSession(db, sessionId2);
       if (messages2.length === 0) return null;
       return {
         messages: messages2,
-        providerSessionId: String(row.id),
+        providerSessionId: sessionId2,
         source: "provider-native",
         sourcePath: sessionPath,
         sourceMtimeMs: statMtimeMs4(sessionPath),
@@ -46706,7 +46869,7 @@ function createNativeHistoryDispatcher(reader) {
       } catch {
       }
     }
-    const session = readByReader(reader, sourcePath, sessionId, workspace);
+    const session = readByReader(reader, sourcePath, sessionId, workspace, requestedProviderSid);
     if (!session) return null;
     if (requestedProviderSid && session.providerSessionId && session.providerSessionId !== requestedProviderSid) {
       return null;
@@ -46869,7 +47032,7 @@ function resolveHermesPath(workspace, sessionId) {
   if (!fs24.existsSync(dir)) return null;
   return newestRecentFile2(dir, /^session_.*\.json$/);
 }
-function readByReader(reader, sourcePath, sessionId, workspace) {
+function readByReader(reader, sourcePath, sessionId, workspace, requestedProviderSid) {
   switch (reader) {
     case "claude-cli":
       return readSession(sourcePath);
@@ -46877,8 +47040,13 @@ function readByReader(reader, sourcePath, sessionId, workspace) {
       return readSession2(sourcePath);
     case "antigravity-cli":
       return readSession3(sourcePath, sessionId || void 0, workspace || void 0);
+    // hermes reads a *shared* state.db and would otherwise pick the newest
+    // source='cli' session, which drifts every read (hermes ≥0.14 writes a
+    // fresh row per internal sub-session). Pass the bound id so it reads
+    // THAT session directly instead of newest-wins. claude/codex resolve a
+    // per-session file upstream, so they need no equivalent pin here.
     case "hermes-cli":
-      return readSession4(sourcePath);
+      return readSession4(sourcePath, requestedProviderSid || void 0);
   }
 }
 function cwdAsDashes(cwd) {
@@ -49565,6 +49733,88 @@ var meshCrudHandlers = {
       return { success: false, error: e.message };
     }
   },
+  // Gated WRITE path for `.adhdev/mesh.json` — the sibling of export_mesh_json_config
+  // (which only DRAFTS). Same write/overwrite/dry-run contract as mesh_init's config
+  // writer: defaults to dry-run (no write), never clobbers an existing repo mesh.json
+  // unless overwrite=true, and validates the scaffold before persisting. The scaffold
+  // is built from the machine-local mesh entry (coordinator prompt override/append);
+  // policy/operating-notes are intentionally NOT exported (see buildMeshJsonConfigScaffold).
+  write_mesh_json_config: async (_ctx, args) => {
+    const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+    if (!meshId) return { success: false, error: "meshId required" };
+    const workspace = typeof args?.workspace === "string" && args.workspace.trim() ? args.workspace.trim() : process.cwd();
+    const write = args?.write === true;
+    const overwrite = args?.overwrite === true;
+    try {
+      const { getMesh: getMesh2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+      const mesh = getMesh2(meshId);
+      if (!mesh) return { success: false, error: "Mesh not found" };
+      const {
+        buildMeshJsonConfigScaffold: buildMeshJsonConfigScaffold2,
+        serializeMeshJsonConfigScaffold: serializeMeshJsonConfigScaffold2,
+        loadRepoMeshJsonConfig: loadRepoMeshJsonConfig2,
+        normalizeRepoMeshDeclarativeConfig: normalizeRepoMeshDeclarativeConfig2,
+        MESH_JSON_CONFIG_LOCATIONS: MESH_JSON_CONFIG_LOCATIONS2
+      } = await Promise.resolve().then(() => (init_mesh_json_config(), mesh_json_config_exports));
+      const { mkdirSync: mkdirSync21, writeFileSync: writeFileSync24 } = await import("fs");
+      const { dirname: dirname17, join: join49 } = await import("path");
+      const scaffold = buildMeshJsonConfigScaffold2(mesh);
+      const scaffoldJson = serializeMeshJsonConfigScaffold2(scaffold);
+      const relativePath = MESH_JSON_CONFIG_LOCATIONS2[0];
+      const absolutePath = join49(workspace, relativePath);
+      const validation = normalizeRepoMeshDeclarativeConfig2(scaffold);
+      if (!validation.valid) {
+        return { success: false, meshId, error: `invalid mesh.json scaffold: ${validation.errors.join("; ")}` };
+      }
+      const existing = loadRepoMeshJsonConfig2(workspace);
+      const existingPresent = existing.sourceType === "repo_file" || existing.sourceType === "invalid";
+      if (existingPresent && !overwrite) {
+        return {
+          success: true,
+          meshId,
+          written: false,
+          dryRun: !write,
+          skippedReason: "already_exists",
+          path: absolutePath,
+          relativePath,
+          existing: existing.config,
+          existingSourceType: existing.sourceType,
+          scaffold,
+          scaffoldJson,
+          note: "A repo mesh.json already exists \u2014 kept as-is. Re-run with overwrite=true to replace it (this silently drops operator hand-edits, so present a current-vs-suggested diff first)."
+        };
+      }
+      if (!write) {
+        return {
+          success: true,
+          meshId,
+          written: false,
+          dryRun: true,
+          path: absolutePath,
+          relativePath,
+          scaffold,
+          scaffoldJson,
+          note: "Dry-run: nothing written. Re-run with write=true to persist to the repo (commit target). meshes.json is untouched."
+        };
+      }
+      mkdirSync21(dirname17(absolutePath), { recursive: true });
+      writeFileSync24(absolutePath, `${scaffoldJson}
+`, "utf-8");
+      return {
+        success: true,
+        meshId,
+        written: true,
+        dryRun: false,
+        path: absolutePath,
+        relativePath,
+        scaffold,
+        scaffoldJson,
+        note: "Wrote .adhdev/mesh.json (repo commit target). Commit it to the repo; meshes.json (machine-local) is unchanged."
+      };
+    } catch (e) {
+      return { success: false, error: e.message };
+    }
+  },
   delete_mesh: async (_ctx, args) => {
     const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
     if (!meshId) return { success: false, error: "meshId required" };
@@ -49626,6 +49876,42 @@ var meshCrudHandlers = {
       return { success: false, error: e.message };
     }
   },
+  // ─── MAGI kind → panel bindings (MAGI-KIND-PANEL, machine-local config) ───
+  // Per-task_kind slot lists in ~/.adhdev/meshes.json `magiKindPanels`. Same
+  // owner-only gating and structured-error precedent as the magi_panel_* handlers
+  // above (not listed in canPeerUsePrivilegedShareCommand → owner-only). set/remove
+  // are WRITE commands; list is read-only. normalizeMagiSlots (inside setMagiKindPanel)
+  // surfaces invalid_magi_kind_panel: … messages verbatim for the editor.
+  magi_kind_panel_list: async (_ctx, _args) => {
+    try {
+      const { listMagiKindPanels: listMagiKindPanels2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+      return { success: true, kindPanels: listMagiKindPanels2() };
+    } catch (e) {
+      return { success: false, error: e.message };
+    }
+  },
+  magi_kind_panel_set: async (_ctx, args) => {
+    const kind = typeof args?.kind === "string" ? args.kind.trim() : "";
+    if (!kind) return { success: false, error: "invalid_magi_kind_panel: task_kind is required" };
+    try {
+      const { setMagiKindPanel: setMagiKindPanel2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+      const slots = setMagiKindPanel2(kind, args?.slots);
+      return { success: true, kind, slots };
+    } catch (e) {
+      return { success: false, error: e.message };
+    }
+  },
+  magi_kind_panel_remove: async (_ctx, args) => {
+    const kind = typeof args?.kind === "string" ? args.kind.trim() : "";
+    if (!kind) return { success: false, error: "invalid_magi_kind_panel: task_kind is required" };
+    try {
+      const { removeMagiKindPanel: removeMagiKindPanel2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
+      const removed = removeMagiKindPanel2(kind);
+      return { success: true, removed };
+    } catch (e) {
+      return { success: false, error: e.message };
+    }
+  },
   add_mesh_node: async (ctx, args) => {
     const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
     const workspace = typeof args?.workspace === "string" ? args.workspace.trim() : "";
@@ -50556,8 +50842,11 @@ var import_fs17 = require("fs");
 var import_path12 = require("path");
 init_refine_config();
 init_worktree_bootstrap_config();
+init_change_impact_config();
+init_mesh_config();
 var MESH_INIT_REFINE_CONFIG_PATH = MESH_REFINE_CONFIG_LOCATIONS[0];
 var MESH_INIT_WORKTREE_BOOTSTRAP_CONFIG_PATH = MESH_WORKTREE_BOOTSTRAP_CONFIG_LOCATIONS[0];
+var MESH_INIT_CHANGE_IMPACT_CONFIG_PATH = CHANGE_IMPACT_CONFIG_LOCATIONS[0];
 var CANDIDATE_STALE_INPUTS = [
   "package-lock.json",
   "pnpm-lock.yaml",
@@ -50639,15 +50928,46 @@ function runMeshInit(mesh, workspace, detected, options = {}) {
     write,
     overwrite
   });
+  const changeImpactLoaded = loadChangeImpactConfig(workspace);
+  const changeImpact = applyConfigSuggestion({
+    workspace,
+    relativePath: MESH_INIT_CHANGE_IMPACT_CONFIG_PATH,
+    existing: changeImpactLoaded.sourceType === "repo_file" ? changeImpactLoaded.config : void 0,
+    suggestedConfig: suggestChangeImpactConfig(workspace).suggestedConfig,
+    validate: (config) => validateChangeImpactConfig(config, MESH_INIT_CHANGE_IMPACT_CONFIG_PATH).valid,
+    write,
+    overwrite
+  });
   const providers = suggestNodeProviderPriority(detected);
+  const refineLoaded = loadMeshRefineConfig(mesh, workspace);
+  const bootstrapLoaded = loadMeshWorktreeBootstrapConfig(mesh, workspace);
+  let magiKindPanels = {};
+  try {
+    magiKindPanels = listMagiKindPanels();
+  } catch {
+    magiKindPanels = {};
+  }
+  const currentConfig2 = {
+    refine: refineLoaded.config,
+    worktreeBootstrap: bootstrapLoaded.config,
+    changeImpact: changeImpactLoaded.sourceType === "repo_file" ? changeImpactLoaded.config : void 0,
+    sourceTypes: {
+      refine: refineLoaded.sourceType,
+      worktreeBootstrap: bootstrapLoaded.sourceType,
+      changeImpact: changeImpactLoaded.sourceType
+    },
+    magiKindPanels
+  };
   return {
     success: true,
     workspace,
     dryRun: !write,
     refine,
     worktreeBootstrap,
+    changeImpact,
     providers,
-    note: write ? "Configs written to disk are the execution source of truth; suggestions are scaffold and only take effect once saved. providerPriority is a recommendation \u2014 apply it to node policy via clone/policy update." : "Dry-run: no files written. Re-run with write=true to persist the suggested configs. Heuristic suggestions never execute until saved as repo config."
+    currentConfig: currentConfig2,
+    note: write ? "Configs written to disk are the execution source of truth; suggestions are scaffold and only take effect once saved. providerPriority is a recommendation \u2014 apply it to node policy via clone/policy update. currentConfig echoes what was on disk before this run." : "Dry-run: no files written. Re-run with write=true to persist the suggested configs. Heuristic suggestions never execute until saved as repo config. Use currentConfig to diff current-vs-suggested before overwriting."
   };
 }
 function applyConfigSuggestion(input) {
@@ -65662,6 +65982,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   getLedgerDir,
   getLedgerSummary,
   getLogLevel,
+  getMagiKindPanel,
   getMagiPanel,
   getMesh,
   getMeshByRepo,
@@ -65718,6 +66039,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   launchWithCdp,
   listCoordinatorsForWorkspace,
   listHostedCliRuntimes,
+  listMagiKindPanels,
   listMagiPanels,
   listMeshMissionSummaries,
   listMeshes,
@@ -65753,6 +66075,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   normalizeInteractivePrompt,
   normalizeInteractivePromptResponse,
   normalizeMagiPanel,
+  normalizeMagiSlots,
   normalizeManagedStatus,
   normalizeMeshCapabilityTags,
   normalizeMeshDaemonRole,
@@ -65790,6 +66113,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   recordMeshToolCall,
   registerExtensionProviders,
   registerMeshCoordinator,
+  removeMagiKindPanel,
   removeMagiPanel,
   removeNode,
   removeWorktree,
@@ -65824,6 +66148,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   saveState,
   setDebugRuntimeConfig,
   setLogLevel,
+  setMagiKindPanel,
   setupIdeInstance,
   shouldAutoRestoreHostedSessionsOnStartup,
   shouldCollectTraceCategory,