@adhdev/daemon-core 0.9.82-rc.315 → 0.9.82-rc.317

package/dist/cli-adapter-types.d.ts

@@ -34,6 +34,28 @@ export interface AcpAdapterHandle {
     setConfigOption?(configId: string, value: string): Promise<void>;
     resolvePermission?(approved: boolean): Promise<void>;
 }
+/**
+ * Launch metadata for a CLI session, surfaced by the dashboard Session info panel.
+ * Derived from the live adapter's spawn plan — the resolved binary, the full
+ * argument vector (provider base args + per-launch extra args), the cwd, and the
+ * set of per-launch extra-env KEYS (values are intentionally omitted so secrets in
+ * extraEnv are never sent to the dashboard). providerSessionId is the upstream
+ * agent's own session id once the CLI reports it.
+ */
+export interface CliLaunchInfo {
+    /** Resolved executable path the PTY actually spawns. */
+    command?: string;
+    /** Full argument vector (provider spawn.args + extraArgs, {{workingDir}} expanded). */
+    args: string[];
+    /** Per-launch extra args only (subset of args), for attribution. */
+    extraArgs: string[];
+    /** Working directory the session was spawned in. */
+    cwd: string;
+    /** KEYS of per-launch extra env (values omitted — may contain secrets). */
+    extraEnvKeys: string[];
+    /** Upstream agent session id, once the CLI reports one. */
+    providerSessionId?: string;
+}
 export interface CliAdapter {
     cliType: string;
     cliName: string;
@@ -69,6 +91,7 @@ export interface CliAdapter {
     setOnPtyData?(callback: (data: string) => void): void;
     writeRaw?(data: string): void;
     resize?(cols: number, rows: number): void;
+    getLaunchInfo?(): CliLaunchInfo;
     getRuntimeMetadata?(): unknown;
     updateRuntimeMeta?(meta: Record<string, unknown>): void;
     refreshProviderDefinition?(provider: unknown): void;

package/dist/cli-adapters/provider-cli-adapter.d.ts

@@ -13,7 +13,7 @@
  *   type, name, category: 'cli', binary, spawn, approvalKeys
  *   compatibility: [{ ideVersion, scriptDir }]  ← versioned scripts
  */
-import type { CliAdapter } from '../cli-adapter-types.js';
+import type { CliAdapter, CliLaunchInfo } from '../cli-adapter-types.js';
 import type { InteractivePromptResponse } from '../providers/types/interactive-prompt.js';
 import { type PtyRuntimeMetadata, type PtyTransportFactory } from './pty-transport.js';
 import { type CliProviderModule, type CliScripts, type CliSessionStatus, type CliTraceEntry, type ParsedSession } from './provider-cli-shared.js';
@@ -190,6 +190,14 @@ export declare class ProviderCliAdapter implements CliAdapter {
     getPartialResponse(): string;
     getDebugSnapshot(): Record<string, unknown>;
     getRuntimeMetadata(): PtyRuntimeMetadata | null;
+    /**
+     * Launch metadata for the dashboard Session info panel. Re-derives the spawn plan
+     * (pure — same inputs the live PTY was spawned with) so the dashboard sees the
+     * resolved binary, full arg vector, and cwd without us having to persist it.
+     * extraEnv values are intentionally dropped (keys only) so secrets passed at
+     * launch time never reach the dashboard.
+     */
+    getLaunchInfo(): CliLaunchInfo;
     updateRuntimeMeta(meta: Record<string, unknown>, replace?: boolean): void;
     cancel(): void;
     saveAndStop(): Promise<void>;

package/dist/index.d.ts

@@ -7,8 +7,8 @@ export type { ChatBubbleState, ChatMessage, ExtensionInfo, CommandResult as Core
 export type { SessionEntry, CompactSessionEntry, CompactDaemonEntry, CloudDaemonSummaryEntry, DashboardBootstrapDaemonEntry, VersionUpdateReason, CloudStatusReportPayload, DaemonStatusEventPayload, DashboardStatusEventPayload, SessionTransport, SessionKind, SessionCapability, AgentSessionStream, ReadChatCursor, ReadChatSyncResult, TransportTopic, SessionChatTailSubscriptionParams, SessionRuntimeOutputSubscriptionParams, MachineRuntimeSubscriptionParams, SessionHostDiagnosticsSubscriptionParams, SessionModalSubscriptionParams, DaemonMetadataSubscriptionParams, WorkspaceGitSubscriptionParams, SessionChatTailUpdate, MachineRuntimeUpdate, SessionHostDiagnosticsUpdate, SessionModalUpdate, DaemonMetadataUpdate, TopicUpdateEnvelope, SubscribeRequest, UnsubscribeRequest, StandaloneWsStatusPayload, AvailableProviderInfo, AcpConfigOption, AcpMode, ProviderControlSchema, StatusReportPayload, MachineInfo, SessionHostDiagnosticsSnapshot, SessionHostRecord, SessionHostWriteOwner, SessionHostAttachedClient, SessionHostLogEntry, SessionHostRequestTrace, SessionHostRuntimeTransition, DetectedIdeInfo, WorkspaceEntry, ProviderSummaryItem, ProviderSummaryMetadata, ProviderState, ProviderStatus, ProviderErrorReason, SessionActiveChatData, ActiveChatData, IdeProviderState, CliProviderState, AcpProviderState, ExtensionProviderState, MessageInputSupport, InputMediaStrategyDescriptor, InputAttachmentStrategy, InputMediaType, } from './shared-types.js';
 export type { InteractivePrompt, InteractiveQuestion, InteractiveOption, InteractivePromptResponse, InteractiveAnswer, } from './providers/types/interactive-prompt.js';
 export { normalizeInteractivePrompt, normalizeInteractivePromptResponse, buildClaudeInteractiveToolResult, interactivePromptFromClaudeAskUserQuestion, detectClaudeAskUserQuestionPromptFromJson, } from './providers/types/interactive-prompt.js';
-export type { RepoMesh, RepoMeshDaemonRole, RepoMeshHostMetadata, RepoMeshHostPairingMetadata, RepoMeshHostStatus, RepoMeshNode, RepoMeshNodeHealth, RepoMeshPolicy, RepoMeshNodePolicy, RepoMeshRelatedRepo, RepoMeshNodeCapabilities, DetectedCommand, ProjectContextSnapshot, ProjectContextSource, RepoMeshCoordinatorConfig, LocalMeshConfig, LocalMeshEntry, LocalMeshNodeEntry, RepoMeshStatus, RepoMeshNodeStatus, RepoMeshPeerConnectionStatus, RepoMeshPeerConnectionState, RepoMeshPeerConnectionTransport, RepoMeshSessionStatus, RepoMeshQueueTask, RepoMeshQueueTaskStatus, RepoMeshQueueSummary, RepoMeshQueueStatus, RepoMeshLedgerEntryStatus, RepoMeshLedgerSummaryStatus, RepoMeshLedgerStatus, MeshAsyncJobLifecycle, RepoMeshSchedulingStrategy, } from './repo-mesh-types.js';
-export { DEFAULT_MESH_POLICY, resolveDelegatedWorkerAutoApprove, MESH_SCHEDULING_STRATEGIES, DEFAULT_MESH_SCHEDULING_STRATEGY, normalizeMeshSchedulingStrategy, resolveNodeSchedulingPriority, MESH_CONVERGE_REFINE_TAG, MESH_CONVERGE_FAST_FORWARD_TAG, resolveAutoConvergeCodeChange, } from './repo-mesh-types.js';
+export type { RepoMesh, RepoMeshDaemonRole, RepoMeshHostMetadata, RepoMeshHostPairingMetadata, RepoMeshHostStatus, RepoMeshNode, RepoMeshNodeHealth, RepoMeshPolicy, RepoMeshNodePolicy, RepoMeshRelatedRepo, RepoMeshNodeCapabilities, DetectedCommand, ProjectContextSnapshot, ProjectContextSource, RepoMeshCoordinatorConfig, LocalMeshConfig, LocalMeshEntry, LocalMeshNodeEntry, RepoMeshStatus, RepoMeshNodeStatus, RepoMeshPeerConnectionStatus, RepoMeshPeerConnectionState, RepoMeshPeerConnectionTransport, RepoMeshSessionStatus, RepoMeshQueueTask, RepoMeshQueueTaskStatus, RepoMeshQueueSummary, RepoMeshQueueStatus, RepoMeshLedgerEntryStatus, RepoMeshLedgerSummaryStatus, RepoMeshLedgerStatus, MeshAsyncJobLifecycle, RepoMeshSchedulingStrategy, RepoMeshTaskAffinityPolicy, StandardMeshRole, } from './repo-mesh-types.js';
+export { DEFAULT_MESH_POLICY, resolveDelegatedWorkerAutoApprove, MESH_SCHEDULING_STRATEGIES, DEFAULT_MESH_SCHEDULING_STRATEGY, normalizeMeshSchedulingStrategy, resolveNodeSchedulingPriority, MESH_CONVERGE_REFINE_TAG, MESH_CONVERGE_FAST_FORWARD_TAG, resolveAutoConvergeCodeChange, STANDARD_MESH_ROLES, DEFAULT_TASKMODE_ROLE_MAP, resolveTaskAffinityRole, resolveMeshRoleOptions, } from './repo-mesh-types.js';
 export * from './git/index.js';
 import type { RuntimeWriteOwner as _RuntimeWriteOwner } from './shared-types-extra.js';
 import type { RuntimeAttachedClient as _RuntimeAttachedClient } from './shared-types-extra.js';
@@ -49,7 +49,7 @@ export { fastForwardMeshNode } from './mesh/mesh-fast-forward.js';
 export type { MeshFastForwardNodeArgs, MeshFastForwardPlannedStep, MeshFastForwardResult } from './mesh/mesh-fast-forward.js';
 export { buildMeshLedgerReconciliationEvidence, buildMeshLedgerReplicaEvidence } from './mesh/mesh-ledger-reconciliation.js';
 export type { AnyLedgerSlice, MeshLedgerReconciliationEvidence, MeshLedgerReplicaEvidence, MeshLedgerReplicaStatus } from './mesh/mesh-ledger-reconciliation.js';
-export { enqueueTask, recordDirectDispatchTask, getQueue, claimNextTask, updateTaskStatus, updateSessionTaskStatus, cancelTask, requeueTask, getMeshQueueStats, getMeshQueueRevision, normalizeMeshTaskMode, validateMeshTaskModeRequest, buildMeshNodeCapabilityTags, nodeSatisfiesRequiredTags, normalizeMeshCapabilityTags, resolveConvergeRequiredTags, insertDirectDispatch, getActiveDirectDispatches, updateDirectDispatchStatus, cleanupTerminalDirectDispatches, markStaleDirectDispatches, deleteDirectDispatchesByTaskId, recordMeshToolCall, assertNoDependencyCycle, hasPendingDependents, describeTaskDependencyState } from './mesh/mesh-work-queue.js';
+export { enqueueTask, recordDirectDispatchTask, getQueue, claimNextTask, updateTaskStatus, updateSessionTaskStatus, cancelTask, requeueTask, getMeshQueueStats, getMeshQueueRevision, normalizeMeshTaskMode, validateMeshTaskModeRequest, buildMeshNodeCapabilityTags, nodeSatisfiesRequiredTags, normalizeMeshCapabilityTags, resolveConvergeRequiredTags, resolveTaskAffinityRequiredTags, insertDirectDispatch, getActiveDirectDispatches, updateDirectDispatchStatus, cleanupTerminalDirectDispatches, markStaleDirectDispatches, deleteDirectDispatchesByTaskId, recordMeshToolCall, assertNoDependencyCycle, hasPendingDependents, describeTaskDependencyState } from './mesh/mesh-work-queue.js';
 export type { MeshWorkQueueEntry, MeshTaskStatus, MeshTaskMode, MeshWorkQueueStats, MeshQueueMutationOptions, MeshTaskModeValidationResult, DirectDispatchRecord, MeshToolCallRateResult } from './mesh/mesh-work-queue.js';
 export { buildCompactStaleDirectWorkSummary, buildMeshActiveWork, buildMeshActiveWorkSummary, classifyStaleDirectForPrune, PRUNABLE_ORPHAN_STALE_REASONS } from './mesh/mesh-active-work.js';
 export type { StaleDirectPruneClassification } from './mesh/mesh-active-work.js';

package/dist/index.js

@@ -40,6 +40,35 @@ function resolveNodeSchedulingPriority(nodePolicy) {
   const raw = Number(nodePolicy?.schedulingPriority);
   return Number.isFinite(raw) ? raw : 0;
 }
+function resolveTaskAffinityRole(taskMode, policy) {
+  if (!taskMode) return null;
+  if (policy?.enabled === false) return null;
+  const override = policy?.byTaskMode && Object.prototype.hasOwnProperty.call(policy.byTaskMode, taskMode) ? policy.byTaskMode[taskMode] : void 0;
+  if (typeof override === "string") {
+    const trimmed = override.trim().toLowerCase();
+    return trimmed ? trimmed : null;
+  }
+  const fallback = DEFAULT_TASKMODE_ROLE_MAP[taskMode];
+  return fallback ?? null;
+}
+function resolveMeshRoleOptions(policy) {
+  const out = [...STANDARD_MESH_ROLES];
+  const seen = new Set(out);
+  const add = (raw) => {
+    if (typeof raw !== "string") return;
+    const role = raw.trim().toLowerCase();
+    if (!role || seen.has(role)) return;
+    seen.add(role);
+    out.push(role);
+  };
+  if (policy?.byTaskMode) {
+    for (const value of Object.values(policy.byTaskMode)) add(value);
+  }
+  if (Array.isArray(policy?.customRoles)) {
+    for (const value of policy.customRoles) add(value);
+  }
+  return out;
+}
 function resolveAutoConvergeCodeChange(policy) {
   return policy?.autoConvergeCodeChange === true;
 }
@@ -70,7 +99,7 @@ function resolveProviderMaxParallel(nodePolicy, providerType) {
   if (!Number.isFinite(raw) || raw < 0) return void 0;
   return Math.floor(raw);
 }
-var MESH_SCHEDULING_STRATEGIES, DEFAULT_MESH_SCHEDULING_STRATEGY, MESH_CONVERGE_REFINE_TAG, MESH_CONVERGE_FAST_FORWARD_TAG, DEFAULT_MESH_POLICY;
+var MESH_SCHEDULING_STRATEGIES, DEFAULT_MESH_SCHEDULING_STRATEGY, MESH_CONVERGE_REFINE_TAG, MESH_CONVERGE_FAST_FORWARD_TAG, STANDARD_MESH_ROLES, DEFAULT_TASKMODE_ROLE_MAP, DEFAULT_MESH_POLICY;
 var init_repo_mesh_types = __esm({
   "src/repo-mesh-types.ts"() {
     "use strict";
@@ -83,6 +112,14 @@ var init_repo_mesh_types = __esm({
     DEFAULT_MESH_SCHEDULING_STRATEGY = "first_eligible";
     MESH_CONVERGE_REFINE_TAG = "converge=refine";
     MESH_CONVERGE_FAST_FORWARD_TAG = "converge=fast_forward";
+    STANDARD_MESH_ROLES = ["investigator", "coder", "validator", "converger"];
+    DEFAULT_TASKMODE_ROLE_MAP = {
+      live_debug_readonly: "investigator",
+      code_change: "coder",
+      launch_app: "coder",
+      validation: "validator",
+      convergence: "converger"
+    };
     DEFAULT_MESH_POLICY = {
       requirePreTaskCheckpoint: false,
       requirePostTaskCheckpoint: true,
@@ -316,10 +353,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "e28347641639c9d0a1e46a6141e3cfed2bc90ac2" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "e2834764" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.315" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-18T05:47:44.462Z" : void 0);
+  const commit = readInjected(true ? "b4484284652748bf8096f40a00eb5cb463963576" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "b4484284" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.317" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-18T08:55:18.955Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -645,14 +682,79 @@ function emptyStatus(workspace, lastCheckedAt, error) {
 async function getSubmoduleStatuses(repo, options) {
   if (!repo.repoRoot) return [];
   try {
-    const result = await runGit(repo, ["submodule", "status"], options);
-    const submodules = parseSubmoduleStatusOutput(result.stdout, repo.repoRoot, options.submoduleIgnorePaths);
+    const submodules = await deriveSubmoduleGitlinkStatuses(repo, options);
     await Promise.all(submodules.map((submodule) => enrichSubmoduleWorktreeStatus(repo, submodule, options)));
     return submodules;
   } catch {
     return [];
   }
 }
+async function deriveSubmoduleGitlinkStatuses(repo, options) {
+  if (!repo.repoRoot) return [];
+  const paths = await readSubmodulePaths(repo, options);
+  const ignoreSet = new Set(options.submoduleIgnorePaths || []);
+  const lastCheckedAt = Date.now();
+  const entries = await Promise.all(
+    paths.filter((path41) => !ignoreSet.has(path41)).map(async (path41) => {
+      const repoPath = repo.repoRoot + "/" + path41;
+      const expected = await readGitlinkExpectedSha(repo, path41, options);
+      const actual = await readSubmoduleHeadSha(repo, repoPath, options);
+      const outOfSync = actual === null ? true : expected !== null && expected !== actual;
+      return {
+        path: path41,
+        // Prefer the recorded gitlink SHA (matches the legacy column); fall back
+        // to the checked-out SHA so the field is never empty when both are known.
+        commit: expected ?? actual ?? "",
+        repoPath,
+        dirty: false,
+        outOfSync,
+        lastCheckedAt
+      };
+    })
+  );
+  return entries;
+}
+async function readSubmodulePaths(repo, options) {
+  if (!repo.repoRoot) return [];
+  const gitmodulesPath = repo.repoRoot + "/.gitmodules";
+  try {
+    const result = await runGit(
+      repo,
+      ["config", "--file", gitmodulesPath, "--get-regexp", "^submodule\\..*\\.path$"],
+      options
+    );
+    const paths = [];
+    for (const line of result.stdout.split("\n")) {
+      const spaceIdx = line.indexOf(" ");
+      if (spaceIdx < 0) continue;
+      const value = line.slice(spaceIdx + 1).trim();
+      if (value) paths.push(value);
+    }
+    return paths;
+  } catch {
+    return [];
+  }
+}
+async function readGitlinkExpectedSha(repo, submodulePath, options) {
+  try {
+    const result = await runGit(repo, ["ls-tree", "HEAD", submodulePath], options);
+    const line = result.stdout.split("\n").find((l) => l.trim().length > 0);
+    if (!line) return null;
+    const match = line.match(/^\s*\d+\s+commit\s+([0-9a-f]{40})\b/);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
+async function readSubmoduleHeadSha(repo, repoPath, options) {
+  try {
+    const result = await runGit(repo, ["rev-parse", "HEAD"], { ...options, cwd: repoPath });
+    const sha = result.stdout.trim();
+    return /^[0-9a-f]{40}$/.test(sha) ? sha : null;
+  } catch {
+    return null;
+  }
+}
 async function enrichSubmoduleWorktreeStatus(repo, submodule, options) {
   try {
     const result = await runGit(repo, ["status", "--porcelain=v2", "--branch"], {
@@ -667,28 +769,6 @@ async function enrichSubmoduleWorktreeStatus(repo, submodule, options) {
     submodule.error = formatGitError(error);
   }
 }
-function parseSubmoduleStatusOutput(output, repoRoot, ignorePaths) {
-  const submodules = [];
-  const ignoreSet = new Set(ignorePaths || []);
-  for (const line of output.split("\n")) {
-    if (!line.trim()) continue;
-    const match = line.match(/^([\-+U\s])([0-9a-f]{40})\s+(\S+)(?:\s+\(([^)]+)\))?/);
-    if (!match) continue;
-    const prefix = match[1];
-    const commit = match[2];
-    const path41 = match[3];
-    if (ignoreSet.has(path41)) continue;
-    submodules.push({
-      path: path41,
-      commit,
-      repoPath: repoRoot + "/" + path41,
-      dirty: prefix === "U",
-      outOfSync: prefix === "-" || prefix === "+",
-      lastCheckedAt: Date.now()
-    });
-  }
-  return submodules;
-}
 var lastKnownGoodStatus, DAEMON_RUNTIME_PACKAGES, WEB_ONLY_PACKAGES;
 var init_git_status = __esm({
   "src/git/git-status.ts"() {
@@ -1577,8 +1657,61 @@ function mergeMeshPolicy(base, patch) {
   } else {
     delete policy.autoConvergeCodeChange;
   }
+  const normalizedAffinity = normalizeTaskAffinityPolicy(policy.taskAffinity);
+  if (normalizedAffinity) {
+    policy.taskAffinity = normalizedAffinity;
+  } else {
+    delete policy.taskAffinity;
+  }
   return policy;
 }
+function normalizeTaskAffinityPolicy(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const record = value;
+  const out = {};
+  let hasContent = false;
+  if (typeof record.enabled === "boolean") {
+    out.enabled = record.enabled;
+    if (record.enabled === false) hasContent = true;
+    else delete out.enabled;
+  }
+  if (record.byTaskMode && typeof record.byTaskMode === "object" && !Array.isArray(record.byTaskMode)) {
+    const byTaskMode = {};
+    for (const [mode, raw] of Object.entries(record.byTaskMode)) {
+      const modeKey = mode.trim();
+      if (!modeKey) continue;
+      if (typeof raw !== "string") continue;
+      const role = raw.trim().toLowerCase();
+      byTaskMode[modeKey] = role;
+      if (role && !STANDARD_MESH_ROLES.includes(role)) {
+        try {
+          console.warn(`[mesh] task_affinity.byTaskMode.${modeKey}: custom role "${role}" is not a standard mesh role (${STANDARD_MESH_ROLES.join("/")}); routing still applies`);
+        } catch {
+        }
+      }
+    }
+    if (Object.keys(byTaskMode).length > 0) {
+      out.byTaskMode = byTaskMode;
+      hasContent = true;
+    }
+  }
+  if (Array.isArray(record.customRoles)) {
+    const seen = /* @__PURE__ */ new Set();
+    const customRoles = [];
+    for (const raw of record.customRoles) {
+      if (typeof raw !== "string") continue;
+      const role = raw.trim().toLowerCase();
+      if (!role || seen.has(role)) continue;
+      seen.add(role);
+      customRoles.push(role);
+    }
+    if (customRoles.length > 0) {
+      out.customRoles = customRoles;
+      hasContent = true;
+    }
+  }
+  return hasContent ? out : void 0;
+}
 function normalizeAutoFastForwardPolicy(value) {
   const record = value && typeof value === "object" && !Array.isArray(value) ? value : {};
   const maxBehind = Number(record.maxBehind);
@@ -2872,6 +3005,7 @@ __export(mesh_work_queue_exports, {
   recordTaskAutoLaunch: () => recordTaskAutoLaunch,
   requeueTask: () => requeueTask,
   resolveConvergeRequiredTags: () => resolveConvergeRequiredTags,
+  resolveTaskAffinityRequiredTags: () => resolveTaskAffinityRequiredTags,
   updateDirectDispatchStatus: () => updateDirectDispatchStatus,
   updateSessionTaskStatus: () => updateSessionTaskStatus,
   updateTaskStatus: () => updateTaskStatus,
@@ -3010,6 +3144,31 @@ function resolveConvergeRequiredTags(meshId, taskMode, explicitRequiredTags, opt
   if (!optedIn) return explicitRequiredTags;
   return normalizeMeshCapabilityTags([...explicitRequiredTags, MESH_CONVERGE_REFINE_TAG]);
 }
+function meshHasNodeAdvertisingRole(nodes, role) {
+  if (!Array.isArray(nodes) || nodes.length === 0) return false;
+  const wanted = `role=${role}`;
+  return nodes.some((node) => buildMeshNodeCapabilityTags(node).includes(wanted));
+}
+function resolveTaskAffinityRequiredTags(meshId, taskMode, explicitRequiredTags, opts) {
+  if (typeof opts?.targetNodeId === "string" && opts.targetNodeId.trim()) return explicitRequiredTags;
+  if (opts?.callerSpecifiedRequiredTags === true) return explicitRequiredTags;
+  let mesh;
+  try {
+    mesh = getMesh(meshId);
+  } catch {
+    return explicitRequiredTags;
+  }
+  const role = resolveTaskAffinityRole(taskMode, mesh?.policy?.taskAffinity);
+  if (!role) return explicitRequiredTags;
+  if (!meshHasNodeAdvertisingRole(mesh?.nodes, role)) {
+    try {
+      console.warn(`[mesh] task_affinity: no node advertises role=${role} for taskMode=${taskMode} in mesh ${meshId}; skipping injection (least_loaded fallback)`);
+    } catch {
+    }
+    return explicitRequiredTags;
+  }
+  return normalizeMeshCapabilityTags([...explicitRequiredTags, `role=${role}`]);
+}
 function withQueueLock(_meshId, fn) {
   return MeshRuntimeStore.getInstance().transaction(fn);
 }
@@ -3060,6 +3219,20 @@ function enqueueTask(meshId, message, opts) {
       throw new Error(`duplicate_task_id: task '${id}' already exists in mesh '${meshId}'`);
     }
     assertNoDependencyCycle(meshId, id, dependsOn);
+    const callerTags = normalizeMeshCapabilityTags(opts?.requiredTags);
+    const callerSpecifiedRequiredTags = callerTags.length > 0;
+    let resolvedRequiredTags = resolveConvergeRequiredTags(
+      meshId,
+      modeValidation.taskMode,
+      callerTags,
+      { targetNodeId: opts?.targetNodeId }
+    );
+    resolvedRequiredTags = resolveTaskAffinityRequiredTags(
+      meshId,
+      modeValidation.taskMode,
+      resolvedRequiredTags,
+      { targetNodeId: opts?.targetNodeId, callerSpecifiedRequiredTags }
+    );
     const entry = {
       id,
       meshId,
@@ -3068,15 +3241,7 @@ function enqueueTask(meshId, message, opts) {
       taskMode: modeValidation.taskMode,
       targetNodeId: opts?.targetNodeId,
       targetSessionId: opts?.targetSessionId,
-      // Convergence routing (opt-in): auto-inject converge=refine for code_change
-      // tasks so they hard-filter onto refine-capable worktree nodes. No-op unless
-      // the mesh opts in; explicit target_node_id / required_tags are preserved.
-      requiredTags: resolveConvergeRequiredTags(
-        meshId,
-        modeValidation.taskMode,
-        normalizeMeshCapabilityTags(opts?.requiredTags),
-        { targetNodeId: opts?.targetNodeId }
-      ),
+      requiredTags: resolvedRequiredTags,
       ...dependsOn.length > 0 ? { dependsOn } : {},
       ...typeof opts?.missionId === "string" && opts.missionId.trim() ? { missionId: opts.missionId.trim() } : {},
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -3833,6 +3998,18 @@ var init_mesh_runtime_store = __esm({
         `).get(meshId, nodeId);
         return row?.count ?? 0;
       }
+      /**
+       * O(1) count of queue tasks in 'pending' status for a mesh. A COUNT(*) over the
+       * indexed status column, so it avoids JSON.parse-ing every queue row — used as a
+       * cheap guard before the reconcile loop runs a full triggerMeshQueue scan.
+       */
+      pendingQueueTaskCount(meshId) {
+        const row = this.db.prepare(`
+            SELECT COUNT(*) as count FROM mesh_queue
+            WHERE mesh_id = ? AND status = 'pending'
+        `).get(meshId);
+        return row?.count ?? 0;
+      }
       /**
        * Read the current per-mesh round-robin cursor (0 when unset). Used to rotate
        * the tie-break winner among nodes tied at the least load.
@@ -8766,7 +8943,7 @@ async function triggerMeshQueue(components, meshId) {
   }
   const remoteCandidates = [];
   for (const idle of remoteSessions) {
-    const node = mesh.nodes.find((n) => n.id === idle.nodeId);
+    const node = mesh.nodes.find((n) => meshNodeIdMatches(n, idle.nodeId));
     if (node) {
       remoteIdleSessionsChecked += 1;
       remoteCandidates.push({ nodeId: idle.nodeId, sessionId: idle.sessionId, providerType: idle.providerType, origin: "remote", node });
@@ -9570,6 +9747,21 @@ async function runMeshReconcileTick(components) {
       }
     }
   }
+  for (const mesh of listMeshes()) {
+    const selfIds = resolveCoordinatorSelfIds(mesh, drainDaemonIds);
+    if (!daemonHostsMesh(mesh, selfIds)) continue;
+    if (store) {
+      try {
+        if (store.pendingQueueTaskCount(mesh.id) === 0) continue;
+      } catch {
+      }
+    }
+    try {
+      await triggerMeshQueue(components, mesh.id);
+    } catch (e) {
+      LOG.warn("MeshReconcile", `Pending-claim recovery trigger failed for mesh ${mesh.id}: ${e?.message || e}`);
+    }
+  }
   const coordinators = findLiveCoordinators(components);
   if (coordinators.length === 0) {
     return;
@@ -10961,8 +11153,24 @@ function findBinary(name) {
   }
   const isWin = os12.platform() === "win32";
   const paths = (process.env.PATH || "").split(path17.delimiter);
+  const extraDirs = [];
+  if (isWin) {
+    if (process.env.APPDATA) extraDirs.push(path17.join(process.env.APPDATA, "npm"));
+    try {
+      extraDirs.push(path17.dirname(process.execPath));
+    } catch {
+    }
+  } else {
+    extraDirs.push(path17.join(os12.homedir(), ".npm-global", "bin"));
+    extraDirs.push("/usr/local/bin", "/opt/homebrew/bin");
+    try {
+      extraDirs.push(path17.dirname(process.execPath));
+    } catch {
+    }
+  }
+  const searchDirs = [...paths, ...extraDirs];
   const exes = isWin ? [".exe", ".cmd", ".bat", ""] : [""];
-  for (const p of paths) {
+  for (const p of searchDirs) {
     if (!p) continue;
     for (const ext of exes) {
       const fullPath = path17.join(p, trimmed + ext);
@@ -14362,6 +14570,37 @@ ${lastSnapshot}`;
         if (!this.ptyProcess || typeof this.ptyProcess.getMetadata !== "function") return null;
         return this.ptyProcess.getMetadata();
       }
+      /**
+       * Launch metadata for the dashboard Session info panel. Re-derives the spawn plan
+       * (pure — same inputs the live PTY was spawned with) so the dashboard sees the
+       * resolved binary, full arg vector, and cwd without us having to persist it.
+       * extraEnv values are intentionally dropped (keys only) so secrets passed at
+       * launch time never reach the dashboard.
+       */
+      getLaunchInfo() {
+        let command;
+        let args = [...this.extraArgs];
+        try {
+          const plan = resolveCliSpawnPlan({
+            provider: this.provider,
+            runtimeSettings: this.runtimeSettings,
+            workingDir: this.workingDir,
+            extraArgs: this.extraArgs,
+            extraEnv: this.extraEnv
+          });
+          command = plan.binaryPath;
+          args = plan.allArgs;
+        } catch {
+        }
+        return {
+          command,
+          args,
+          extraArgs: [...this.extraArgs],
+          cwd: this.workingDir,
+          extraEnvKeys: Object.keys(this.extraEnv || {}),
+          providerSessionId: this.providerSessionId || void 0
+        };
+      }
       updateRuntimeMeta(meta, replace = false) {
         const nextProviderSessionId = typeof meta?.providerSessionId === "string" ? meta.providerSessionId.trim() : "";
         if (nextProviderSessionId) {
@@ -15704,6 +15943,7 @@ __export(index_exports, {
   DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS: () => DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS,
   DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS: () => DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS,
   DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS: () => DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS,
+  DEFAULT_TASKMODE_ROLE_MAP: () => DEFAULT_TASKMODE_ROLE_MAP,
   DEV_SERVER_PORT: () => DEV_SERVER_PORT,
   DaemonAgentStreamManager: () => DaemonAgentStreamManager,
   DaemonCdpInitializer: () => DaemonCdpInitializer,
@@ -15743,6 +15983,7 @@ __export(index_exports, {
   RawTerminalAttachment: () => RawTerminalAttachment,
   STALE_TERMINAL_REFINE_WINDOW_MS: () => STALE_TERMINAL_REFINE_WINDOW_MS,
   STANDALONE_CDP_SCAN_INTERVAL_MS: () => STANDALONE_CDP_SCAN_INTERVAL_MS,
+  STANDARD_MESH_ROLES: () => STANDARD_MESH_ROLES,
   SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory,
   TerminalAdapter: () => TerminalAdapter,
   TurnSnapshotTracker: () => TurnSnapshotTracker,
@@ -15976,9 +16217,12 @@ __export(index_exports, {
   resolveGitRepository: () => resolveGitRepository,
   resolveMeshHostStatus: () => resolveMeshHostStatus,
   resolveMeshRefineValidationPlan: () => resolveMeshRefineValidationPlan,
+  resolveMeshRoleOptions: () => resolveMeshRoleOptions,
   resolveNodeSchedulingPriority: () => resolveNodeSchedulingPriority,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution,
+  resolveTaskAffinityRequiredTags: () => resolveTaskAffinityRequiredTags,
+  resolveTaskAffinityRole: () => resolveTaskAffinityRole,
   resolveWorktreePath: () => resolveWorktreePath,
   runAsyncBatch: () => runAsyncBatch,
   runGit: () => runGit,
@@ -18940,8 +19184,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs12.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os30 === "win32") {
-      const { dirname: dirname14 } = await import("path");
-      const appDir = dirname14(appPath);
+      const { dirname: dirname15 } = await import("path");
+      const appDir = dirname15(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -43123,7 +43367,15 @@ var MESH_DIRECT_PROBE_MAX_RETRIES = 2;
 function readMeshConnectionState(connection) {
   return readStringValue(connection?.state);
 }
+function isMeshConnectionDefinitivelyDown(connection) {
+  if (!connection) return true;
+  const state = readMeshConnectionState(connection);
+  return state === "failed" || state === "closed" || state === "disconnected";
+}
 async function probeRemoteMeshGitStatusWithRetry(args) {
+  if (args.getConnection && isMeshConnectionDefinitivelyDown(args.getConnection(args.daemonId))) {
+    return null;
+  }
   for (let attempt = 0; attempt <= MESH_DIRECT_PROBE_MAX_RETRIES; attempt += 1) {
     if (attempt > 0) {
       const connection = args.getConnection?.(args.daemonId);
@@ -47104,6 +47356,7 @@ ${hintLines.join("\n")}` : "",
         if (!target && !coord) return { success: false, error: "Session not found", sessionId };
         const adapter = target ? this.deps.cliManager.findAdapter(target.providerType, { instanceKey: sessionId })?.adapter : void 0;
         const runtimeMeta = adapter && typeof adapter.getRuntimeMetadata === "function" ? adapter.getRuntimeMetadata() : void 0;
+        const launchInfo = adapter && typeof adapter.getLaunchInfo === "function" ? adapter.getLaunchInfo() : void 0;
         const providerType = target?.providerType || coord?.cliType || "";
         const providerMetaForSession = providerType ? this.deps.providerLoader.resolve?.(providerType) || this.deps.providerLoader.getMeta(providerType) : void 0;
         return {
@@ -47115,8 +47368,11 @@ ${hintLines.join("\n")}` : "",
             transport: target?.transport,
             workspace: target?.workspace || coord?.workspace,
             spawnedAtMs: target?.spawnedAtMs || coord?.startedAt,
-            providerSessionId: target?.providerSessionId,
-            runtimeMetadata: runtimeMeta
+            // providerSessionId now comes from the live adapter's launch info
+            // (the registry target never carried it — it was always undefined).
+            providerSessionId: launchInfo?.providerSessionId || target?.providerSessionId,
+            runtimeMetadata: runtimeMeta,
+            launch: launchInfo
           },
           coordinator: coord ? {
             meshId: coord.meshId,
@@ -48957,7 +49213,7 @@ ${ptyResult.output.slice(-2e3)}`);
             };
           }
           const { existsSync: existsSync44, readFileSync: readFileSync35, writeFileSync: writeFileSync23, copyFileSync: copyFileSync4, mkdirSync: mkdirSync21 } = await import("fs");
-          const { dirname: dirname14 } = await import("path");
+          const { dirname: dirname15 } = await import("path");
           const mcpConfigPath = coordinatorSetup.configPath;
           const hermesManualFallback = cliType === "hermes-cli" && configFormat === "hermes_config_yaml" ? createHermesManualMeshCoordinatorSetup(meshId, workspace) : null;
           let hermesBaseConfig = null;
@@ -48992,7 +49248,7 @@ ${ptyResult.output.slice(-2e3)}`);
             };
           }
           try {
-            mkdirSync21(dirname14(mcpConfigPath), { recursive: true });
+            mkdirSync21(dirname15(mcpConfigPath), { recursive: true });
           } catch (error) {
             const message = `Could not prepare MCP config path for automatic setup: ${error?.message || error}`;
             LOG.error("MeshCoordinator", message);
@@ -49002,7 +49258,7 @@ ${ptyResult.output.slice(-2e3)}`);
           const hadExistingMcpConfig = existsSync44(mcpConfigPath);
           let existingMcpConfig = hermesBaseConfig?.config || {};
           if (hermesBaseConfig) {
-            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname14(mcpConfigPath));
+            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname15(mcpConfigPath));
           }
           if (hadExistingMcpConfig) {
             try {
@@ -49040,7 +49296,7 @@ ${ptyResult.output.slice(-2e3)}`);
           const cliArgs = [];
           const launchEnv = {};
           if (configFormat === "hermes_config_yaml") {
-            launchEnv.HERMES_HOME = dirname14(mcpConfigPath);
+            launchEnv.HERMES_HOME = dirname15(mcpConfigPath);
             launchEnv.HERMES_IGNORE_USER_CONFIG = "";
           }
           let autoImportContextFilePath;
@@ -58168,6 +58424,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   DEFAULT_STATUS_INITIAL_REPORT_DELAY_MS,
   DEFAULT_STATUS_P2P_REPORT_INTERVAL_MS,
   DEFAULT_STATUS_SERVER_REPORT_INTERVAL_MS,
+  DEFAULT_TASKMODE_ROLE_MAP,
   DEV_SERVER_PORT,
   DaemonAgentStreamManager,
   DaemonCdpInitializer,
@@ -58207,6 +58464,7 @@ var V1_CONTRACT_VERSION = "1.0.0";
   RawTerminalAttachment,
   STALE_TERMINAL_REFINE_WINDOW_MS,
   STANDALONE_CDP_SCAN_INTERVAL_MS,
+  STANDARD_MESH_ROLES,
   SessionHostPtyTransportFactory,
   TerminalAdapter,
   TurnSnapshotTracker,
@@ -58440,9 +58698,12 @@ var V1_CONTRACT_VERSION = "1.0.0";
   resolveGitRepository,
   resolveMeshHostStatus,
   resolveMeshRefineValidationPlan,
+  resolveMeshRoleOptions,
   resolveNodeSchedulingPriority,
   resolveSessionHostAppName,
   resolveSessionHostAppNameResolution,
+  resolveTaskAffinityRequiredTags,
+  resolveTaskAffinityRole,
   resolveWorktreePath,
   runAsyncBatch,
   runGit,