@geohar/pi-mcp-combiner 0.14.3 → 0.16.0-dev.1

package/dist/native/resources.js

@@ -0,0 +1,97 @@
+// NATIVE RESOURCE TOOLS : read_* tools for
+// INTERACTIVE (mcp-app / ui://) resources — the parity half of legacy-client/
+// resources.ts that pi's built-in read_mcp_resource deliberately does NOT cover
+// (it skips ui:// listings and renders nothing).
+//
+// Parity contract with legacy read_<resource> tools:
+//   - SAME naming: read_<resourceNameToToolName(resource.name ?? uri)>
+//   - SAME attribution + project filtering: resourceServer() + `<server>_`/
+//     `<server>-` prefix matching against the per-project ServerFilter
+//   - SAME read behavior: connection.readResource(uri) → renderResourceResult
+//     (markup as text, json prettified, blobs as byte notes, 16KB guard)
+//   - SAME surfacing: append the combiner UI-host URL (this session's token),
+//     auto-open in the browser when a dialog-capable UI exists (uiAutoOpen)
+//   - idempotent registration; re-syncs on resources/list_changed (the
+//     connection's onToolsChanged hook covers both list-change notifications)
+//
+// TEXT/image resources are NOT re-registered here — pi's built-in
+// read_mcp_resource + tool_search discovery covers them in native mode; that is
+// the deliberate (documented) divergence from legacy, which registered one
+// zero-arg tool per resource of every kind.
+import { isInteractiveResource, openInBrowser, renderResourceResult } from "../client/widget-support.js";
+import { resourceNameToToolName, resourceServer } from "../client/resource-naming.js";
+/** Project server filter for resources — mirrors legacy filterResources
+ *  attribution semantics (uri host first, `<server>_` name-prefix fallback). */
+export function filterInteractiveResources(resources, filter) {
+    const interactive = resources.filter(isInteractiveResource);
+    if (!filter)
+        return interactive;
+    const matches = (r, entry) => resourceServer(r) === entry ||
+        (r.name ?? "").startsWith(`${entry}_`) ||
+        (r.name ?? "").startsWith(`${entry}-`);
+    if (filter.allow?.length)
+        return interactive.filter((r) => filter.allow.some((e) => matches(r, e)));
+    if (filter.deny?.length)
+        return interactive.filter((r) => !filter.deny.some((e) => matches(r, e)));
+    return interactive;
+}
+function toReadTool(toolName, resource, opts) {
+    const label = resource.name ?? resource.uri;
+    const url = opts.connection.uiUrlFor(resource.uri);
+    return {
+        name: toolName,
+        label: `MCP resource: ${label}`,
+        description: [
+            resource.description ?? `Read MCP resource ${resource.uri}`,
+            `uri: ${resource.uri}`,
+            resource.mimeType ? `type: ${resource.mimeType}` : undefined,
+            "interactive app resource — markup as text; the interactive widget opens from the URL appended to results",
+        ]
+            .filter(Boolean)
+            .join(" | "),
+        promptSnippet: `Read MCP resource ${label}.`,
+        parameters: { type: "object", properties: {} },
+        exposure: "direct",
+        namespace: { name: "mcp_combiner", description: "mcp-combiner aggregated tools" },
+        execute: async (_toolCallId, _params, _signal, _onUpdate, ctx) => {
+            try {
+                const result = await opts.connection.readResource(resource.uri);
+                let text = renderResourceResult(result);
+                if (url) {
+                    text = `${text}\n\ninteractive: ${url}`;
+                    if (opts.uiAutoOpen !== false && ctx?.hasUI)
+                        openInBrowser(url);
+                }
+                return { content: [{ type: "text", text }], details: { mode: "resource", uri: resource.uri, url: url || undefined } };
+            }
+            catch (e) {
+                throw new Error(`${toolName}: resource read failed (${e instanceof Error ? e.message : String(e)})`);
+            }
+        },
+    };
+}
+/** Register read_* tools for the interactive resources (idempotent, like legacy).
+ *  Returns the tool names registered this pass. */
+export async function activateNativeResources(pi, opts, registered) {
+    let resources = [];
+    try {
+        resources = filterInteractiveResources(await opts.connection.listResources(true), opts.serverFilter);
+    }
+    catch (e) {
+        opts.log("warn", `interactive resource discovery failed (${e instanceof Error ? e.message : String(e)})`);
+        return [];
+    }
+    const added = [];
+    for (const resource of resources) {
+        const toolName = `read_${resourceNameToToolName(resource.name ?? resource.uri)}`;
+        if (registered.has(toolName))
+            continue;
+        registered.add(toolName);
+        pi.registerTool(toReadTool(toolName, resource, opts));
+        added.push(toolName);
+    }
+    if (added.length)
+        opts.log("info", `native resources: ${added.length} interactive resource tool(s) registered`);
+    return added;
+}
+//# sourceMappingURL=resources.js.map

package/dist/native/resources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/native/resources.ts"],"names":[],"mappings":"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"}

package/dist/native/tool-surface.d.ts

@@ -0,0 +1,26 @@
+import type { ExtensionAPI } from "../pi.js";
+import type { NativeCombinerConnection } from "./combiner-connection.js";
+import type { ServerFilter } from "../client/config-ladder.js";
+export type NativeToolSurfaceOptions = {
+    /** The resolved combiner connection (owns elicitation, filters, caches). */
+    connection: NativeCombinerConnection;
+    /** The per-project server filter (same object index.ts passes to applyFilter);
+     *  applied defensively here too so a filter race never widens surface exposure. */
+    serverFilter?: ServerFilter;
+    /** The combiner block's directTools spec, as resolved from the ladder: a glob
+     *  allowlist → "direct" exposure for matches; "search" → everything codemode. */
+    directSpec?: string[] | "search";
+    /** Warn when the direct-exposure set grows large (every declared schema rides in
+     *  every request). Settings kill-switch: warnLargeDirectExposure (default true). */
+    warnLargeDirectExposure?: boolean;
+    /** Namespace shown in codemode's grouped listing (pi normalizes -/­_ alike). */
+    namespaceName?: string;
+    /** Names that must never be shadowed by a combiner tool (pi builtins + ours). */
+    reserved?: readonly string[];
+    log: (level: "info" | "warn" | "error", message: string) => void;
+};
+/** Register the combiner's tools natively. Returns the names it registered (for
+ *  status/panel surfaces). Idempotent by name — pi.registerTool replaces by name with
+ *  a warning, so re-registration on list_changed must pass the same names. */
+export declare function activateNativeTools(pi: ExtensionAPI, opts: NativeToolSurfaceOptions): Promise<string[]>;
+//# sourceMappingURL=tool-surface.d.ts.map

package/dist/native/tool-surface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-surface.d.ts","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,YAAY,EAAkC,MAAM,UAAU,CAAA;AAC5E,OAAO,KAAK,EAAE,wBAAwB,EAAe,MAAM,0BAA0B,CAAA;AAErF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAM9D,MAAM,MAAM,wBAAwB,GAAG;IACnC,4EAA4E;IAC5E,UAAU,EAAE,wBAAwB,CAAA;IACpC;uFACmF;IACnF,YAAY,CAAC,EAAE,YAAY,CAAA;IAC3B;qFACiF;IACjF,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAChC;wFACoF;IACpF,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iFAAiF;IACjF,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5B,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACnE,CAAA;AAwDD;;8EAE8E;AAC9E,wBAAsB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAmC7G"}

package/dist/native/tool-surface.js

@@ -0,0 +1,113 @@
+// NATIVE TOOL SURFACE : declares the combiner's tools
+// to Pi FIRST-CLASS, via pi.registerTool with exposure/namespace/annotations — the
+// replacement for client/proxy-tool.ts + client/script.ts + direct-tools.ts promotion.
+//
+// What this buys (the whole point of the native path):
+//
+//   - every tool is declared under its own name (`github_search_code`), one hop,
+//     no mcp() wrapper and no mcpScript
+//   - exposure IS pi's native mechanism: `direct` for the daily drivers (declared to
+//     the model verbatim), `codemode` for the rest (callable from codemode scripts,
+//     listed only as a namespace — 4%-token cost since pi 1.0), so the combiner's
+//     671 tools stay out of the declaration budget by default
+//   - annotations (readOnly/destructive hints) ride along, so pi-permission-system
+//     and other tool_call gates classify combiner calls without any adapter glue
+//   - tool_search / codemode searchTools() find undeclared ones by BM25, replacing
+//     directTools:"search" promotion with pi's own discovery
+//
+// Exposure mapping reuses the existing config vocabulary: the `combiner.directTools`
+// allowlist in the mcp.json ladder means "these are direct" here; everything else is
+// `codemode`. `directTools: "search"` degenerates to plain codemode (pi's tool_search
+// replaces it). Per-project allow/deny keeps flowing combiner-side via applyFilter.
+//
+// Wire shape: register once at session_start (tools list is stable modulo
+// list_changed, which re-registers on the same names). Tools the combiner offers
+// during a session surface via the connection's onToolsChanged hook → activate again.
+import { applyServerFilter, matchesGlob, RESERVED_TOOL_NAMES } from "../client/tool-matching.js";
+function isRecord(v) {
+    return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+/** Map a CallToolResult content block to pi's text-block contract. pi tool results
+ *  are arrays of text blocks today; image/other blocks are summarized to text and the
+ *  full result rides `details` for renderers (same shape the SDK client half uses). */
+function textBlockOf(b) {
+    const block = isRecord(b) ? b : undefined;
+    if (block && block.type === "text") {
+        return { type: "text", text: String(block.text) };
+    }
+    const kind = block?.type ?? (block ? "content" : b);
+    return { type: "text", text: `[${String(kind)} block]` };
+}
+function toToolResult(call) {
+    const blocks = Array.isArray(call.content) ? call.content : [];
+    return { content: blocks.map((b) => textBlockOf(b)) };
+}
+/** Register the combiner's tools natively. */
+const DIRECT_EXPOSURE_WARN_THRESHOLD = 50;
+/** Turn one combiner ToolSummary into pi's ToolDefinition, plus the native-only fields
+ *  pi 1.0 accepts on registerTool (exposure/namespace/annotations). */
+function toNativeTool(sum, conn, exposure) {
+    const name = sum.name;
+    return {
+        name,
+        label: name,
+        description: sum.description ?? name,
+        parameters: sum.inputSchema ?? { type: "object", properties: {} },
+        // NATIVE-ONLY fields (pi ≥ 1.0 host contract): exposure decides how the tool is
+        // declared; namespace groups it in codemode's listing; annotations feed
+        // pi-permission-system's classification. Kept optional on ToolDefinition so the
+        // extension stays load-compatible with pi 0.99.x where these fields are ignored.
+        exposure,
+        namespace: { name: "mcp_combiner", description: "mcp-combiner aggregated tools" },
+        annotations: sum.annotations,
+        execute: async (_toolCallId, params, signal) => {
+            // The abort signal rides into the transport; the combiner can cancel
+            // upstream work, and widget holds respect it (notifications/cancelled).
+            void signal;
+            try {
+                const result = await conn.callTool(name, params);
+                return { ...toToolResult(result), details: result };
+            }
+            catch (e) {
+                // pi's error convention: THROWING marks the call an error (no isError
+                // property on successful results).
+                throw e instanceof Error ? e : new Error(String(e));
+            }
+        },
+    };
+}
+/** Register the combiner's tools natively. Returns the names it registered (for
+ *  status/panel surfaces). Idempotent by name — pi.registerTool replaces by name with
+ *  a warning, so re-registration on list_changed must pass the same names. */
+export async function activateNativeTools(pi, opts) {
+    const registered = [];
+    const cachedNames = registered;
+    const tools = applyServerFilter(await opts.connection.listTools(true), opts.serverFilter);
+    const allowlist = Array.isArray(opts.directSpec) ? opts.directSpec : [];
+    const reserved = new Set([...(opts.reserved ?? []), ...RESERVED_TOOL_NAMES]);
+    const directNames = [];
+    for (const sum of tools) {
+        if (reserved.has(sum.name)) {
+            opts.log("warn", `skipping combiner tool "${sum.name}" — collides with a reserved name`);
+            continue;
+        }
+        // Allowlist glob match → declared verbatim ("direct"); everything else rides
+        // codemode: callable from scripts, discoverable via tool_search/searchTools(),
+        // near-zero declaration cost. "search" degrades to the same codemode mapping
+        // (pi's tool_search replaces the adapter's search-promote semantics).
+        const exposure = allowlist.some((p) => matchesGlob(sum.name, p)) ? "direct" : "codemode";
+        if (exposure === "direct")
+            directNames.push(sum.name);
+        pi.registerTool(toNativeTool(sum, opts.connection, exposure));
+        cachedNames.push(sum.name);
+    }
+    if (directNames.length > DIRECT_EXPOSURE_WARN_THRESHOLD &&
+        opts.warnLargeDirectExposure !== false) {
+        opts.log("warn", `native mode: ${directNames.length} tools declared "direct" — every schema rides in every ` +
+            `request. Consider trimming the allowlist (directTools) or disabling this warning ` +
+            `with "warnLargeDirectExposure": false in extensions/mcp-combiner.json.`);
+    }
+    opts.log("info", `native tool surface: ${cachedNames.length} tools registered`);
+    return cachedNames;
+}
+//# sourceMappingURL=tool-surface.js.map

package/dist/native/tool-surface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-surface.js","sourceRoot":"","sources":["../../src/native/tool-surface.ts"],"names":[],"mappings":"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"}

package/dist/pi.d.ts

@@ -128,6 +128,25 @@ export type ToolDefinition = {
     }, options: ToolRenderResultOptions, theme: RenderTheme, context: {
         [key: string]: unknown;
     }) => TuiComponent;
+    /** NATIVE-exposure fields (pi ≥ 1.0 host contract; optional so 0.99.x hosts ignore
+     *  them instead of erroring — unknown fields are dropped by the 0.99 loader):
+     *    exposure    — "direct" | "model-only" | "codemode" | "deferred" | "hidden":
+     *                  how the tool is declared to the model (codemode: callable from
+     *                  codemode scripts, listed as a namespace in the codemode tool's
+     *                  description — near-zero token cost as of pi 1.0)
+     *    namespace   — groups the tool in codemode's listing, like an MCP server
+     *    annotations — MCP tool hints; reach pi.getAllTools() for permission gates */
+    exposure?: "direct" | "model-only" | "codemode" | "deferred" | "hidden";
+    namespace?: {
+        name: string;
+        description: string;
+    };
+    annotations?: {
+        readOnlyHint?: boolean;
+        destructiveHint?: boolean;
+        idempotentHint?: boolean;
+        openWorldHint?: boolean;
+    };
 };
 export type CommandSpec = {
     description: string;

package/dist/pi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../src/pi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../src/pi.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geohar/pi-mcp-combiner",
-  "version": "0.14.3",
+  "version": "0.16.0-dev.1",
   "description": "Pi extension: run the mcp-combiner MCP aggregator via sharedserver and inject its tool-discovery directive. Pairs with pi-mcp-adapter, which makes the combiner's tools reachable from Pi.",
   "type": "module",
   "main": "dist/index.js",
@@ -54,6 +54,7 @@
     "access": "public"
   },
   "devDependencies": {
+    "@earendil-works/pi-mcp": "^1.0.0",
     "@earendil-works/pi-tui": "^0.85.1",
     "@types/node": "^22.0.0",
     "typescript": "^5.6.0",
@@ -62,11 +63,8 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "dependencies": {
-    "@modelcontextprotocol/client": "^2.0.0",
-    "@modelcontextprotocol/core": "^2.0.0"
-  },
   "peerDependencies": {
+    "@earendil-works/pi-mcp": "^1.0.2",
     "@earendil-works/pi-tui": "^0.85.1"
   }
 }

package/src/client/config-ladder.ts

@@ -19,7 +19,7 @@ import { existsSync, readFileSync } from "node:fs"
 import { homedir } from "node:os"
 import { join } from "node:path"
 import { agentDir } from "./settings.js"
-import type { DirectToolsSpec } from "./direct-tools.js"
+import type { DirectToolsSpec } from "./tool-matching.js"
 
 export type ServerFilter = { allow?: string[]; deny?: string[] }
 

package/src/client/control.ts

@@ -4,7 +4,7 @@
 // filter routes); the write side drives the combiner__* meta-tools through our own
 // MCP client — one auth path, no second protocol.
 
-import type { CombinerConnection } from "./connection.js"
+import type { CombinerConnection } from "./types.js"
 
 export type HealthServer = { name?: string; status?: string; state?: string; transport?: string }
 

package/src/client/elicitation.ts

@@ -84,8 +84,15 @@ async function askProperty(
 }
 
 /** Handle an elicitation request against Pi's UI. Never throws — a UI that can't
- *  answer declines, and the combiner applies its elicitUnavailable policy. */
-export async function handleElicitation(req: ElicitRequest, elicitUi: ElicitUi): Promise<ElicitResponse> {
+ *  answer declines, and the combiner applies its elicitUnavailable policy.
+ *  `abort` (wired from the connection's elicitation handler signal) cancels between
+ *  dialogs: a cancelled pending request must not keep prompting the user. */
+export async function handleElicitation(
+    req: ElicitRequest,
+    elicitUi: ElicitUi,
+    abort?: AbortSignal,
+): Promise<ElicitResponse> {
+    if (abort?.aborted) return { action: "cancel" }
     if (!elicitUi.hasUI || !elicitUi.ui?.select || !elicitUi.ui.input) return REFUSE
 
     const schema = isRecord(req.requestedSchema) ? req.requestedSchema : undefined
@@ -106,6 +113,7 @@ export async function handleElicitation(req: ElicitRequest, elicitUi: ElicitUi):
     const entries = Object.entries(props).filter(([, v]) => isRecord(v))
     const content: Record<string, ElicitValue> = {}
     for (const [name, raw] of entries) {
+        if (abort?.aborted) return { action: "cancel" }
         const label = entries.length === 1 ? header : `${header}: ${name}`
         const value = await askProperty(elicitUi.ui, label, raw as Record<string, unknown>)
         if (value === undefined) return REFUSE

package/src/client/footer.ts

@@ -4,7 +4,7 @@
 // `mcp` (default, overridable via the mcpFooterKey setting) — the slot
 // pi-mcp-adapter wrote and oh-my-posh-style footers aggregate into PI_STATUS.
 
-import type { CombinerConnection } from "./connection.js"
+import type { CombinerConnection } from "./types.js"
 import type { ExtensionUIContext } from "../pi.js"
 import type { FooterStatus } from "./settings.js"
 

package/src/client/panel.ts

@@ -9,9 +9,9 @@
 
 import { spawn } from "node:child_process"
 import { Container, Text, matchesKey, truncateToWidth, visibleWidth, type Component } from "@earendil-works/pi-tui"
-import type { CombinerConnection, PromptSummary, ResourceSummary, ToolSummary } from "./connection.js"
+import type { CombinerConnection, PromptSummary, ResourceSummary, ToolSummary } from "./types.js"
 import { metaToolCall } from "./control.js"
-import { resourceServer } from "./resources.js"
+import { resourceServer } from "./resource-naming.js"
 
 type RenderTheme = { fg: (color: string, text: string) => string }
 

package/src/client/prompts.ts

@@ -14,7 +14,7 @@
 // passthrough) are ported from pi-mcp-adapter's prompts.ts (MIT, © 2026 Nico Bailon).
 
 import type { ExtensionAPI } from "../pi.js"
-import type { CombinerConnection, PromptSummary } from "./connection.js"
+import type { CombinerConnection, PromptSummary } from "./types.js"
 
 // ── naming ──
 

package/src/client/proxy-tool.ts

@@ -12,7 +12,7 @@
 
 import { spawn } from "node:child_process"
 import type { ToolCallContext, ToolDefinition } from "../pi.js"
-import type { CombinerConnection, ToolSummary } from "./connection.js"
+import type { CombinerConnection, ToolSummary } from "./types.js"
 import { compileSafeRegex, rankTools, regexMatches, type SearchableTool } from "./ranking.js"
 import { renderDescribe, renderSearchHit, renderToolResult, textResult, toolUiResourceUri } from "./render.js"
 import { proxyRenderers } from "./renderers.js"

package/src/client/resource-naming.ts

@@ -0,0 +1,36 @@
+// Resource naming helpers — extracted from legacy-client/resources.ts during the
+// Extracted during the legacy-client factoring so surfaces that survive the native migration (panel, widget
+// resource attribution) don't import the deprecated legacy-client/ directory.
+//
+// These name the SAME way legacy read_<resource> tools always did (ported verbatim
+// from pi-mcp-adapter, MIT © Nico Bailon); native widget resource support reuses the
+// attribution logic, so panel counts and native read_* tools agree on server keys.
+
+import type { ResourceSummary } from "./types.js"
+
+/** Ported verbatim from pi-mcp-adapter's resource-tools.ts (MIT, © 2026 Nico Bailon). */
+export function resourceNameToToolName(name: string): string {
+    let result = name
+        .replace(/[^a-zA-Z0-9]/g, "_")
+        .replace(/_+/g, "_")
+        .replace(/^_+/, "") // Remove leading underscores
+        .replace(/_+$/, "") // Remove trailing underscores
+        .toLowerCase()
+
+    // Ensure we have a valid name
+    if (!result || /^\d/.test(result)) {
+        result = "resource" + (result ? "_" + result : "")
+    }
+    return result
+}
+
+/** Attribute a resource to an upstream server for filtering: ui:// URIs carry the
+ *  server as the host component (ui://todoist/…); otherwise fall back to the name's
+ *  leading word before a dash/underscore. */
+export function resourceServer(r: ResourceSummary): string | undefined {
+    const m = r.uri.match(/^[a-z][a-z0-9+.-]*:\/\/([^/?#]+)/i)
+    if (m?.[1]) return m[1].split(".")[0]?.toLowerCase()
+    const name = r.name ?? r.uri
+    const head = name.split(/[-_]/, 1)[0]
+    return head ? head.toLowerCase() : undefined
+}

package/src/client/settings.ts

@@ -21,8 +21,8 @@ export type CombinerSettings = {
     toolName: string
     /** "lazy" (default): connect on first mcp() call. "eager": connect at session_start. */
     lazy: "lazy" | "eager"
-    /** Client-half gate. `true`: we are the MCP tool. `false`: legacy mode — the
-     *  process + instructions halves only, pi-mcp-adapter (if installed) owns MCP.
+    /** Client-half gate. `true`: we are the MCP tool. `false`: the process +
+     *  instructions halves only, pi-mcp-adapter (if installed) owns MCP.
      *  `"auto"` (default): OFF when pi-mcp-adapter is detected installed, ON otherwise —
      *  so existing adapter users upgrade with zero behaviour change, while fresh
      *  installs get the one-package experience. Env PI_MCP_COMBINER_ADAPTER wins. */
@@ -39,11 +39,12 @@ export type CombinerSettings = {
      *  slot pi-mcp-adapter wrote and footers (oh-my-posh's PI_STATUS aggregate)
      *  already surface; rename only if something else claims it. */
     mcpFooterKey: string
-    /** Register the trusted batching tool (<toolName>Script). Default true. */
-    scriptMode: boolean
     /** Auto-open interactive widget URLs (Stage 2 holds + resource reads).
      *  Default true. */
     uiAutoOpen: boolean
+    /** Warn when the direct-exposure set grows large (default threshold: 50 tools —
+     *  every schema rides in every request). Default true. */
+    warnLargeDirectExposure: boolean
     /** Explicit combiner base URL (e.g. "http://127.0.0.1:9741/mcp"). Env wins. */
     url?: string
     /** Notify (vs stderr-only) for connection lifecycle messages. */
@@ -58,8 +59,8 @@ export const DEFAULT_SETTINGS: CombinerSettings = {
     prompts: true,
     mcpFooterStatus: "full",
     mcpFooterKey: "mcp",
-    scriptMode: true,
     uiAutoOpen: true,
+    warnLargeDirectExposure: true,
     notify: true,
 }
 
@@ -102,7 +103,7 @@ export function loadSettings(path = settingsPath()): CombinerSettings {
     }
     if (typeof d.mcpFooterKey === "string" && d.mcpFooterKey.trim()) out.mcpFooterKey = d.mcpFooterKey.trim()
     if (typeof d.uiAutoOpen === "boolean") out.uiAutoOpen = d.uiAutoOpen
-    if (typeof d.scriptMode === "boolean") out.scriptMode = d.scriptMode
+    if (typeof d.warnLargeDirectExposure === "boolean") out.warnLargeDirectExposure = d.warnLargeDirectExposure
     if (typeof d.url === "string" && d.url.trim()) out.url = d.url.trim()
     if (typeof d.notify === "boolean") out.notify = d.notify
     return out

package/src/client/tool-matching.ts

@@ -0,0 +1,69 @@
+// Shared tool-name matching helpers — extracted from legacy-client/direct-tools.ts
+// during the legacy-client factoring so the NATIVE tool surface (src/native/) and the
+// client half (src/client/: config-ladder, panel) can use them without importing the
+// deprecated legacy-client/ directory. When legacy-client/ is deleted, this file
+// survives untouched.
+//
+// These are the stable contract:
+//   - tool names arrive with the combiner's baked `<server>_` prefix
+//   - server attribution is PREFIX-based (underscore-safe), not string equality
+
+/** A combined-tool allowlist spec from the ladder's `combiner.directTools` key:
+ *  a glob allowlist, or "search" (legacy adapter semantics — deprecated in the
+ *  native mode, where tool_search replaces it). */
+export type DirectToolsSpec = string[] | "search"
+
+/** Names that must never be shadowed by a promoted/registered tool (pi builtins).
+ *  Callers add their own tool names on top. */
+export const RESERVED_TOOL_NAMES = ["read", "bash", "edit", "write", "grep", "find", "ls", "mcp", "glob"] as const
+
+/** Apply a server allow/deny filter to a combined tool list. Server names may
+ *  contain underscores (gws_georgeharker), so matching is by PREFIX — a tool
+ *  belongs to entry E iff its name starts `E_` (subsumes first-segment equality). */
+export function toolServerMatches(toolName: string, serverEntry: string): boolean {
+    return toolName.startsWith(`${serverEntry}_`)
+}
+
+/** Apply a server allow/deny filter to a combined tool list (`<server>_` prefix,
+ *  underscore-safe via toolServerMatches). */
+export function applyServerFilter(
+    tools: ToolSummary[],
+    filter: { allow?: string[]; deny?: string[] } | undefined,
+): ToolSummary[] {
+    if (!filter) return tools
+    if (filter.allow?.length) {
+        return tools.filter((t) => filter.allow!.some((e) => toolServerMatches(t.name, e)))
+    }
+    if (filter.deny?.length) {
+        return tools.filter((t) => !filter.deny!.some((e) => toolServerMatches(t.name, e)))
+    }
+    return tools
+}
+
+/** fnmatch-lite: `*` → any run, `?` → one char, everything else literal. */
+export function globToRegExp(pattern: string): RegExp {
+    const escaped = pattern
+        .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+        .replace(/\*/g, ".*")
+        .replace(/\?/g, ".")
+    return new RegExp(`^${escaped}$`, "i")
+}
+
+export function matchesGlob(name: string, pattern: string): boolean {
+    return globToRegExp(pattern).test(name)
+}
+
+// Local shape of a combiner tool listing (kept structural — the two connection
+// implementations share it; defined here so both src/client and src/native can
+// import it without a connection.ts dependency).
+export type ToolSummary = {
+    name: string
+    description?: string
+    inputSchema?: unknown
+    annotations?: {
+        readOnlyHint?: boolean
+        destructiveHint?: boolean
+        idempotentHint?: boolean
+        openWorldHint?: boolean
+    }
+}