@duckmind/dm-darwin-x64 0.66.5 → 0.66.7

package/extensions/dm-subagents/src/intercom/native-supervisor-channel.js

@@ -1,10 +1,12 @@
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { onDmBeforeSettle } from "../shared/dm-settlement.js";
 import { Type } from "typebox";
 import { INTERCOM_DETACH_REQUEST_EVENT, POLL_INTERVAL_MS, TEMP_ROOT_DIR } from "../shared/types.js";
 import { writeAtomicJson } from "../shared/atomic-json.js";
 import { shouldUseNativeFsWatch } from "../shared/watch-strategy.js";
+import { MODEL_ONLY_TOOL } from "../shared/extension-context.js";
 import {
   SUPERVISOR_REQUEST_MESSAGE_TYPE,
   SUPERVISOR_REPLY_ENTRY_TYPE,
@@ -178,6 +180,7 @@ export function registerNativeSupervisorClient(dm, metadata) {
     return;
   const tool = {
     name: "contact_supervisor",
+    ...MODEL_ONLY_TOOL,
     label: "Contact Supervisor",
     description: "Contact the parent/supervisor session for a blocking decision, structured interview, or progress update.",
     parameters: ContactSupervisorParamsSchema,
@@ -421,7 +424,7 @@ function requestVisibleText(request) {
   }
   if (request.expectsReply)
     lines.push("", `Reply with: ${supervisorReplyHint(request.id)}`);
-  lines.push("", `Live guidance: subagent({ action: "steer", id: ${JSON.stringify(request.runId)}, index: ${request.childIndex}, message: "..." })${request.expectsReply ? " (Reply to the pending request first.)" : ""}`);
+  lines.push("", `Live guidance: subagent({ action: "steer", id: ${JSON.stringify(request.runId)}, message: "...", options: { index: ${request.childIndex} } })${request.expectsReply ? " (Reply to the pending request first.)" : ""}`);
   return lines.join(`
 `).trimEnd();
 }
@@ -493,6 +496,7 @@ function publicPendingRequests(pending) {
 function buildParentSupervisorTool(dm, pending, state, onLifecycle, discover, runState) {
   return {
     name: NATIVE_SUPERVISOR_TOOL_NAME,
+    ...MODEL_ONLY_TOOL,
     label: "Subagent Supervisor",
     description: "Native dm-subagents supervisor channel. Use reply/pending/status to answer child subagent requests without overriding dm-intercom.",
     parameters: IntercomParamsSchema,
@@ -512,8 +516,8 @@ function buildParentSupervisorTool(dm, pending, state, onLifecycle, discover, ru
         const request = resolvePendingRequest(pending, input);
         const reply = writeReply(request, input.message ?? "");
         appendSupervisorReplyEntry(dm, request, reply);
-        onLifecycle(request, "resolved");
         pending.delete(request.id);
+        onLifecycle(request, "resolved");
         clearForegroundSupervisorAttention(request, pending, state);
         return { content: [{ type: "text", text: `Replied to supervisor request ${request.id}.` }], details: { replyTo: request.id, runId: request.runId, agent: request.agent } };
       }
@@ -532,6 +536,8 @@ export function createNativeSupervisorChannel(dm, state, deps = {}) {
     return state;
   };
   const pending = new Map;
+  const settleNotices = new Map;
+  let unsubscribeSettle;
   const requestCorrelations = new Map;
   const correlationKey = (request) => {
     if (!request.toolCallId)
@@ -565,8 +571,10 @@ export function createNativeSupervisorChannel(dm, state, deps = {}) {
     pruneRequestCorrelations();
   };
   const observeRequestLifecycle = (request, lifecycle) => {
+    settleNotices.delete(request.id);
     if (lifecycle !== "wrong-session")
       rememberResolvedRequest(request);
+    updateSettleSubscription();
   };
   const getSupervisorRequestState = (event) => {
     if (event.currentTool === "intercom" || event.index === undefined)
@@ -657,9 +665,10 @@ export function createNativeSupervisorChannel(dm, state, deps = {}) {
       }
       rememberPendingRequest(request);
       pending.set(request.id, request);
+      updateSettleSubscription();
       markForegroundSupervisorAttention(request, state);
       try {
-        dm.sendMessage({
+        (deps.parentWake ?? dm).sendMessage({
           customType: SUPERVISOR_REQUEST_MESSAGE_TYPE,
           content: requestVisibleText(request),
           display: true,
@@ -690,13 +699,75 @@ export function createNativeSupervisorChannel(dm, state, deps = {}) {
         markForegroundSupervisorAttention(request, state);
     }
     channels?.retire?.();
+    updateSettleSubscription();
+  };
+  const handleBeforeSettle = (event) => {
+    if (!started || event.outcome !== "completed")
+      return;
+    refreshPendingRequests(pending, state, observeRequestLifecycle, runState);
+    if (event.continue || event.context.pendingMessages.length)
+      return;
+    const messages = event.context.contextMessages;
+    const requests = [...pending.values()].filter((request) => {
+      if (!request.expectsReply || settleNotices.get(request.id) === "warned" || settleNotices.get(request.id) === "handled")
+        return false;
+      const index = messages.findLastIndex((message) => message.role === "custom" && message.customType === SUPERVISOR_REQUEST_MESSAGE_TYPE && message.details?.requestId === request.id);
+      const acted = index !== -1 && messages.slice(index + 1).some((message) => message.role === "assistant" && Array.isArray(message.content) && message.content.some((part) => part.type === "toolCall" || part.type === "text" && part.text?.trim()));
+      if (index === -1 || acted) {
+        settleNotices.set(request.id, "handled");
+        return false;
+      }
+      return true;
+    });
+    updateSettleSubscription();
+    if (!requests.length)
+      return;
+    const unanswered = requests.filter((request) => !settleNotices.has(request.id));
+    if (unanswered.length) {
+      for (const request of unanswered)
+        settleNotices.set(request.id, "reminded");
+      return {
+        entries: [...event.entries, {
+          type: "custom_message",
+          customType: "subagent-supervisor-unanswered",
+          content: "Silent supervisor wake. Pending request IDs: " + requests.map((request) => request.id).join(", ") + '. Check subagent_supervisor({ action: "pending" }) and reply within existing authority, or explicitly ask the user for approval. Do not auto-approve.',
+          display: true,
+          details: { requestIds: requests.map((request) => request.id) }
+        }],
+        continue: true
+      };
+    }
+    const unflagged = requests.filter((request) => settleNotices.get(request.id) !== "warned");
+    if (!unflagged.length)
+      return;
+    for (const request of unflagged)
+      settleNotices.set(request.id, "warned");
+    updateSettleSubscription();
+    return {
+      entries: [...event.entries, {
+        type: "custom_message",
+        customType: "subagent-supervisor-blocked",
+        content: "BLOCKED: unanswered supervisor request IDs: " + unflagged.map((request) => request.id).join(", ") + '. Reminder budget exhausted; no reply or approval sent. Inspect subagent_supervisor({ action: "pending" }).',
+        display: true,
+        details: { blocked: true, requestIds: unflagged.map((request) => request.id) }
+      }]
+    };
+  };
+  const updateSettleSubscription = () => {
+    const needed = started && [...pending.values()].some((request) => request.expectsReply && settleNotices.get(request.id) !== "warned" && settleNotices.get(request.id) !== "handled");
+    if (needed && !unsubscribeSettle)
+      unsubscribeSettle = onDmBeforeSettle(dm, handleBeforeSettle);
+    if (!needed) {
+      unsubscribeSettle?.();
+      unsubscribeSettle = undefined;
+    }
   };
   const startPolling = () => {
     if (poller)
       return;
     poller = timers.setInterval(() => {
       poll();
-      if (!useNativeWatcher() && (platform === "darwin" || deps.getChannelDirs) && !hasTransportDemand()) {
+      if (!useNativeWatcher() && !hasTransportDemand()) {
         if (poller)
           timers.clearInterval(poller);
         poller = undefined;
@@ -820,6 +891,7 @@ export function createNativeSupervisorChannel(dm, state, deps = {}) {
     },
     dispose: () => {
       started = false;
+      updateSettleSubscription();
       try {
         rootWatcher?.close();
       } catch {}
@@ -840,6 +912,7 @@ export function createNativeSupervisorChannel(dm, state, deps = {}) {
         timers.clearImmediate(deferredWatcherRefresh);
       deferredWatcherRefresh = undefined;
       pending.clear();
+      settleNotices.clear();
       requestCorrelations.clear();
       seenFiles.clear();
     },

package/extensions/dm-subagents/src/intercom/result-intercom.js

@@ -197,7 +197,7 @@ function asyncResumeGuidance(input) {
   }
   if (resumable.length > 0) {
     const firstIndex = resumable[0]?.index ?? input.children.indexOf(resumable[0]);
-    return `Revive child: subagent({ action: "resume", id: "${input.asyncId}", index: ${firstIndex}, message: "..." })`;
+    return `Revive child: subagent({ action: "resume", id: "${input.asyncId}", message: "...", options: { index: ${firstIndex} } })`;
   }
   return "Resume: unavailable; no child session file was persisted.";
 }
@@ -235,7 +235,7 @@ function formatSubagentResultIntercomMessage(input) {
   for (let index = 0;index < input.children.length; index++) {
     const child = input.children[index];
     lines.push("");
-    lines.push(`${index + 1}. ${child.agent} — process ${child.status} · output ${child.outputState ?? "unknown"}`);
+    lines.push(`${index + 1}. ${child.agent} — process ${child.status} · output ${child.outputState ?? "unknown"}${child.outputPartial ? " (partial)" : ""}`);
     if (child.intercomTarget)
       lines.push(`${input.source === "async" ? "Previous intercom target" : "Run intercom target"}: ${child.intercomTarget}`);
     if (child.artifactPath)
@@ -253,6 +253,7 @@ export function buildSubagentResultIntercomPayload(input) {
   const children = input.children.map((child) => ({
     ...child,
     outputState: child.outputState ?? "unknown",
+    ...child.outputPartial ? { outputPartial: true } : {},
     summary: child.summary.trim() || "(no output)",
     children: compactNestedResultChildren(child.children)
   }));

package/extensions/dm-subagents/src/intercom/supervisor-ui.js

@@ -1,56 +1,8 @@
-import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@duckmind/dm-tui";
-import { safeTerminalText } from "../shared/display-text.js";
 export const SUPERVISOR_REQUEST_MESSAGE_TYPE = "subagent_supervisor_request";
 export const SUPERVISOR_REPLY_ENTRY_TYPE = "subagent_supervisor_reply";
-const MAX_FIELD_CHARS = 512;
-const MAX_BODY_CHARS = 8000;
-const MAX_INTERVIEW_CHARS = 4000;
-const MAX_RENDER_LINES = 36;
-const TRUNCATION_MARKER = "[truncated]";
 export function supervisorReplyHint(requestId) {
   return `subagent_supervisor({ action: "reply", replyTo: "${requestId}", message: "..." })`;
 }
-function boundedText(value, maxChars) {
-  const safe = safeTerminalText(value);
-  if (safe.length <= maxChars)
-    return safe;
-  const prefixLength = Math.max(0, maxChars - TRUNCATION_MARKER.length - 1);
-  let prefix = "";
-  for (const character of safe) {
-    if (prefix.length + character.length > prefixLength)
-      break;
-    prefix += character;
-  }
-  return `${prefix} ${TRUNCATION_MARKER}`;
-}
-function displayText(value, maxChars, expanded) {
-  return expanded ? safeTerminalText(value) : boundedText(value, maxChars);
-}
-function boundedField(value, fallback = "unknown") {
-  return boundedText(typeof value === "string" ? value : value === undefined ? fallback : String(value), MAX_FIELD_CHARS);
-}
-function contentText(content) {
-  if (typeof content === "string")
-    return content;
-  if (!Array.isArray(content))
-    return "";
-  return content.map((part) => {
-    if (!part || typeof part !== "object")
-      return "";
-    const text = part.text;
-    return typeof text === "string" ? text : "";
-  }).filter(Boolean).join(`
-`);
-}
-function interviewText(interview, expanded) {
-  let serialized;
-  try {
-    serialized = JSON.stringify(interview, null, 2) ?? String(interview);
-  } catch {
-    serialized = "[unavailable]";
-  }
-  return displayText(serialized, MAX_INTERVIEW_CHARS, expanded);
-}
 function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -60,7 +12,7 @@ function isSupervisorReason(value) {
 function optionalString(value) {
   return value === undefined || typeof value === "string";
 }
-function requestDetails(value) {
+export function parseSupervisorRequestDetails(value) {
   if (!isRecord(value))
     return;
   if (!optionalString(value.id) || !optionalString(value.requestId) || !optionalString(value.replyHint) || !optionalString(value.requestBody) || !optionalString(value.runId) || !optionalString(value.agent) || !optionalString(value.childTarget))
@@ -73,7 +25,7 @@ function requestDetails(value) {
     return;
   return value;
 }
-function replyData(value) {
+export function parseSupervisorReplyData(value) {
   if (!isRecord(value))
     return;
   if (typeof value.requestId !== "string" || typeof value.runId !== "string" || typeof value.agent !== "string" || typeof value.message !== "string")
@@ -95,105 +47,3 @@ function replyData(value) {
     createdAt: value.createdAt
   };
 }
-function withRequestId(details) {
-  return boundedField(details.requestId ?? details.id);
-}
-function requestHeading(reason) {
-  if (reason === "interview_request")
-    return "⚠ Supervisor interview request";
-  if (reason === "progress_update")
-    return "ℹ Supervisor progress update";
-  return "⚠ Supervisor decision request";
-}
-function requestLines(message, details, expanded) {
-  const requestId = withRequestId(details);
-  const lines = [
-    `Reason: ${boundedField(details.reason)}`,
-    `Run: ${boundedField(details.runId)}`,
-    `Agent: ${boundedField(details.agent)}`,
-    `Child index: ${boundedField(details.childIndex)}`
-  ];
-  if (details.childTarget)
-    lines.push(`Child target: ${boundedField(details.childTarget)}`);
-  lines.push(`Request ID: ${requestId}`);
-  if (details.expectsReply)
-    lines.push(`Reply with: ${displayText(details.replyHint ?? supervisorReplyHint(requestId), MAX_BODY_CHARS, expanded)}`);
-  lines.push("", "Request:", displayText((details.requestBody ?? contentText(message.content)) || "(no request body)", MAX_BODY_CHARS, expanded));
-  if (details.interview !== undefined)
-    lines.push("", "Interview shape:", interviewText(details.interview, expanded));
-  return lines;
-}
-function replyLines(data, expanded) {
-  const requestId = boundedField(data.requestId);
-  const lines = [
-    ...data.reason ? [`Reason: ${boundedField(data.reason)}`] : [],
-    `Run: ${boundedField(data.runId)}`,
-    `Agent: ${boundedField(data.agent)}`,
-    `Child index: ${boundedField(data.childIndex)}`
-  ];
-  if (data.childTarget)
-    lines.push(`Child target: ${boundedField(data.childTarget)}`);
-  lines.push(`Reply to: ${requestId}`, "", "Reply:", displayText(data.message || "(empty reply)", MAX_BODY_CHARS, expanded));
-  return lines;
-}
-function renderCard(lines, heading, theme, width, expanded) {
-  const safeWidth = Math.max(0, Math.floor(width));
-  if (safeWidth < 3)
-    return [truncateToWidth(heading, safeWidth, "")];
-  const bodyWidth = safeWidth - 2;
-  const headerText = truncateToWidth(` ${heading} `, bodyWidth, "");
-  const headerPadding = Math.max(0, bodyWidth - visibleWidth(headerText));
-  const border = (text) => theme.fg("accent", text);
-  const rendered = [border(`╭${headerText}${"─".repeat(headerPadding)}╮`)];
-  let hidden = false;
-  let interiorLines = 0;
-  for (const line of lines) {
-    const wrapped = wrapTextWithAnsi(line, Math.max(1, bodyWidth));
-    for (const wrappedLine of wrapped.length > 0 ? wrapped : [""]) {
-      if (!expanded && interiorLines >= MAX_RENDER_LINES) {
-        hidden = true;
-        break;
-      }
-      const text = truncateToWidth(wrappedLine, bodyWidth, "");
-      rendered.push(border(`│${text}${" ".repeat(Math.max(0, bodyWidth - visibleWidth(text)))}│`));
-      interiorLines++;
-    }
-    if (hidden)
-      break;
-  }
-  if (hidden) {
-    const text = truncateToWidth(TRUNCATION_MARKER, bodyWidth, "");
-    rendered.push(border(`│${text}${" ".repeat(Math.max(0, bodyWidth - visibleWidth(text)))}│`));
-  }
-  rendered.push(border(`╰${"─".repeat(bodyWidth)}╯`));
-  return rendered;
-}
-
-class SupervisorCardComponent {
-  expanded;
-  heading;
-  lines;
-  theme;
-  constructor(heading, lines, theme, expanded) {
-    this.expanded = expanded;
-    this.heading = heading;
-    this.lines = lines;
-    this.theme = theme;
-  }
-  invalidate() {}
-  render(width) {
-    return renderCard(this.lines, this.heading, this.theme, width, this.expanded);
-  }
-}
-export function renderSupervisorRequest(message, options, theme) {
-  const details = requestDetails(message.details);
-  if (!details)
-    return;
-  return new SupervisorCardComponent(requestHeading(details.reason), requestLines(message, details, options.expanded), theme, options.expanded);
-}
-export function renderSupervisorReply(entry, options, theme) {
-  const data = replyData(entry.data);
-  if (!data)
-    return;
-  return new SupervisorCardComponent("↩ Supervisor reply to child", replyLines(data, options.expanded), theme, options.expanded);
-}

package/extensions/dm-subagents/src/missions/goal-driver.js

@@ -21,7 +21,15 @@ function readLinkedRun(run) {
   const statusPath = path.join(run.asyncDir, "status.json");
   if (!fs.existsSync(statusPath))
     return run;
-  const status = JSON.parse(fs.readFileSync(statusPath, "utf-8"));
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(statusPath, "utf-8"));
+  } catch (error) {
+    throw new Error(`Failed to read linked run status '${statusPath}': ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+    throw new Error(`Linked run status '${statusPath}' must be an object`);
+  const status = parsed;
   if (typeof status.state !== "string" || !status.state.trim())
     throw new Error(`Linked run status '${statusPath}' is missing state`);
   const tokens = tokenUsage(status.totalTokens) ?? (Array.isArray(status.steps) ? status.steps.reduce((total, step) => {
@@ -105,45 +113,50 @@ function nextReadyAction(location, record, retainedChildren) {
 export function collectGoalContinuationNotices(input) {
   const notices = [];
   const seen = new Set;
+  const onError = input.onError ?? ((missionId, error) => console.error("Failed to evaluate goal mission", missionId, error));
   for (const listed of listMissions(input.location).records) {
     if (listed.ownerSessionId !== input.ownerSessionId || !listed.goal || TERMINAL_MISSION_STATUSES.has(listed.status))
       continue;
-    let record = refreshGoalMission(input.location, readMission(input.location, listed.id));
-    if (!record.goal || record.goal.status !== "active" || !record.budget)
-      continue;
-    if ((record.usage?.tokens ?? 0) >= record.budget.tokens) {
-      record = updateMission(input.location, record.id, { usage: record.usage ?? { tokens: 0 } });
-      if (record.goal?.status === "budget-exhausted")
+    try {
+      let record = refreshGoalMission(input.location, readMission(input.location, listed.id));
+      if (!record.goal || record.goal.status !== "active" || !record.budget)
         continue;
-    }
-    if (record.runs.some((run) => run.status && ACTIVE_RUN_STATUSES.has(run.status)))
-      continue;
-    if (seen.has(record.id) || !record.budget)
-      continue;
-    seen.add(record.id);
-    const budget = record.budget.tokens;
-    const used = record.usage?.tokens ?? 0;
-    const remaining = Math.max(0, budget - used);
-    const message = [
-      `Goal mission needs attention: ${bounded(record.title)}`,
-      `Mission: ${record.id}`,
-      `Remaining budget: ${remaining} tokens (${used}/${budget} used)`,
-      `Next ready action: ${nextReadyAction(input.location, record, input.retainedChildren)}`
-    ].join(`
+      if ((record.usage?.tokens ?? 0) >= record.budget.tokens) {
+        record = updateMission(input.location, record.id, { usage: record.usage ?? { tokens: 0 } });
+        if (record.goal?.status === "budget-exhausted")
+          continue;
+      }
+      if (record.runs.some((run) => run.status && ACTIVE_RUN_STATUSES.has(run.status)))
+        continue;
+      if (seen.has(record.id) || !record.budget)
+        continue;
+      seen.add(record.id);
+      const budget = record.budget.tokens;
+      const used = record.usage?.tokens ?? 0;
+      const remaining = Math.max(0, budget - used);
+      const message = [
+        `Goal mission needs attention: ${bounded(record.title)}`,
+        `Mission: ${record.id}`,
+        `Remaining budget: ${remaining} tokens (${used}/${budget} used)`,
+        `Next ready action: ${nextReadyAction(input.location, record, input.retainedChildren)}`
+      ].join(`
 `);
-    notices.push({
-      missionId: record.id,
-      message,
-      event: {
-        type: "needs_attention",
-        to: "needs_attention",
-        ts: input.now ?? Date.now(),
-        runId: `goal-${record.id}-turn-${input.turnId}`,
-        agent: "goal mission",
+      notices.push({
+        missionId: record.id,
         message,
-        reason: "idle"
-      }
-    });
+        event: {
+          type: "needs_attention",
+          to: "needs_attention",
+          ts: input.now ?? Date.now(),
+          runId: `goal-${record.id}-turn-${input.turnId}`,
+          agent: "goal mission",
+          message,
+          reason: "idle"
+        }
+      });
+    } catch (error) {
+      onError(listed.id, error);
+    }
   }
   return notices;
 }

package/extensions/dm-subagents/src/missions/store.js

@@ -261,11 +261,30 @@ export function validateMissionStoreConfig(value, label = "config.missions") {
     ...input.retainTerminal !== undefined ? { retainTerminal: input.retainTerminal } : {}
   };
 }
+function canonicalProjectRoot(root) {
+  const missing = [];
+  let current = root;
+  for (;; ) {
+    try {
+      return path.join(fs.realpathSync.native(current), ...missing.reverse());
+    } catch (error) {
+      if (error.code !== "ENOENT")
+        throw error;
+      const parent = path.dirname(current);
+      if (parent === current)
+        return root;
+      missing.push(path.basename(current));
+      current = parent;
+    }
+  }
+}
 export function resolveMissionStoreLocation(input) {
-  const projectRoot = path.resolve(input.projectRoot);
+  const givenRoot = path.resolve(input.projectRoot);
+  const configuredDir = input.config?.directory;
+  const projectRoot = configuredDir ? givenRoot : canonicalProjectRoot(givenRoot);
   const agentDir = input.agentDir ?? getAgentDir();
-  const missionDir = input.config?.directory ? expandConfiguredPath(input.config.directory, projectRoot) : projectMissionDirectory(agentDir, projectRoot);
-  const globalIndexDir = input.config?.globalIndexDir ? expandConfiguredPath(input.config.globalIndexDir, projectRoot) : path.join(agentDir, "missions", "index");
+  const missionDir = configuredDir ? expandConfiguredPath(configuredDir, givenRoot) : projectMissionDirectory(agentDir, projectRoot);
+  const globalIndexDir = input.config?.globalIndexDir ? expandConfiguredPath(input.config.globalIndexDir, givenRoot) : path.join(agentDir, "missions", "index");
   return {
     projectRoot,
     missionDir,
@@ -526,7 +545,17 @@ export function listGlobalMissions(globalIndexDir) {
         const record = parseMissionRecord(JSON.parse(fs.readFileSync(entry.recordPath, "utf-8")), entry.recordPath);
         if (record.id !== entry.missionId)
           throw new Error(`record id '${record.id}' does not match index id '${entry.missionId}'`);
-        entries.push({ ...entry, stale: false });
+        const projection = {
+          ...entry,
+          title: record.title,
+          status: record.status,
+          updatedAt: record.updatedAt
+        };
+        delete projection.lastRunId;
+        const lastRunId = record.runs.at(-1)?.runId;
+        if (lastRunId)
+          projection.lastRunId = lastRunId;
+        entries.push({ ...projection, stale: false });
       } catch (error) {
         if (error.code === "ENOENT") {
           try {

package/extensions/dm-subagents/src/profiles/profiles.js

@@ -1,8 +1,10 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { validateOptionalMachine } from "../agents/agents.js";
 import { getPiSpawnCommand } from "../runs/shared/dm-spawn.js";
 import { findModelInfo, getSupportedThinkingLevels, splitKnownThinkingSuffix, toModelInfo } from "../shared/model-info.js";
+import { withSettingsFileLease } from "../shared/settings-file-lease.js";
 import { getAgentDir } from "../shared/utils.js";
 export const DEFAULT_PROVIDER_MODELS_MAX_AGE_DAYS = 7;
 function readJsonObjectFile(filePath) {
@@ -58,6 +60,9 @@ function validateSubagentProfile(filePath, parsed) {
     if (thinking !== undefined && thinking !== false && typeof thinking !== "string") {
       throw new Error(`Profile '${filePath}' has invalid thinking for '${name}'; expected a string or false.`);
     }
+    if (override.machine !== undefined && override.machine !== false) {
+      override.machine = validateOptionalMachine(override.machine, `Profile '${filePath}' has invalid machine for '${name}'`);
+    }
     if (override.fallbackModels !== undefined)
       throw new Error(`Profile '${filePath}' uses removed field fallbackModels for '${name}'; configure one model instead.`);
   }
@@ -329,21 +334,23 @@ export function readSubagentProfile(name) {
 export function applySubagentProfile(name) {
   const { filePath, profile } = readSubagentProfile(name);
   const settingsPath = getUserSettingsPath();
-  const settings = readSettingsFile(settingsPath);
-  const existing = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents) ? settings.subagents : {};
-  const agentOverrides = { ...profile.subagents.agentOverrides };
-  const existingOverrides = existing.agentOverrides && typeof existing.agentOverrides === "object" && !Array.isArray(existing.agentOverrides) ? existing.agentOverrides : {};
-  for (const [name, value] of Object.entries(existingOverrides)) {
-    const machine = value && typeof value === "object" && !Array.isArray(value) ? value.machine : undefined;
-    if (typeof machine === "string" && agentOverrides[name]?.machine === undefined)
-      agentOverrides[name] = { ...agentOverrides[name], machine };
-  }
-  settings.subagents = {
-    ...existing,
-    ...profile.subagents,
-    agentOverrides
-  };
-  writeJsonFile(settingsPath, settings);
+  withSettingsFileLease(settingsPath, () => {
+    const settings = readSettingsFile(settingsPath);
+    const existing = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents) ? settings.subagents : {};
+    const agentOverrides = { ...profile.subagents.agentOverrides };
+    const existingOverrides = existing.agentOverrides && typeof existing.agentOverrides === "object" && !Array.isArray(existing.agentOverrides) ? existing.agentOverrides : {};
+    for (const [name, value] of Object.entries(existingOverrides)) {
+      const machine = value && typeof value === "object" && !Array.isArray(value) ? value.machine : undefined;
+      if (typeof machine === "string" && agentOverrides[name]?.machine === undefined)
+        agentOverrides[name] = { ...agentOverrides[name], machine };
+    }
+    settings.subagents = {
+      ...existing,
+      ...profile.subagents,
+      agentOverrides
+    };
+    writeJsonFile(settingsPath, settings);
+  });
   return { filePath, settingsPath };
 }
 export function readProviderModelCatalog(provider) {