@adhdev/daemon-core 0.9.82-rc.320 → 0.9.82-rc.322

package/dist/index.mjs

@@ -35,35 +35,6 @@ 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;
 }
@@ -76,7 +47,7 @@ function resolveDelegatedWorkerAutoApprove(meshPolicy, nodePolicy) {
   }
   return true;
 }
-function resolveProviderRole(nodePolicy, providerType) {
+function resolveProviderMaxParallel(nodePolicy, providerType) {
   const wanted = typeof providerType === "string" ? providerType.trim().toLowerCase() : "";
   if (!wanted) return void 0;
   const roles = nodePolicy?.providerRoles;
@@ -84,17 +55,14 @@ function resolveProviderRole(nodePolicy, providerType) {
   for (const entry of roles) {
     if (!entry || typeof entry !== "object") continue;
     const type = typeof entry.providerType === "string" ? entry.providerType.trim().toLowerCase() : "";
-    if (type && type === wanted) return entry;
+    if (!type || type !== wanted) continue;
+    const raw = Number(entry.maxParallel);
+    if (!Number.isFinite(raw) || raw < 0) return void 0;
+    return Math.floor(raw);
   }
   return void 0;
 }
-function resolveProviderMaxParallel(nodePolicy, providerType) {
-  const role = resolveProviderRole(nodePolicy, providerType);
-  const raw = Number(role?.maxParallel);
-  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, STANDARD_MESH_ROLES, DEFAULT_TASKMODE_ROLE_MAP, DEFAULT_MESH_POLICY;
+var MESH_SCHEDULING_STRATEGIES, DEFAULT_MESH_SCHEDULING_STRATEGY, MESH_CONVERGE_REFINE_TAG, MESH_CONVERGE_FAST_FORWARD_TAG, DEFAULT_MESH_POLICY;
 var init_repo_mesh_types = __esm({
   "src/repo-mesh-types.ts"() {
     "use strict";
@@ -107,14 +75,6 @@ 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,
@@ -348,10 +308,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "bbaf30f95c09531cec77fb48a8cf6d38b3b6d7f9" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "bbaf30f9" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.320" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-19T01:16:38.511Z" : void 0);
+  const commit = readInjected(true ? "c19690a16292dbcb1ed5ff5458b94596fce46e38" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "c19690a1" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.322" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-19T05:42:02.504Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -1587,11 +1547,42 @@ function loadMeshConfig() {
   try {
     const raw = JSON.parse(readFileSync2(path42, "utf-8"));
     if (!raw || !Array.isArray(raw.meshes)) return { meshes: [] };
-    return raw;
+    const config = raw;
+    const migrated = migrateLoadedMeshConfig(config);
+    if (migrated) {
+      try {
+        saveMeshConfig(config);
+      } catch {
+      }
+    }
+    return config;
   } catch {
     return { meshes: [] };
   }
 }
+function migrateLoadedMeshConfig(config) {
+  let changed = false;
+  for (const mesh of config.meshes) {
+    if (!mesh || !Array.isArray(mesh.nodes)) continue;
+    for (const node of mesh.nodes) {
+      if (stripDeadRoleFromProviderRoles(node?.policy)) changed = true;
+    }
+  }
+  return changed;
+}
+function stripDeadRoleFromProviderRoles(policy) {
+  if (!policy || typeof policy !== "object") return false;
+  const roles = policy.providerRoles;
+  if (!Array.isArray(roles)) return false;
+  let changed = false;
+  for (const entry of roles) {
+    if (entry && typeof entry === "object" && !Array.isArray(entry) && Object.prototype.hasOwnProperty.call(entry, "role")) {
+      delete entry.role;
+      changed = true;
+    }
+  }
+  return changed;
+}
 function normalizeCapabilityTags(value) {
   if (!Array.isArray(value)) return void 0;
   const seen = /* @__PURE__ */ new Set();
@@ -1655,61 +1646,8 @@ 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);
@@ -2166,11 +2104,10 @@ function buildNodeConfigSection(mesh) {
     const providerRoles = Array.isArray(n.policy?.providerRoles) ? n.policy.providerRoles.map((r) => {
       const type = typeof r?.providerType === "string" ? r.providerType.trim() : "";
       if (!type) return "";
-      const role = typeof r?.role === "string" && r.role.trim() ? `=${r.role.trim()}` : "";
       const cap = Number.isFinite(Number(r?.maxParallel)) ? ` (max ${Math.floor(Number(r.maxParallel))})` : "";
-      return `${type}${role}${cap}`;
+      return `${type}${cap}`;
     }).filter(Boolean) : [];
-    const providerRolesSuffix = providerRoles.length ? ` | roles: ${providerRoles.join(", ")}` : "";
+    const providerRolesSuffix = providerRoles.length ? ` | caps: ${providerRoles.join(", ")}` : "";
     lines.push(`- ${explicitLabel} nodeId: \`${n.id}\` | workspace: \`${n.workspace}\`${n.daemonId ? ` | daemon: \`${n.daemonId}\`` : ""}${providerPriority}${providerRolesSuffix}${suffix}`);
     const nodePrompt = typeof n.systemPrompt === "string" ? n.systemPrompt.trim() : "";
     if (nodePrompt) {
@@ -3000,7 +2937,6 @@ __export(mesh_work_queue_exports, {
   recordTaskAutoLaunch: () => recordTaskAutoLaunch,
   requeueTask: () => requeueTask,
   resolveConvergeRequiredTags: () => resolveConvergeRequiredTags,
-  resolveTaskAffinityRequiredTags: () => resolveTaskAffinityRequiredTags,
   updateDirectDispatchStatus: () => updateDirectDispatchStatus,
   updateSessionTaskStatus: () => updateSessionTaskStatus,
   updateTaskStatus: () => updateTaskStatus,
@@ -3075,21 +3011,6 @@ function firstProviderPriority(policy) {
   if (!Array.isArray(raw)) return void 0;
   return raw.find((type) => typeof type === "string" && type.trim())?.trim();
 }
-function roleCapabilityTags(policy, providerType) {
-  const roles = policy && typeof policy === "object" && !Array.isArray(policy) ? policy.providerRoles : void 0;
-  if (!Array.isArray(roles)) return [];
-  const wantedProvider = typeof providerType === "string" && providerType.trim() ? providerType.trim().toLowerCase() : "";
-  const out = [];
-  for (const entry of roles) {
-    if (!entry || typeof entry !== "object") continue;
-    const type = typeof entry.providerType === "string" ? entry.providerType.trim().toLowerCase() : "";
-    const role = typeof entry.role === "string" ? entry.role.trim().toLowerCase() : "";
-    if (!role) continue;
-    if (wantedProvider && type && type !== wantedProvider) continue;
-    out.push(`role=${role}`);
-  }
-  return out;
-}
 function buildMeshNodeCapabilityTags(node, providerType) {
   const provider = typeof providerType === "string" && providerType.trim() ? providerType.trim() : firstProviderPriority(node?.policy);
   const worktreeBranch = typeof node?.worktreeBranch === "string" && node.worktreeBranch.trim() ? node.worktreeBranch.trim() : null;
@@ -3112,14 +3033,7 @@ function buildMeshNodeCapabilityTags(node, providerType) {
     //     receives the task instead). Reuses the ordinary required-tags filter —
     //     the load-balancing scheduler auto-injects converge=refine for code_change
     //     so such work is hard-filtered onto refine-capable nodes.
-    ...node?.isLocalWorktree === true ? ["converge=refine"] : ["converge=fast_forward"],
-    // Role-based routing: advertise role=<x> for each (node, provider) role
-    // declared in policy.providerRoles. Narrowed to the selected provider when
-    // one is given so the chosen provider must match a task's required role;
-    // when no provider is selected, all declared roles are advertised for the
-    // node-level eligibility scan. Reuses the ordinary required-tags filter —
-    // no separate role field/gate.
-    ...roleCapabilityTags(node?.policy, providerType)
+    ...node?.isLocalWorktree === true ? ["converge=refine"] : ["converge=fast_forward"]
   ]);
 }
 function nodeSatisfiesRequiredTags(requiredTags, capabilityTags) {
@@ -3140,31 +3054,6 @@ 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);
 }
@@ -3216,19 +3105,12 @@ function enqueueTask(meshId, message, opts) {
     }
     assertNoDependencyCycle(meshId, id, dependsOn);
     const callerTags = normalizeMeshCapabilityTags(opts?.requiredTags);
-    const callerSpecifiedRequiredTags = callerTags.length > 0;
-    let resolvedRequiredTags = resolveConvergeRequiredTags(
+    const resolvedRequiredTags = resolveConvergeRequiredTags(
       meshId,
       modeValidation.taskMode,
       callerTags,
       { targetNodeId: opts?.targetNodeId }
     );
-    resolvedRequiredTags = resolveTaskAffinityRequiredTags(
-      meshId,
-      modeValidation.taskMode,
-      resolvedRequiredTags,
-      { targetNodeId: opts?.targetNodeId, callerSpecifiedRequiredTags }
-    );
     const entry = {
       id,
       meshId,
@@ -42476,8 +42358,6 @@ function normalizeProviderRoles(value) {
     const providerType = typeof rec.providerType === "string" ? rec.providerType.trim() : "";
     if (!providerType) continue;
     const entry = { providerType };
-    const role = typeof rec.role === "string" ? rec.role.trim() : "";
-    if (role) entry.role = role;
     const maxParallel = Number(rec.maxParallel);
     if (Number.isFinite(maxParallel) && maxParallel >= 0) entry.maxParallel = Math.floor(maxParallel);
     byType.set(providerType.toLowerCase(), entry);
@@ -42547,7 +42427,7 @@ function buildMeshNodeDisplayLabel(node, nodeId, providerPriority) {
   const explicit = readStringValue(node.machineLabel, node.machine_label, node.machineNickname, node.machine_nickname, node.alias);
   if (explicit) return explicit;
   const workspace = readStringValue(node.workspace, node.repoRoot, node.repo_root);
-  const workspaceName = workspace ? pathBasename(workspace) : void 0;
+  const workspaceName = workspace ? workingDirBasename(workspace) : void 0;
   const host = readStringValue(node.machineName, node.machine_name, node.hostname, node.host, node.daemonId, node.daemon_id, node.machineId, node.machine_id);
   const provider = providerPriority[0] || (Array.isArray(node.providers) ? readStringValue(...node.providers) : void 0);
   const parts = [workspaceName, host, provider].filter(Boolean);
@@ -43044,6 +42924,13 @@ function readCachedInlineMeshActiveSessions(node) {
   const sessionId = readStringValue(fallbackSession.id, fallbackSession.sessionId, fallbackSession.session_id, node?.activeSessionId, node?.active_session_id, node?.sessionId, node?.session_id);
   return sessionId ? [sessionId] : [];
 }
+function resolveMeshNodeAttribution(node) {
+  const record = readObjectRecord(node);
+  return {
+    daemonId: readMeshNodeDaemonId(record),
+    machineName: readMeshNodeDisplayMachineName(record)
+  };
+}
 function readCachedInlineMeshActiveSessionDetails(node) {
   const cachedStatus = readObjectRecord(node?.cachedStatus);
   const activeSession = readObjectRecord(cachedStatus.activeSession);
@@ -58268,7 +58155,6 @@ export {
   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,
@@ -58308,7 +58194,6 @@ export {
   RawTerminalAttachment,
   STALE_TERMINAL_REFINE_WINDOW_MS,
   STANDALONE_CDP_SCAN_INTERVAL_MS,
-  STANDARD_MESH_ROLES,
   SessionHostPtyTransportFactory,
   TerminalAdapter,
   TurnSnapshotTracker,
@@ -58541,13 +58426,11 @@ export {
   resolveDeliveryDecision,
   resolveGitRepository,
   resolveMeshHostStatus,
+  resolveMeshNodeAttribution,
   resolveMeshRefineValidationPlan,
-  resolveMeshRoleOptions,
   resolveNodeSchedulingPriority,
   resolveSessionHostAppName,
   resolveSessionHostAppNameResolution,
-  resolveTaskAffinityRequiredTags,
-  resolveTaskAffinityRole,
   resolveWorktreePath,
   runAsyncBatch,
   runGit,