@duckmind/dm-darwin-x64 0.66.5 → 0.66.7

package/extensions/dm-mcp-adapter/direct-tool-surface.js

@@ -12,7 +12,7 @@ export function getLargeDirectToolsAdvisory(config, specs) {
   const eagerCount = specs.filter((spec) => !spec.lazy).length;
   if (eagerCount < DIRECT_TOOLS_ADVISORY_THRESHOLD)
     return;
-  return `MCP: ${eagerCount} direct tools resolved. Each direct tool adds prompt context; README guidance recommends targeted sets of 5-20 tools and using the proxy or an explicit string[] when 75+ direct tools would be registered. Set settings.warnOnLargeDirectTools to false to hide this advisory.`;
+  return `MCP: ${eagerCount} direct tools resolved. Each direct tool adds prompt context; the direct tools guide in docs/tools.md recommends targeted sets of 5-20 tools and using the proxy or an explicit string[] when 75+ direct tools would be registered. Set settings.warnOnLargeDirectTools to false to hide this advisory.`;
 }
 export function prepareDirectToolArguments(inputSchema, args) {
   if (!inputSchema || typeof inputSchema !== "object" || Array.isArray(inputSchema))
@@ -61,6 +61,7 @@ export function resolveDirectTools(config, cache, prefix, envOverride, unavailab
     return specs;
   const envSelection = envOverride ? parseDirectToolSelectors(envOverride) : null;
   const globalDirect = config.settings?.directTools;
+  let selectorCandidateIndex;
   for (const [serverName, definition] of Object.entries(config.mcpServers)) {
     if (isServerDisabled(definition))
       continue;
@@ -88,7 +89,7 @@ export function resolveDirectTools(config, cache, prefix, envOverride, unavailab
       continue;
     const effectivePrefix = resolveToolPrefix(definition, prefix);
     const hasToolFilters = Array.isArray(definition.includeTools) && definition.includeTools.length > 0 || Array.isArray(definition.excludeTools) && definition.excludeTools.length > 0;
-    const selectorCandidateIndex = hasToolFilters ? (() => {
+    if (hasToolFilters && !selectorCandidateIndex) {
       const candidates = new Set;
       for (const [otherServerName, otherDefinition] of Object.entries(config.mcpServers)) {
         const otherCache = cache.servers[otherServerName];
@@ -109,8 +110,8 @@ export function resolveDirectTools(config, cache, prefix, envOverride, unavailab
           }
         }
       }
-      return createToolSelectorCandidateIndex(candidates);
-    })() : undefined;
+      selectorCandidateIndex = createToolSelectorCandidateIndex(candidates);
+    }
     for (const tool of serverCache.tools ?? []) {
       if (!isUiToolVisibleToModel(tool.uiVisibility))
         continue;
@@ -167,8 +168,9 @@ export function resolveDirectTools(config, cache, prefix, envOverride, unavailab
   const emittedSpecs = unavailableServers.size === 0 ? uniqueSpecs : uniqueSpecs.filter((spec) => !unavailableServers.has(spec.serverName));
   return emittedSpecs;
 }
-export function buildProxyDescription(config) {
-  let desc = `MCP gateway — URL installation, server status, tool search/describe, auth, and single MCP tool calls. When a user supplies an MCP endpoint URL, install it with the install action. When one request needs several MCP calls with logic between them, use mcpScript. Non-MCP DM tools should be called directly, not through mcp.
+export function buildProxyDescription(config, scriptTool = false) {
+  const scriptHint = scriptTool ? " Use mcpScript for several MCP calls with logic between them." : "";
+  let desc = `MCP gateway — URL installation, server status, tool search/describe, auth, and single MCP tool calls. When a user supplies an MCP endpoint URL, install it with the install action.${scriptHint} Non-MCP DM tools should be called directly, not through mcp.
 `;
   const serverNames = Object.keys(config.mcpServers).filter((serverName) => !isServerDisabled(config.mcpServers[serverName]));
   if (serverNames.length > 0) {
@@ -183,13 +185,13 @@ Servers: ${serverNames.join(", ")}
   });
   if (searchModeServers.length > 0) {
     desc += `
-Search-mode servers (${searchModeServers.join(", ")}): their tools become real, schema-backed tools the first time mcp({ search }) matches them — after that, call them directly by name.
+Search-mode servers (${searchModeServers.join(", ")}): their tools become real, schema-backed tools the first time mcp({ search }) matches them or mcp({ tool }) calls them — after that, call them directly by name.
 `;
   }
   const disabledServers = Object.entries(config.mcpServers).filter(([, definition]) => isServerDisabled(definition)).map(([serverName]) => serverName);
   if (disabledServers.length > 0) {
     desc += `
-Disabled servers (enable with /mcp enable <server> and /reload): ${disabledServers.join(", ")}
+Disabled servers (enable with /mcp-adapter enable <server> and /reload): ${disabledServers.join(", ")}
 `;
   }
   desc += `

package/extensions/dm-mcp-adapter/direct-tools.js

@@ -1,16 +1,20 @@
 import { UrlElicitationRequiredError } from "@modelcontextprotocol/client";
-import { lazyConnect, getFailureAgeSeconds, clearFailure } from "./init.js";
+import { disabledServerReason } from "./project-server-trust.js";
+import { lazyConnect, clearFailure } from "./init.js";
+import { describeFailure } from "./failure-backoff.js";
 import { abortable, throwIfAborted } from "./abort.js";
 import { formatSchema } from "./tool-metadata.js";
 import { resolveMcpResultContent, transformMcpResourceContents } from "./tool-registrar.js";
-import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.js";
+import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions, scriptPipeHint } from "./mcp-output-guard.js";
 import { maybeStartUiSession, summarizeUiSessionResult } from "./ui-session.js";
 import { isServerDisabled } from "./types.js";
 import { authenticate, supportsOAuth } from "./mcp-auth-flow.js";
-import { formatAuthRequiredMessage, normalizeToolArguments, resolveServerUrl } from "./utils.js";
+import { formatAuthRequiredMessage, normalizeToolArguments, resolveServerUrl, withToolCallIdMeta } from "./utils.js";
 import { SessionRecoveryAuthRequiredError, withSessionRecovery } from "./session-recovery.js";
 import { combineAbortSignals, isAbortError } from "./runtime-owner.js";
 import { callToolViaTaskSession } from "./mcp-tasks.js";
+import { callToolPausingForElicitation } from "./elicitation-handler.js";
+import { observedOutputRecorder } from "./output-shape.js";
 import { ensureToolCallApproved } from "./tool-approval.js";
 import { getInputRequiredNeedsUiDetails } from "./errors.js";
 export {
@@ -76,8 +80,9 @@ async function attemptDirectAutoAuth(state, serverName, signal) {
     };
   }
 }
-export function createDirectToolExecutor(getState, getInitPromise, spec) {
-  return async function execute(_toolCallId, params, signal) {
+export function createDirectToolExecutor(getState, getInitPromise, spec, structured = false) {
+  const structuredContentOf = (result) => structured && result.structuredContent !== undefined ? { structuredContent: result.structuredContent } : {};
+  return async function execute(toolCallId, params, signal) {
     throwIfAborted(signal);
     let state = getState();
     const initPromise = getInitPromise();
@@ -100,7 +105,7 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
     }
     const definition = state.config.mcpServers[spec.serverName];
     if (isServerDisabled(definition)) {
-      const message = `MCP server "${spec.serverName}" is disabled. Run /mcp enable ${spec.serverName} and /reload to enable it.`;
+      const message = `MCP server "${spec.serverName}" is ${disabledServerReason(state.blockedProjectServers, spec.serverName)}`;
       return {
         content: [{ type: "text", text: message }],
         details: { error: "server_disabled", server: spec.serverName, message }
@@ -134,9 +139,9 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
           details: { error: "auth_required", server: spec.serverName, message, autoAuthAttempted }
         };
       }
-      const failedAgo = getFailureAgeSeconds(state, spec.serverName);
+      const failure = describeFailure(state, spec.serverName);
       return {
-        content: [{ type: "text", text: `MCP server "${spec.serverName}" not available${failedAgo !== null ? ` (failed ${failedAgo}s ago)` : ""}` }],
+        content: [{ type: "text", text: `MCP server "${spec.serverName}" not available${failure !== null ? ` (${failure})` : ""}` }],
         details: { error: "server_unavailable", server: spec.serverName }
       };
     }
@@ -148,27 +153,7 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
       };
     }
     const normalizedParams = spec.resourceUri ? params : normalizeToolArguments(params);
-    const approval = await ensureToolCallApproved(state, spec.serverName, {
-      name: spec.prefixedName,
-      originalName: spec.originalName,
-      description: spec.description,
-      ...spec.inputSchema !== undefined ? { inputSchema: spec.inputSchema } : {},
-      ...spec.resourceUri !== undefined ? { resourceUri: spec.resourceUri } : {},
-      ...spec.uiResourceUri !== undefined ? { uiResourceUri: spec.uiResourceUri } : {},
-      ...spec.uiStreamMode !== undefined ? { uiStreamMode: spec.uiStreamMode } : {}
-    }, normalizedParams, ownedSignal, spec.resourceUri ? "resource" : "direct");
-    if (approval.ok === false) {
-      const denied = approval.reason === "denied";
-      const message = denied ? `The user declined approval to run MCP tool "${spec.originalName}" on server "${spec.serverName}".` : `MCP tool "${spec.originalName}" on server "${spec.serverName}" is approval-gated and requires an interactive session.`;
-      return {
-        content: [{ type: "text", text: message }],
-        details: {
-          error: denied ? "approval_denied" : "approval_required",
-          server: spec.serverName,
-          tool: spec.originalName
-        }
-      };
-    }
+    const annotations = spec.resourceUri ? undefined : state.toolMetadata.get(spec.serverName)?.find((tool) => !tool.resourceUri && tool.originalName === spec.originalName)?.annotations;
     let uiSession = null;
     const requestOptions = state.manager.getRequestOptions?.(spec.serverName, ownedSignal) ?? (ownedSignal ? { signal: ownedSignal } : undefined);
     const outputGuardOptions = resolveMcpOutputGuardOptions(state.config.settings);
@@ -196,9 +181,32 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
       }
       return state.manager.getConnection(spec.serverName);
     };
+    let approval;
     try {
       state.manager.touch(spec.serverName);
       state.manager.incrementInFlight(spec.serverName);
+      approval = await ensureToolCallApproved(state, spec.serverName, {
+        name: spec.prefixedName,
+        originalName: spec.originalName,
+        description: spec.description,
+        ...spec.inputSchema !== undefined ? { inputSchema: spec.inputSchema } : {},
+        ...spec.resourceUri !== undefined ? { resourceUri: spec.resourceUri } : {},
+        ...spec.uiResourceUri !== undefined ? { uiResourceUri: spec.uiResourceUri } : {},
+        ...spec.uiStreamMode !== undefined ? { uiStreamMode: spec.uiStreamMode } : {},
+        ...annotations !== undefined ? { annotations } : {}
+      }, normalizedParams, ownedSignal, spec.resourceUri ? "resource" : "direct");
+      if (approval.ok === false) {
+        const denied = approval.reason === "denied";
+        const message = denied ? `The user declined approval to run MCP tool "${spec.originalName}" on server "${spec.serverName}".` : `MCP tool "${spec.originalName}" on server "${spec.serverName}" is approval-gated and requires an interactive session.`;
+        return {
+          content: [{ type: "text", text: message }],
+          details: {
+            error: denied ? "approval_denied" : "approval_required",
+            server: spec.serverName,
+            tool: spec.originalName
+          }
+        };
+      }
       if (spec.resourceUri) {
         const result = await withSessionRecovery({
           manager: state.manager,
@@ -219,7 +227,7 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
           details: { server: spec.serverName, resourceUri: spec.resourceUri, ...guardedMcpDetails(guarded) }
         };
       }
-      const hasUi = !!spec.uiResourceUri;
+      const hasUi = !!spec.uiResourceUri && state.config.mcpServers[spec.serverName]?.openUi !== false;
       uiSession = hasUi ? await maybeStartUiSession(state, {
         serverName: spec.serverName,
         toolName: spec.originalName,
@@ -229,6 +237,8 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
         ...signal ? { signal } : {},
         onNeedsAuth: recoverAuthConnection
       }) : null;
+      const requestMeta = withToolCallIdMeta(uiSession?.requestMeta, toolCallId);
+      const recordOutput = observedOutputRecorder(state, spec.serverName, spec.originalName);
       const result = await withSessionRecovery({
         manager: state.manager,
         config: state.config,
@@ -240,18 +250,20 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
           return await callToolViaTaskSession(conn.taskSession, {
             name: spec.originalName,
             args: normalizedParams ?? {},
-            meta: uiSession?.requestMeta,
+            meta: requestMeta,
             signal: ownedSignal,
             requestTimeoutMs: requestOptions?.timeout
           });
         }
-        return abortable(conn.client.callTool({
+        return abortable(callToolPausingForElicitation(conn.client, {
           name: spec.originalName,
           arguments: normalizedParams,
-          _meta: uiSession?.requestMeta
+          _meta: requestMeta
         }, requestOptions), ownedSignal);
       });
       uiSession?.sendToolResult(result);
+      if (!result.isError)
+        recordOutput(result);
       if (result.isError) {
         const content = resolveMcpResultContent(result, state.owner?.signal);
         const outputContent = content.length > 0 ? content : [{ type: "text", text: "(empty result)" }];
@@ -263,7 +275,8 @@ export function createDirectToolExecutor(getState, getInitPromise, spec) {
         });
         return {
           content: guarded.content,
-          details: { error: "tool_error", server: spec.serverName, ...guardedMcpDetails(guarded) }
+          details: { error: "tool_error", server: spec.serverName, ...guardedMcpDetails(guarded) },
+          ...structuredContentOf(result)
         };
       }
       const content = resolveMcpResultContent(result, state.owner?.signal);
@@ -286,18 +299,23 @@ ${uiSummary.message}`,
             uiViewer: uiSummary.uiViewer,
             uiUrl: uiSummary.uiUrl,
             ...guardedMcpDetails(guarded)
-          }
+          },
+          ...structuredContentOf(result)
         };
       }
       const guarded = await guardMcpOutput(outputContent, {
         ...outputGuardOptions,
+        ...scriptPipeHint(state.scriptTool, outputContent),
         ...state.config.settings?.directToolResultDetails === "bounded" ? { rawMcpResult: result } : {}
       });
       return {
         content: guarded.content,
-        details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) }
+        details: { server: spec.serverName, tool: spec.originalName, ...guardedMcpDetails(guarded) },
+        ...structuredContentOf(result)
       };
     } catch (error) {
+      if (!approval)
+        throw error;
       if (error instanceof SessionRecoveryAuthRequiredError) {
         const message = error.authMessage ?? getDirectAuthRequiredMessage(state, spec.serverName);
         uiSession?.sendToolCancelled(message);

package/extensions/dm-mcp-adapter/dist/abort.js

@@ -0,0 +1,35 @@
+export function throwIfAborted(signal) {
+  if (!signal?.aborted)
+    return;
+  throw signal.reason instanceof Error ? signal.reason : new Error(String(signal.reason ?? "MCP request aborted"));
+}
+export async function abortable(promise, signal) {
+  if (!signal)
+    return promise;
+  throwIfAborted(signal);
+  return await new Promise((resolve, reject) => {
+    let settled = false;
+    const cleanup = () => signal.removeEventListener("abort", onAbort);
+    const onAbort = () => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      reject(signal.reason instanceof Error ? signal.reason : new Error(String(signal.reason ?? "MCP request aborted")));
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then((value) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      resolve(value);
+    }, (error) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      reject(error);
+    });
+  });
+}

package/extensions/dm-mcp-adapter/dist/agent-dir.js

@@ -0,0 +1,45 @@
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+export function getConfigDirName() {
+  const configDir = readDmConfig()?.configDir;
+  return typeof configDir === "string" && configDir.trim() ? configDir.trim() : ".dm";
+}
+export function getAgentDir() {
+  const piConfig = readDmConfig();
+  const name = piConfig?.name;
+  const appName = typeof name === "string" && name.trim() ? name.trim() : "dm";
+  const configured = process.env[`${appName.toUpperCase()}_CODING_AGENT_DIR`]?.trim() ?? (appName === "dm" ? process.env.PI_CODING_AGENT_DIR?.trim() : undefined);
+  if (!configured) {
+    return join(homedir(), getConfigDirName(), "agent");
+  }
+  if (configured === "~") {
+    return homedir();
+  }
+  if (configured.startsWith("~/")) {
+    return resolve(homedir(), configured.slice(2));
+  }
+  return resolve(configured);
+}
+export function getAgentPath(...segments) {
+  return join(getAgentDir(), ...segments);
+}
+function readDmConfig() {
+  const dir = process.env.DM_PACKAGE_DIR?.trim() ?? process.env.PI_PACKAGE_DIR?.trim();
+  if (!dir)
+    return;
+  try {
+    const manifest = JSON.parse(readFileSync(join(resolve(dir), "package.json"), "utf8"));
+    return manifest.dmConfig ?? manifest.piConfig;
+  } catch {
+    return;
+  }
+}
+export function getAppName() {
+  const name = readDmConfig()?.name;
+  return typeof name === "string" && name.trim() ? name.trim() : "dm";
+}
+export function getAppClientUri() {
+  const uri = readDmConfig()?.clientUri;
+  return typeof uri === "string" && uri.trim() ? uri.trim() : undefined;
+}