@duckmind/dm-windows-x64 0.60.6 → 0.60.8

package/extensions/dm-subagents/src/runs/shared/mcp-direct-tool-allowlist.js

@@ -1 +1,305 @@
-import{createHash as d}from"node:crypto";import*as V from"node:fs";import*as q from"node:os";import*as Z from"node:path";import*as X from"node:fs";import*as L from"node:os";import*as B from"node:path";import*as K from"node:os";import*as G from"node:path";function N(j){return j.trim().replace(/[^A-Za-z0-9._-]+/g,"-").replace(/^-+|-+$/g,"")||"unknown"}function m(j){let $=j?.env??process.env,A=j&&Object.hasOwn(j,"getuid")?j.getuid:process.getuid?.bind(process);if(typeof A==="function")return`uid-${A()}`;for(let Y of["USERNAME","USER","LOGNAME"]){let E=$[Y];if(E)return`user-${N(E)}`}let J=j&&Object.hasOwn(j,"userInfo")?j.userInfo:K.userInfo;try{let Y=J?.().username;if(Y)return`user-${N(Y)}`}catch{}let W=$.USERPROFILE??$.HOME;if(W)return`home-${N(W)}`;let Q=j&&Object.hasOwn(j,"homedir")?j.homedir:K.homedir;try{let Y=Q?.();if(Y)return`home-${N(Y)}`}catch{}return"shared"}var I=G.join(K.tmpdir(),`dm-subagents-${m()}`),Gj=G.join(I,"async-subagent-results"),Vj=G.join(I,"async-subagent-runs"),h=G.join(I,"chain-runs"),Mj=G.join(I,"artifacts");var u=".dm",k="@duckmind/dm-coding-agent",g="DM_SUBAGENTS_PI_CODING_AGENT_PACKAGE_ROOT";function w(j){return typeof j==="string"&&j.trim()?j:void 0}function b(j){if(!j)return;try{let $=JSON.parse(X.readFileSync(B.join(j,"package.json"),"utf-8"));if($.name!==k)return;return w($.piConfig?.configDir)}catch{return}}function o(j=process.argv[1],$=process.env[g]){let A=b($);if(A)return A;if(!j)return;try{let J=B.dirname(X.realpathSync(j));while(J!==B.dirname(J)){let W=b(J);if(W)return W;J=B.dirname(J)}}catch{}return}function p(j,$,A){return(j&&typeof j==="object"?w(j.CONFIG_DIR_NAME):void 0)??o($,A)??u}function x(){return p()}function S(j){return B.join(j,x())}function C(){let j=process.env.DM_CODING_AGENT_DIR;if(j==="~")return L.homedir();if(j?.startsWith("~/"))return B.join(L.homedir(),j.slice(2));return j||B.join(L.homedir(),x(),"agent")}var r=1,i=604800000,D=new Set(["read","bash","edit","write","grep","find","ls","mcp"]),v=Z.join(q.homedir(),".config","mcp","mcp.json"),P={cursor:[Z.join(q.homedir(),".cursor","mcp.json")],"claude-code":[Z.join(q.homedir(),".claude","mcp.json"),Z.join(q.homedir(),".claude.json"),Z.join(q.homedir(),".claude","claude_desktop_config.json")],"claude-desktop":[Z.join(q.homedir(),"Library","Application Support","Claude","claude_desktop_config.json")],codex:[Z.join(q.homedir(),".codex","config.json")],windsurf:[Z.join(q.homedir(),".windsurf","mcp.json")],vscode:[".vscode/mcp.json"]};function kj(j,$=process.cwd()){if(!j?.length)return[];try{let A=t($),J=l();if(!J)return[];return Wj(A,J,Xj(A.settings?.toolPrefix),j)}catch{return[]}}function l(){let j=Z.join(C(),"mcp-cache.json"),$;try{$=JSON.parse(V.readFileSync(j,"utf-8"))}catch{return null}if(!$||typeof $!=="object")return null;let A=$;if(A.version!==r||!A.servers||typeof A.servers!=="object"||Array.isArray(A.servers))return null;return A}function t(j){let $={mcpServers:{}};for(let A of s(j)){let J=a(A);if(!J)continue;$=jj($,$j(J,j))}return $}function s(j){let $=Z.join(C(),"mcp.json"),A=Z.resolve(j,".mcp.json"),J=Z.resolve(S(j),"mcp.json"),W=[];if(v!==$)W.push(v);if(W.push($),A!==$)W.push(A);if(J!==$&&J!==A)W.push(J);return W}function a(j){let $;try{$=JSON.parse(V.readFileSync(j,"utf-8"))}catch{return null}return e($)}function e(j){if(!j||typeof j!=="object"||Array.isArray(j))return{mcpServers:{}};let $=j,A=$.mcpServers??$["mcp-servers"]??{};return{mcpServers:A&&typeof A==="object"&&!Array.isArray(A)?A:{},imports:Array.isArray($.imports)?$.imports.filter((J)=>_j(J)):void 0,settings:$.settings&&typeof $.settings==="object"&&!Array.isArray($.settings)?$.settings:void 0}}function jj(j,$){let A=[...j.imports??[],...$.imports??[]];return{mcpServers:{...j.mcpServers,...$.mcpServers},imports:A.length?[...new Set(A)]:void 0,settings:$.settings?{...j.settings,...$.settings}:j.settings}}function $j(j,$){if(!j.imports?.length)return j;let A={};for(let J of j.imports){let W=Aj(J,$);if(!W)continue;let Q;try{Q=JSON.parse(V.readFileSync(W,"utf-8"))}catch{continue}for(let[Y,E]of Object.entries(Jj(Q,J)))if(!A[Y])A[Y]=E}return{imports:j.imports,settings:j.settings,mcpServers:{...A,...j.mcpServers}}}function Aj(j,$){for(let A of P[j]){let J=A.startsWith(".")?Z.resolve($,A):A;if(V.existsSync(J))return J}return null}function Jj(j,$){if(!j||typeof j!=="object"||Array.isArray(j))return{};let A=j,J=$==="cursor"||$==="windsurf"||$==="vscode"?A.mcpServers??A["mcp-servers"]:A.mcpServers;return J&&typeof J==="object"&&!Array.isArray(J)?J:{}}function Wj(j,$,A,J){let W=[],Q=new Set,{servers:Y,tools:E}=Zj(J);for(let[U,z]of Object.entries(j.mcpServers)){let M=$.servers[U];if(!Qj(M,z))continue;let H=Y.has(U)?!0:E.get(U);if(!H)continue;for(let _ of Array.isArray(M.tools)?M.tools:[]){if(typeof _?.name!=="string"||!_.name)continue;if(H!==!0&&!H.has(_.name))continue;if(c(_.name,U,A,z.excludeTools))continue;let T=R(_.name,U,A);if(D.has(T)||Q.has(T))continue;Q.add(T),W.push(T)}if(z.exposeResources===!1)continue;for(let _ of Array.isArray(M.resources)?M.resources:[]){if(typeof _?.name!=="string"||!_.name||typeof _.uri!=="string"||!_.uri)continue;let T=`get_${qj(_.name)}`;if(H!==!0&&!H.has(T))continue;if(c(T,U,A,z.excludeTools))continue;let F=R(T,U,A);if(D.has(F)||Q.has(F))continue;Q.add(F),W.push(F)}}return W}function Zj(j){let $=new Set,A=new Map;for(let J of j)if(J=J.replace(/\/+$/,""),J.includes("/")){let[W,Q]=J.split("/",2);if(W&&Q){if(!A.has(W))A.set(W,new Set);A.get(W).add(Q)}else if(W)$.add(W)}else if(J)$.add(J);return{servers:$,tools:A}}function Qj(j,$){if(!j||j.configHash!==Yj($))return!1;if(!j.cachedAt||typeof j.cachedAt!=="number")return!1;return Date.now()-j.cachedAt<=i}function Yj(j){let $={command:j.command,args:j.args,env:n(j.env),cwd:Tj(j.cwd),url:j.url,headers:n(j.headers),auth:j.auth,bearerToken:Uj(j),bearerTokenEnv:j.bearerTokenEnv,exposeResources:j.exposeResources,excludeTools:j.excludeTools};return d("sha256").update(y($)).digest("hex")}function Xj(j){return j==="none"||j==="short"||j==="server"?j:"server"}function _j(j){return typeof j==="string"&&Object.hasOwn(P,j)}function Bj(j,$){if($==="none")return"";if($==="short")return j.replace(/-?mcp$/i,"").replace(/-/g,"_")||"mcp";return j.replace(/-/g,"_")}function R(j,$,A){let J=Bj($,A);return J?`${J}_${j}`:j}function c(j,$,A,J){if(!Array.isArray(J)||J.length===0)return!1;let W=new Set([O(j),O(R(j,$,A)),O(R(j,$,"server")),O(R(j,$,"short"))]);return J.some((Q)=>typeof Q==="string"&&W.has(O(Q)))}function O(j){return j.replace(/-/g,"_")}function qj(j){let $=j.replace(/[^a-zA-Z0-9]/g,"_").replace(/_+/g,"_").replace(/^_+/,"").replace(/_+$/,"").toLowerCase();if(!$||/^\d/.test($))$=`resource${$?`_${$}`:""}`;return $}function n(j){if(!j||typeof j!=="object"||Array.isArray(j))return;let $={};for(let[A,J]of Object.entries(j))if(typeof J==="string")$[A]=f(J);return $}function f(j){return j.replace(/\$\{(\w+)\}/g,($,A)=>process.env[A]??"").replace(/\$env:(\w+)/g,($,A)=>process.env[A]??"")}function Tj(j){if(typeof j!=="string")return;let $=f(j);if($==="~")return q.homedir();if($.startsWith("~/")||$.startsWith("~\\"))return Z.join(q.homedir(),$.slice(2));return $}function Uj(j){if(typeof j.bearerToken==="string")return f(j.bearerToken);return typeof j.bearerTokenEnv==="string"?process.env[j.bearerTokenEnv]:void 0}function y(j){if(j===null||j===void 0||typeof j!=="object"){let A=JSON.stringify(j);return A===void 0?"undefined":A}if(Array.isArray(j))return`[${j.map((A)=>y(A)).join(",")}]`;let $=j;return`{${Object.keys($).sort().map((A)=>`${JSON.stringify(A)}:${y($[A])}`).join(",")}}`}export{kj as resolveMcpDirectToolNames,Yj as computeMcpServerHash};
+import { createHash } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { getAgentDir, getProjectConfigDir } from "../../shared/utils.js";
+const CACHE_VERSION = 1;
+const CACHE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
+const BUILTIN_TOOL_NAMES = new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
+const GENERIC_GLOBAL_CONFIG_PATH = path.join(os.homedir(), ".config", "mcp", "mcp.json");
+const IMPORT_PATHS = {
+  cursor: [path.join(os.homedir(), ".cursor", "mcp.json")],
+  "claude-code": [
+    path.join(os.homedir(), ".claude", "mcp.json"),
+    path.join(os.homedir(), ".claude.json"),
+    path.join(os.homedir(), ".claude", "claude_desktop_config.json")
+  ],
+  "claude-desktop": [path.join(os.homedir(), "Library", "Application Support", "Claude", "claude_desktop_config.json")],
+  codex: [path.join(os.homedir(), ".codex", "config.json")],
+  windsurf: [path.join(os.homedir(), ".windsurf", "mcp.json")],
+  vscode: [".vscode/mcp.json"]
+};
+export function resolveMcpDirectToolNames(mcpDirectTools, cwd = process.cwd()) {
+  if (!mcpDirectTools?.length)
+    return [];
+  try {
+    const config = loadMcpConfig(cwd);
+    const cache = loadMetadataCache();
+    if (!cache)
+      return [];
+    return resolveDirectToolNames(config, cache, getToolPrefix(config.settings?.toolPrefix), mcpDirectTools);
+  } catch {
+    return [];
+  }
+}
+function loadMetadataCache() {
+  const cachePath = path.join(getAgentDir(), "mcp-cache.json");
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(cachePath, "utf-8"));
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object")
+    return null;
+  const raw = parsed;
+  if (raw.version !== CACHE_VERSION || !raw.servers || typeof raw.servers !== "object" || Array.isArray(raw.servers)) {
+    return null;
+  }
+  return raw;
+}
+function loadMcpConfig(cwd) {
+  let config = { mcpServers: {} };
+  for (const sourcePath of getConfigPaths(cwd)) {
+    const loaded = readConfig(sourcePath);
+    if (!loaded)
+      continue;
+    config = mergeConfigs(config, expandImports(loaded, cwd));
+  }
+  return config;
+}
+function getConfigPaths(cwd) {
+  const piGlobalPath = path.join(getAgentDir(), "mcp.json");
+  const projectPath = path.resolve(cwd, ".mcp.json");
+  const projectPiPath = path.resolve(getProjectConfigDir(cwd), "mcp.json");
+  const sources = [];
+  if (GENERIC_GLOBAL_CONFIG_PATH !== piGlobalPath)
+    sources.push(GENERIC_GLOBAL_CONFIG_PATH);
+  sources.push(piGlobalPath);
+  if (projectPath !== piGlobalPath)
+    sources.push(projectPath);
+  if (projectPiPath !== piGlobalPath && projectPiPath !== projectPath)
+    sources.push(projectPiPath);
+  return sources;
+}
+function readConfig(configPath) {
+  let parsed;
+  try {
+    parsed = JSON.parse(fs.readFileSync(configPath, "utf-8"));
+  } catch {
+    return null;
+  }
+  return validateConfig(parsed);
+}
+function validateConfig(raw) {
+  if (!raw || typeof raw !== "object" || Array.isArray(raw))
+    return { mcpServers: {} };
+  const obj = raw;
+  const servers = obj.mcpServers ?? obj["mcp-servers"] ?? {};
+  return {
+    mcpServers: servers && typeof servers === "object" && !Array.isArray(servers) ? servers : {},
+    imports: Array.isArray(obj.imports) ? obj.imports.filter((value) => isImportKind(value)) : undefined,
+    settings: obj.settings && typeof obj.settings === "object" && !Array.isArray(obj.settings) ? obj.settings : undefined
+  };
+}
+function mergeConfigs(base, next) {
+  const imports = [...base.imports ?? [], ...next.imports ?? []];
+  return {
+    mcpServers: { ...base.mcpServers, ...next.mcpServers },
+    imports: imports.length ? [...new Set(imports)] : undefined,
+    settings: next.settings ? { ...base.settings, ...next.settings } : base.settings
+  };
+}
+function expandImports(config, cwd) {
+  if (!config.imports?.length)
+    return config;
+  const importedServers = {};
+  for (const importKind of config.imports) {
+    const importPath = resolveImportPath(importKind, cwd);
+    if (!importPath)
+      continue;
+    let imported;
+    try {
+      imported = JSON.parse(fs.readFileSync(importPath, "utf-8"));
+    } catch {
+      continue;
+    }
+    for (const [name, definition] of Object.entries(extractServers(imported, importKind))) {
+      if (!importedServers[name])
+        importedServers[name] = definition;
+    }
+  }
+  return {
+    imports: config.imports,
+    settings: config.settings,
+    mcpServers: { ...importedServers, ...config.mcpServers }
+  };
+}
+function resolveImportPath(importKind, cwd) {
+  for (const candidate of IMPORT_PATHS[importKind]) {
+    const fullPath = candidate.startsWith(".") ? path.resolve(cwd, candidate) : candidate;
+    if (fs.existsSync(fullPath))
+      return fullPath;
+  }
+  return null;
+}
+function extractServers(config, kind) {
+  if (!config || typeof config !== "object" || Array.isArray(config))
+    return {};
+  const obj = config;
+  const servers = kind === "cursor" || kind === "windsurf" || kind === "vscode" ? obj.mcpServers ?? obj["mcp-servers"] : obj.mcpServers;
+  return servers && typeof servers === "object" && !Array.isArray(servers) ? servers : {};
+}
+function resolveDirectToolNames(config, cache, prefix, envOverride) {
+  const names = [];
+  const seenNames = new Set;
+  const { servers: selectedServers, tools: selectedTools } = parseSelections(envOverride);
+  for (const [serverName, definition] of Object.entries(config.mcpServers)) {
+    const serverCache = cache.servers[serverName];
+    if (!isServerCacheValid(serverCache, definition))
+      continue;
+    const toolFilter = selectedServers.has(serverName) ? true : selectedTools.get(serverName);
+    if (!toolFilter)
+      continue;
+    for (const tool of Array.isArray(serverCache.tools) ? serverCache.tools : []) {
+      if (typeof tool?.name !== "string" || !tool.name)
+        continue;
+      if (toolFilter !== true && !toolFilter.has(tool.name))
+        continue;
+      if (isToolExcluded(tool.name, serverName, prefix, definition.excludeTools))
+        continue;
+      const prefixedName = formatToolName(tool.name, serverName, prefix);
+      if (BUILTIN_TOOL_NAMES.has(prefixedName) || seenNames.has(prefixedName))
+        continue;
+      seenNames.add(prefixedName);
+      names.push(prefixedName);
+    }
+    if (definition.exposeResources === false)
+      continue;
+    for (const resource of Array.isArray(serverCache.resources) ? serverCache.resources : []) {
+      if (typeof resource?.name !== "string" || !resource.name || typeof resource.uri !== "string" || !resource.uri)
+        continue;
+      const baseName = `get_${resourceNameToToolName(resource.name)}`;
+      if (toolFilter !== true && !toolFilter.has(baseName))
+        continue;
+      if (isToolExcluded(baseName, serverName, prefix, definition.excludeTools))
+        continue;
+      const prefixedName = formatToolName(baseName, serverName, prefix);
+      if (BUILTIN_TOOL_NAMES.has(prefixedName) || seenNames.has(prefixedName))
+        continue;
+      seenNames.add(prefixedName);
+      names.push(prefixedName);
+    }
+  }
+  return names;
+}
+function parseSelections(selections) {
+  const servers = new Set;
+  const tools = new Map;
+  for (let item of selections) {
+    item = item.replace(/\/+$/, "");
+    if (item.includes("/")) {
+      const [server, tool] = item.split("/", 2);
+      if (server && tool) {
+        if (!tools.has(server))
+          tools.set(server, new Set);
+        tools.get(server).add(tool);
+      } else if (server) {
+        servers.add(server);
+      }
+    } else if (item) {
+      servers.add(item);
+    }
+  }
+  return { servers, tools };
+}
+function isServerCacheValid(entry, definition) {
+  if (!entry || entry.configHash !== computeMcpServerHash(definition))
+    return false;
+  if (!entry.cachedAt || typeof entry.cachedAt !== "number")
+    return false;
+  return Date.now() - entry.cachedAt <= CACHE_MAX_AGE_MS;
+}
+export function computeMcpServerHash(definition) {
+  const identity = {
+    command: definition.command,
+    args: definition.args,
+    env: interpolateEnvRecord(definition.env),
+    cwd: resolveConfigPath(definition.cwd),
+    url: definition.url,
+    headers: interpolateEnvRecord(definition.headers),
+    auth: definition.auth,
+    bearerToken: resolveBearerToken(definition),
+    bearerTokenEnv: definition.bearerTokenEnv,
+    exposeResources: definition.exposeResources,
+    excludeTools: definition.excludeTools
+  };
+  return createHash("sha256").update(stableStringify(identity)).digest("hex");
+}
+function getToolPrefix(value) {
+  return value === "none" || value === "short" || value === "server" ? value : "server";
+}
+function isImportKind(value) {
+  return typeof value === "string" && Object.hasOwn(IMPORT_PATHS, value);
+}
+function getServerPrefix(serverName, mode) {
+  if (mode === "none")
+    return "";
+  if (mode === "short") {
+    const short = serverName.replace(/-?mcp$/i, "").replace(/-/g, "_");
+    return short || "mcp";
+  }
+  return serverName.replace(/-/g, "_");
+}
+function formatToolName(toolName, serverName, prefix) {
+  const serverPrefix = getServerPrefix(serverName, prefix);
+  return serverPrefix ? `${serverPrefix}_${toolName}` : toolName;
+}
+function isToolExcluded(toolName, serverName, prefix, excludeTools) {
+  if (!Array.isArray(excludeTools) || excludeTools.length === 0)
+    return false;
+  const candidates = new Set([
+    normalizeToolName(toolName),
+    normalizeToolName(formatToolName(toolName, serverName, prefix)),
+    normalizeToolName(formatToolName(toolName, serverName, "server")),
+    normalizeToolName(formatToolName(toolName, serverName, "short"))
+  ]);
+  return excludeTools.some((excluded) => typeof excluded === "string" && candidates.has(normalizeToolName(excluded)));
+}
+function normalizeToolName(value) {
+  return value.replace(/-/g, "_");
+}
+function resourceNameToToolName(name) {
+  let result = name.replace(/[^a-zA-Z0-9]/g, "_").replace(/_+/g, "_").replace(/^_+/, "").replace(/_+$/, "").toLowerCase();
+  if (!result || /^\d/.test(result))
+    result = `resource${result ? `_${result}` : ""}`;
+  return result;
+}
+function interpolateEnvRecord(values) {
+  if (!values || typeof values !== "object" || Array.isArray(values))
+    return;
+  const resolved = {};
+  for (const [key, value] of Object.entries(values)) {
+    if (typeof value === "string")
+      resolved[key] = interpolateEnvVars(value);
+  }
+  return resolved;
+}
+function interpolateEnvVars(value) {
+  return value.replace(/\$\{(\w+)\}/g, (_, name) => process.env[name] ?? "").replace(/\$env:(\w+)/g, (_, name) => process.env[name] ?? "");
+}
+function resolveConfigPath(value) {
+  if (typeof value !== "string")
+    return;
+  const resolved = interpolateEnvVars(value);
+  if (resolved === "~")
+    return os.homedir();
+  if (resolved.startsWith("~/") || resolved.startsWith("~\\"))
+    return path.join(os.homedir(), resolved.slice(2));
+  return resolved;
+}
+function resolveBearerToken(definition) {
+  if (typeof definition.bearerToken === "string")
+    return interpolateEnvVars(definition.bearerToken);
+  return typeof definition.bearerTokenEnv === "string" ? process.env[definition.bearerTokenEnv] : undefined;
+}
+function stableStringify(value) {
+  if (value === null || value === undefined || typeof value !== "object") {
+    const serialized = JSON.stringify(value);
+    return serialized === undefined ? "undefined" : serialized;
+  }
+  if (Array.isArray(value))
+    return `[${value.map((entry) => stableStringify(entry)).join(",")}]`;
+  const obj = value;
+  return `{${Object.keys(obj).sort().map((key) => `${JSON.stringify(key)}:${stableStringify(obj[key])}`).join(",")}}`;
+}

package/extensions/dm-subagents/src/runs/shared/model-fallback.js

@@ -1 +1,194 @@
-var N=["off","minimal","low","medium","high","xhigh"];function G(j){let J=j.lastIndexOf(":");if(J===-1)return{baseModel:j,thinkingSuffix:""};let Q=N.find((X)=>X===j.substring(J+1));if(!Q)return{baseModel:j,thinkingSuffix:""};return{baseModel:j.substring(0,J),thinkingSuffix:`:${Q}`}}function H(j){return G(j).baseModel}function q(j){let J=j.replace(/[.+^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*");return new RegExp(`^${J}$`,"i")}function E(j,J){return q(J).test(H(j))}function A(j,J,Q){if(!j||!J?.enforce)return;let X=J.allow;if(!X||X.length===0)return;if(X.some((F)=>E(j,F)))return;let Z=H(j);return{model:Z,severity:Q==="explicit"?"error":"warn",allowedPatterns:X,message:`Model '${Z}' is outside the configured subagent model scope. Allowed patterns: ${X.join(", ")}.`}}function T(j){let J=j.lastIndexOf(":");if(J===-1)return{baseModel:j,thinkingSuffix:""};return{baseModel:j.substring(0,J),thinkingSuffix:j.substring(J)}}var k="inherit";function W(j){return j.toLowerCase().replace(/[._]+/g,"-").replace(/-+/g,"-").replace(/^-|-$/g,"")}function z(j,J,Q){let X=Number(j),Z=Number(J),$=Number(Q);return X>=1900&&X<=2099&&Z>=1&&Z<=12&&$>=1&&$<=31}function V(j){let J=/^(.*)-(\d{4})-(\d{2})-(\d{2})$/.exec(j);if(J&&z(J[2],J[3],J[4]))return J[1];let Q=/^(.*)-(\d{4})(\d{2})(\d{2})$/.exec(j);if(Q&&z(Q[2],Q[3],Q[4]))return Q[1];return j}function K(j,J,Q){if(j.includes("/")){let X=J.find((Z)=>Z.fullId===j);if(X)return X.fullId}else{let X=J.filter((Z)=>Z.id===j);if(Q){let Z=X.find(($)=>$.provider===Q);if(Z)return Z.fullId}if(X.length===1)return X[0].fullId}return S(j,J,Q)}function S(j,J,Q){let X,Z=j,$=j.indexOf("/");if($!==-1)X=W(j.slice(0,$)),Z=j.slice($+1);else{let O=[":","."];for(let U of O){let D=j.indexOf(U);if(D<=0)continue;let B=W(j.slice(0,D));if(!J.some((L)=>W(L.provider)===B))continue;X=B,Z=j.slice(D+1);break}}let F=W(Z),C=V(F),Y=J.filter((O)=>{let U=W(O.id);if(U!==F&&V(U)!==C)return!1;if(X!==void 0&&W(O.provider)!==X)return!1;return!0});if(Y.length===0)return;if(Q){let O=W(Q),U=Y.find((D)=>W(D.provider)===O);if(U)return U.fullId}if(Y.length===1)return Y[0].fullId;return}function _(j,J,Q){if(!j)return;if(!J||J.length===0)return j;let X=K(j,J,Q);if(X)return X;let{baseModel:Z,thinkingSuffix:$}=T(j);if(!$)return j;let F=K(Z,J,Q);if(F)return`${F}${$}`;return j}function R(j){console.warn(`[dm-subagents] ${j.message}`)}function h(j,J,Q,X,Z){let $=typeof j==="string"?j.trim():"",F=$&&$!==k?$:void 0,C;if(F===void 0)C=J?`${J.provider}/${J.id}`:void 0;else C=_(F,Q,X);if(C&&Z?.scope?.enforce){let Y=F===void 0?"inherited":Z.source??"inherited",O=A(C,Z.scope,Y);if(O){if(O.severity==="error")throw Error(O.message);(Z.onWarn??R)(O)}}return C}function y(j,J,Q,X,Z){let $=new Set,F=[],C=[j,...J??[]];for(let Y=0;Y<C.length;Y++){let O=C[Y];if(!O)continue;let U=_(O.trim(),Q,X);if(!U||$.has(U))continue;if(Y>0&&Z?.scope?.enforce){let D=A(U,Z.scope,"inherited");if(D)(Z.onWarn??R)(D)}$.add(U),F.push(U)}return F}var w=[/rate\s*limit/i,/too many requests/i,/\b429\b/,/quota/i,/billing/i,/credit/i,/auth(?:entication)?/i,/unauthori[sz]ed/i,/forbidden/i,/api key/i,/token expired/i,/invalid key/i,/provider.*unavailable/i,/model.*unavailable/i,/model.*disabled/i,/model.*not found/i,/unknown model/i,/overloaded/i,/service unavailable/i,/temporar(?:ily)? unavailable/i,/connection refused/i,/fetch failed/i,/network error/i,/socket hang up/i,/upstream/i,/timed? out/i,/timeout/i,/\b502\b/,/\b503\b/,/\b504\b/,/cold.?start/i,/empty response/i,/no output/i,/model.*(?:load|fail|error)/i];function u(j){if(!j)return!1;return w.some((J)=>J.test(j))}function b(j,J){let Q=j.error?.trim()||`exit ${j.exitCode??1}`;return J?`[fallback] ${j.model} failed: ${Q}. Retrying with ${J}.`:`[fallback] ${j.model} failed: ${Q}.`}export{T as splitThinkingSuffix,h as resolveSubagentModelOverride,_ as resolveModelCandidate,W as normalizeModelSegment,u as isRetryableModelFailure,S as fuzzyResolveModel,b as formatModelAttemptNote,y as buildModelCandidates,k as INHERIT_MODEL};
+import { checkModelScope } from "./model-scope.js";
+export function splitThinkingSuffix(model) {
+  const colonIdx = model.lastIndexOf(":");
+  if (colonIdx === -1)
+    return { baseModel: model, thinkingSuffix: "" };
+  return {
+    baseModel: model.substring(0, colonIdx),
+    thinkingSuffix: model.substring(colonIdx)
+  };
+}
+export const INHERIT_MODEL = "inherit";
+export function normalizeModelSegment(segment) {
+  return segment.toLowerCase().replace(/[._]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+}
+function isPlausibleDateStamp(year, month, day) {
+  const yyyy = Number(year);
+  const mm = Number(month);
+  const dd = Number(day);
+  return yyyy >= 1900 && yyyy <= 2099 && mm >= 1 && mm <= 12 && dd >= 1 && dd <= 31;
+}
+function stripTrailingDateStamp(segment) {
+  const dashed = /^(.*)-(\d{4})-(\d{2})-(\d{2})$/.exec(segment);
+  if (dashed && isPlausibleDateStamp(dashed[2], dashed[3], dashed[4]))
+    return dashed[1];
+  const compact = /^(.*)-(\d{4})(\d{2})(\d{2})$/.exec(segment);
+  if (compact && isPlausibleDateStamp(compact[2], compact[3], compact[4]))
+    return compact[1];
+  return segment;
+}
+function resolveBaseModelCandidate(baseModel, availableModels, preferredProvider) {
+  if (baseModel.includes("/")) {
+    const exact = availableModels.find((entry) => entry.fullId === baseModel);
+    if (exact)
+      return exact.fullId;
+  } else {
+    const exactMatches = availableModels.filter((entry) => entry.id === baseModel);
+    if (preferredProvider) {
+      const preferredMatch = exactMatches.find((entry) => entry.provider === preferredProvider);
+      if (preferredMatch)
+        return preferredMatch.fullId;
+    }
+    if (exactMatches.length === 1)
+      return exactMatches[0].fullId;
+  }
+  return fuzzyResolveModel(baseModel, availableModels, preferredProvider);
+}
+export function fuzzyResolveModel(baseModel, availableModels, preferredProvider) {
+  let queryProvider;
+  let queryIdRaw = baseModel;
+  const slashIdx = baseModel.indexOf("/");
+  if (slashIdx !== -1) {
+    queryProvider = normalizeModelSegment(baseModel.slice(0, slashIdx));
+    queryIdRaw = baseModel.slice(slashIdx + 1);
+  } else {
+    const providerSeparators = [":", "."];
+    for (const separator of providerSeparators) {
+      const separatorIdx = baseModel.indexOf(separator);
+      if (separatorIdx <= 0)
+        continue;
+      const providerPart = normalizeModelSegment(baseModel.slice(0, separatorIdx));
+      if (!availableModels.some((entry) => normalizeModelSegment(entry.provider) === providerPart))
+        continue;
+      queryProvider = providerPart;
+      queryIdRaw = baseModel.slice(separatorIdx + 1);
+      break;
+    }
+  }
+  const queryId = normalizeModelSegment(queryIdRaw);
+  const queryIdNoDate = stripTrailingDateStamp(queryId);
+  const candidates = availableModels.filter((entry) => {
+    const entryId = normalizeModelSegment(entry.id);
+    if (entryId !== queryId && stripTrailingDateStamp(entryId) !== queryIdNoDate)
+      return false;
+    if (queryProvider !== undefined && normalizeModelSegment(entry.provider) !== queryProvider)
+      return false;
+    return true;
+  });
+  if (candidates.length === 0)
+    return;
+  if (preferredProvider) {
+    const preferredProviderNorm = normalizeModelSegment(preferredProvider);
+    const preferred = candidates.find((entry) => normalizeModelSegment(entry.provider) === preferredProviderNorm);
+    if (preferred)
+      return preferred.fullId;
+  }
+  if (candidates.length === 1)
+    return candidates[0].fullId;
+  return;
+}
+export function resolveModelCandidate(model, availableModels, preferredProvider) {
+  if (!model)
+    return;
+  if (!availableModels || availableModels.length === 0)
+    return model;
+  const resolvedWhole = resolveBaseModelCandidate(model, availableModels, preferredProvider);
+  if (resolvedWhole)
+    return resolvedWhole;
+  const { baseModel, thinkingSuffix } = splitThinkingSuffix(model);
+  if (!thinkingSuffix)
+    return model;
+  const resolvedBase = resolveBaseModelCandidate(baseModel, availableModels, preferredProvider);
+  if (resolvedBase)
+    return `${resolvedBase}${thinkingSuffix}`;
+  return model;
+}
+function defaultScopeWarn(violation) {
+  console.warn(`[dm-subagents] ${violation.message}`);
+}
+export function resolveSubagentModelOverride(requestedModel, parentModel, availableModels, preferredProvider, options) {
+  const trimmed = typeof requestedModel === "string" ? requestedModel.trim() : "";
+  const explicit = trimmed && trimmed !== INHERIT_MODEL ? trimmed : undefined;
+  let resolved;
+  if (explicit === undefined) {
+    resolved = parentModel ? `${parentModel.provider}/${parentModel.id}` : undefined;
+  } else {
+    resolved = resolveModelCandidate(explicit, availableModels, preferredProvider);
+  }
+  if (resolved && options?.scope?.enforce) {
+    const source = explicit === undefined ? "inherited" : options.source ?? "inherited";
+    const violation = checkModelScope(resolved, options.scope, source);
+    if (violation) {
+      if (violation.severity === "error")
+        throw new Error(violation.message);
+      (options.onWarn ?? defaultScopeWarn)(violation);
+    }
+  }
+  return resolved;
+}
+export function buildModelCandidates(primaryModel, fallbackModels, availableModels, preferredProvider, options) {
+  const seen = new Set;
+  const candidates = [];
+  const rawCandidates = [primaryModel, ...fallbackModels ?? []];
+  for (let index = 0;index < rawCandidates.length; index++) {
+    const raw = rawCandidates[index];
+    if (!raw)
+      continue;
+    const normalized = resolveModelCandidate(raw.trim(), availableModels, preferredProvider);
+    if (!normalized || seen.has(normalized))
+      continue;
+    if (index > 0 && options?.scope?.enforce) {
+      const violation = checkModelScope(normalized, options.scope, "inherited");
+      if (violation)
+        (options.onWarn ?? defaultScopeWarn)(violation);
+    }
+    seen.add(normalized);
+    candidates.push(normalized);
+  }
+  return candidates;
+}
+const RETRYABLE_MODEL_FAILURE_PATTERNS = [
+  /rate\s*limit/i,
+  /too many requests/i,
+  /\b429\b/,
+  /quota/i,
+  /billing/i,
+  /credit/i,
+  /auth(?:entication)?/i,
+  /unauthori[sz]ed/i,
+  /forbidden/i,
+  /api key/i,
+  /token expired/i,
+  /invalid key/i,
+  /provider.*unavailable/i,
+  /model.*unavailable/i,
+  /model.*disabled/i,
+  /model.*not found/i,
+  /unknown model/i,
+  /overloaded/i,
+  /service unavailable/i,
+  /temporar(?:ily)? unavailable/i,
+  /connection refused/i,
+  /fetch failed/i,
+  /network error/i,
+  /socket hang up/i,
+  /upstream/i,
+  /timed? out/i,
+  /timeout/i,
+  /\b502\b/,
+  /\b503\b/,
+  /\b504\b/,
+  /cold.?start/i,
+  /empty response/i,
+  /no output/i,
+  /model.*(?:load|fail|error)/i
+];
+export function isRetryableModelFailure(error) {
+  if (!error)
+    return false;
+  return RETRYABLE_MODEL_FAILURE_PATTERNS.some((pattern) => pattern.test(error));
+}
+export function formatModelAttemptNote(attempt, nextModel) {
+  const failure = attempt.error?.trim() || `exit ${attempt.exitCode ?? 1}`;
+  return nextModel ? `[fallback] ${attempt.model} failed: ${failure}. Retrying with ${nextModel}.` : `[fallback] ${attempt.model} failed: ${failure}.`;
+}

package/extensions/dm-subagents/src/runs/shared/model-scope.js

@@ -1 +1,65 @@
-var Q=["off","minimal","low","medium","high","xhigh"];function J(j){let q=j.lastIndexOf(":");if(q===-1)return{baseModel:j,thinkingSuffix:""};let B=Q.find((A)=>A===j.substring(q+1));if(!B)return{baseModel:j,thinkingSuffix:""};return{baseModel:j.substring(0,q),thinkingSuffix:`:${B}`}}function O(j){return J(j).baseModel}function U(j){let q=j.replace(/[.+^${}()|[\]\\]/g,"\\$&").replace(/\*/g,".*");return new RegExp(`^${q}$`,"i")}function W(j,q){return U(q).test(O(j))}function Z(j,q,B){if(!j||!q?.enforce)return;let A=q.allow;if(!A||A.length===0)return;if(A.some((D)=>W(j,D)))return;let C=O(j);return{model:C,severity:B==="explicit"?"error":"warn",allowedPatterns:A,message:`Model '${C}' is outside the configured subagent model scope. Allowed patterns: ${A.join(", ")}.`}}function $(j,q){if(j===void 0)return;if(!j||typeof j!=="object"||Array.isArray(j))throw Error(`Subagent settings in '${q.filePath}' have invalid 'modelScope'; expected an object.`);let B=j,A={};if("enforce"in B){if(typeof B.enforce!=="boolean")throw Error(`Subagent settings in '${q.filePath}' have invalid 'modelScope.enforce'; expected a boolean.`);A.enforce=B.enforce}if("allow"in B){if(!Array.isArray(B.allow))throw Error(`Subagent settings in '${q.filePath}' have invalid 'modelScope.allow'; expected an array of strings.`);let C=[];for(let F of B.allow){if(typeof F!=="string")throw Error(`Subagent settings in '${q.filePath}' have invalid 'modelScope.allow'; expected an array of strings.`);let D=F.trim();if(D)C.push(D)}if(C.length===0)throw Error(`Subagent settings in '${q.filePath}' have invalid 'modelScope.allow'; expected a non-empty array of patterns.`);A.allow=C}if(A.enforce===!0&&(!A.allow||A.allow.length===0))throw Error(`Subagent settings in '${q.filePath}' set modelScope.enforce without a non-empty 'allow' list; supply allowed model patterns or disable enforcement.`);return Object.keys(A).length>0?A:void 0}export{$ as parseModelScopeConfig,W as matchesScopePattern,Z as checkModelScope};
+import { splitKnownThinkingSuffix } from "../../shared/model-info.js";
+function stripThinkingSuffix(model) {
+  return splitKnownThinkingSuffix(model).baseModel;
+}
+function globToRegExp(pattern) {
+  const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+  return new RegExp(`^${escaped}$`, "i");
+}
+export function matchesScopePattern(model, pattern) {
+  return globToRegExp(pattern).test(stripThinkingSuffix(model));
+}
+export function checkModelScope(model, scope, source) {
+  if (!model || !scope?.enforce)
+    return;
+  const allow = scope.allow;
+  if (!allow || allow.length === 0)
+    return;
+  if (allow.some((pattern) => matchesScopePattern(model, pattern)))
+    return;
+  const baseModel = stripThinkingSuffix(model);
+  const severity = source === "explicit" ? "error" : "warn";
+  return {
+    model: baseModel,
+    severity,
+    allowedPatterns: allow,
+    message: `Model '${baseModel}' is outside the configured subagent model scope. ` + `Allowed patterns: ${allow.join(", ")}.`
+  };
+}
+export function parseModelScopeConfig(value, meta) {
+  if (value === undefined)
+    return;
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error(`Subagent settings in '${meta.filePath}' have invalid 'modelScope'; expected an object.`);
+  }
+  const input = value;
+  const config = {};
+  if ("enforce" in input) {
+    if (typeof input.enforce !== "boolean") {
+      throw new Error(`Subagent settings in '${meta.filePath}' have invalid 'modelScope.enforce'; expected a boolean.`);
+    }
+    config.enforce = input.enforce;
+  }
+  if ("allow" in input) {
+    if (!Array.isArray(input.allow)) {
+      throw new Error(`Subagent settings in '${meta.filePath}' have invalid 'modelScope.allow'; expected an array of strings.`);
+    }
+    const allow = [];
+    for (const entry of input.allow) {
+      if (typeof entry !== "string") {
+        throw new Error(`Subagent settings in '${meta.filePath}' have invalid 'modelScope.allow'; expected an array of strings.`);
+      }
+      const trimmed = entry.trim();
+      if (trimmed)
+        allow.push(trimmed);
+    }
+    if (allow.length === 0) {
+      throw new Error(`Subagent settings in '${meta.filePath}' have invalid 'modelScope.allow'; expected a non-empty array of patterns.`);
+    }
+    config.allow = allow;
+  }
+  if (config.enforce === true && (!config.allow || config.allow.length === 0)) {
+    throw new Error(`Subagent settings in '${meta.filePath}' set modelScope.enforce without a non-empty 'allow' list; supply allowed model patterns or disable enforcement.`);
+  }
+  return Object.keys(config).length > 0 ? config : undefined;
+}