@humain/terminal 0.0.3-beta.0 → 0.0.3-beta.2

package/dist/humain/mcp-adapter/vendor/mcp-setup-panel.ts

@@ -1,6 +1,7 @@
 import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { createPanelKeys, type PanelKeybindings, type PanelKeys } from "./panel-keys.ts";
 import type { ImportKind } from "./types.ts";
+import { getConfigDirName } from "./agent-dir.ts";
 import { KNOWN_SERVER_PRESETS, type ConfigWritePreview, type KnownServerPreset, type McpDiscoverySummary } from "./config.ts";
 import type { McpOnboardingState } from "./onboarding-state.ts";
 
@@ -556,7 +557,7 @@ export class McpSetupPanel {
           "3. ~/.agents/mcp/mcp.json",
           "4. <Pi agent dir>/mcp.json",
           "5. .mcp.json",
-          "6. .pi/mcp.json",
+          `6. ${getConfigDirName()}/mcp.json`,
           `Host discovery: ${this.discovery.hostConfigDiscovery}. Conflicts reported: ${this.discovery.conflicts.length}.`,
           ...this.discovery.conflicts.slice(0, 8).map((conflict) =>
             `${conflict.serverName}: ${conflict.sources.map((source) => source.path).join(" -> ")} (winner: ${conflict.winner.path})`,

package/dist/humain/mcp-adapter/vendor/metadata-cache.ts

@@ -19,11 +19,12 @@ import type {
   ToolMetadata,
   PromptMetadata,
 } from "./types.ts";
-import { formatPromptCommandName, formatToolName, getToolNameCandidates, isServerDisabled, isToolAllowed, resolveToolPrefix, type ToolPrefix } from "./types.ts";
+import { createToolSelectorCandidateIndex, formatPromptCommandName, formatToolName, getToolNameCandidates, isServerDisabled, isToolAllowed, resolveToolPrefix, type ToolPrefix } from "./types.ts";
 import { resourceNameToToolName } from "./resource-tools.ts";
 import {
   extractToolUiStreamMode,
   interpolateEnvRecord,
+  interpolateEnvVars,
   resolveBearerToken,
   resolveConfigPath,
   resolveServerUrl,
@@ -90,6 +91,14 @@ export function computeServerHash(definition: ServerEntry): string {
     cwd: resolveConfigPath(definition.cwd),
     url: resolveServerUrl(definition),
     headers: interpolateEnvRecord(definition.headers),
+    requestHeadersCommand: definition.requestHeadersCommand
+      ? {
+          command: interpolateEnvVars(definition.requestHeadersCommand.command),
+          args: definition.requestHeadersCommand.args?.map(interpolateEnvVars),
+          env: interpolateEnvRecord(definition.requestHeadersCommand.env),
+          timeoutMs: definition.requestHeadersCommand.timeoutMs,
+        }
+      : undefined,
     auth: definition.auth,
     protocolVersion: definition.protocolVersion,
     bearerToken: resolveBearerToken(definition),
@@ -184,8 +193,10 @@ export function reconstructToolMetadata(
   const metadata: ToolMetadata[] = [];
   const seenNames = new Set<string>();
   const effectivePrefix = resolveToolPrefix(definition, prefix);
-  const getOtherCurrentCandidates = (toolName: string): Set<string> | undefined => {
-    if (!configuredServers || !cache) return undefined;
+  const hasToolFilters =
+    (Array.isArray(definition.includeTools) && definition.includeTools.length > 0) ||
+    (Array.isArray(definition.excludeTools) && definition.excludeTools.length > 0);
+  const selectorCandidateIndex = hasToolFilters && configuredServers && cache ? (() => {
     const candidates = new Set<string>();
     for (const [otherServerName, otherDefinition] of Object.entries(configuredServers)) {
       const otherEntry = cache.servers[otherServerName];
@@ -202,16 +213,15 @@ export function reconstructToolMetadata(
         }
       }
     }
-    for (const candidate of getToolNameCandidates(toolName, serverName, effectivePrefix, false)) candidates.delete(candidate);
-    return candidates;
-  };
+    return createToolSelectorCandidateIndex(candidates);
+  })() : undefined;
 
   for (const tool of entry.tools ?? []) {
     if (!tool?.name) continue;
     if (!isUiToolVisibleToModel(tool.uiVisibility)) {
       continue;
     }
-    if (!isToolAllowed(tool.name, serverName, effectivePrefix, definition.includeTools, definition.excludeTools, getOtherCurrentCandidates(tool.name))) {
+    if (!isToolAllowed(tool.name, serverName, effectivePrefix, definition.includeTools, definition.excludeTools, selectorCandidateIndex)) {
       continue;
     }
 
@@ -236,7 +246,7 @@ export function reconstructToolMetadata(
     for (const resource of entry.resources ?? []) {
       if (!resource?.name || !resource?.uri) continue;
       const baseName = `read_${resourceNameToToolName(resource.name)}`;
-      if (!isToolAllowed(baseName, serverName, effectivePrefix, definition.includeTools, definition.excludeTools, getOtherCurrentCandidates(baseName))) {
+      if (!isToolAllowed(baseName, serverName, effectivePrefix, definition.includeTools, definition.excludeTools, selectorCandidateIndex)) {
         continue;
       }
 

package/dist/humain/mcp-adapter/vendor/package.json

@@ -1,178 +1,179 @@
 {
-	"name": "pi-mcp-adapter",
-	"version": "2.25.0",
-	"description": "MCP (Model Context Protocol) adapter extension for Pi coding agent",
-	"type": "module",
-	"types": "./index.ts",
-	"exports": {
-		".": {
-			"types": "./index.ts",
-			"import": "./index.ts",
-			"default": "./index.ts"
-		},
-		"./types": {
-			"types": "./types.ts",
-			"import": "./types.ts",
-			"default": "./types.ts"
-		},
-		"./oauth": {
-			"types": "./oauth.ts",
-			"import": "./oauth.ts",
-			"default": "./oauth.ts"
-		}
-	},
-	"license": "MIT",
-	"author": "Nico Bailon",
-	"engines": {
-		"node": ">=20"
-	},
-	"bin": {
-		"pi-mcp-adapter": "cli.js"
-	},
-	"scripts": {
-		"typecheck": "tsc --noEmit",
-		"test": "vitest run",
-		"test:watch": "vitest",
-		"test:coverage": "vitest run --coverage",
-		"test:oauth": "PI_MCP_ADAPTER_TEST_AUTH_STORE=memory PI_MCP_ADAPTER_DISABLE_AUTH_CACHE=1 node --import tsx --test --test-concurrency=1 oauth-public-api.test.ts mcp-auth.test.ts mcp-auth-flow.test.ts mcp-callback-server.test.ts mcp-oauth-provider.test.ts",
-		"test:oauth-provider": "PI_MCP_ADAPTER_TEST_AUTH_STORE=memory PI_MCP_ADAPTER_DISABLE_AUTH_CACHE=1 node --import tsx --test mcp-oauth-provider.test.ts",
-		"test:conformance": "bash conformance/run.sh"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/nicobailon/pi-mcp-adapter.git"
-	},
-	"keywords": [
-		"pi-package",
-		"pi",
-		"mcp",
-		"model-context-protocol",
-		"ai",
-		"coding-agent",
-		"extension",
-		"claude",
-		"llm"
-	],
-	"pi": {
-		"extensions": [
-			"./index.ts"
-		],
-		"skills": [
-			"./skills"
-		],
-		"video": "https://github.com/nicobailon/pi-mcp-adapter/raw/refs/heads/main/pi-mcp.mp4"
-	},
-	"files": [
-		"cli.js",
-		"agent-dir.ts",
-		"index.ts",
-		"error-signal.ts",
-		"state.ts",
-		"utils.ts",
-		"abort.ts",
-		"runtime-owner.ts",
-		"tool-metadata.ts",
-		"ts-shape.ts",
-		"search-ranking.ts",
-		"tool-approval.ts",
-		"init.ts",
-		"ui-session.ts",
-		"proxy-modes.ts",
-		"direct-tools.ts",
-		"commands.ts",
-		"prompts.ts",
-		"onboarding-state.ts",
-		"mcp-setup-panel.ts",
-		"types.ts",
-		"ui-stream-types.ts",
-		"ui-tool-visibility.ts",
-		"ui-app-bridge-helpers.ts",
-		"config.ts",
-		"server-manager.ts",
-		"unix-socket-transport.ts",
-		"json-schema-validator.ts",
-		"session-recovery.ts",
-		"sampling-handler.ts",
-		"elicitation-handler.ts",
-		"tool-registrar.ts",
-		"tool-result-renderer.ts",
-		"mcp-output-guard.ts",
-		"mcp-code.ts",
-		"mcp-script-worker.mjs",
-		"mcp-probe.ts",
-		"agent-plugin-loader.ts",
-		"resource-tools.ts",
-		"lifecycle.ts",
-		"mcp-status.ts",
-		"metadata-cache.ts",
-		"host-html-template.ts",
-		"ui-resource-handler.ts",
-		"consent-manager.ts",
-		"ui-server.ts",
-		"glimpse-ui.ts",
-		"npx-resolver.ts",
-		"oauth-handler.ts",
-		"oauth.ts",
-		"mcp-auth.ts",
-		"mcp-keyring-helper.cjs",
-		"mcp-oauth-provider.ts",
-		"mcp-callback-server.ts",
-		"mcp-auth-flow.ts",
-		"mcp-panel.ts",
-		"panel-keys.ts",
-		"mcp-trace.ts",
-		"logger.ts",
-		"errors.ts",
-		"app-bridge.bundle.js",
-		"banner.png",
-		"skills",
-		"README.md",
-		"CHANGELOG.md",
-		"LICENSE"
-	],
-	"dependencies": {
-		"@modelcontextprotocol/client": "2.0.0",
-		"@modelcontextprotocol/core": "2.0.0",
-		"@modelcontextprotocol/ext-apps": "^1.2.2",
-		"@napi-rs/keyring": "^1.3.0",
-		"ajv": "^8.17.1",
-		"ajv-formats": "^3.0.1",
-		"cross-spawn": "^7.0.6",
-		"open": "^10.2.0",
-		"recheck": "^4.5.0",
-		"smol-toml": "^1.6.1",
-		"strip-json-comments": "^5.0.3",
-		"zod": "^3.25.0 || ^4.0.0"
-	},
-	"peerDependencies": {
-		"@earendil-works/pi-ai": "^0.84.1",
-		"@earendil-works/pi-tui": "*",
-		"typebox": "*",
-		"zod": "^3.25.0 || ^4.0.0"
-	},
-	"peerDependenciesMeta": {
-		"@earendil-works/pi-ai": {
-			"optional": true
-		},
-		"@earendil-works/pi-tui": {
-			"optional": true
-		},
-		"typebox": {
-			"optional": true
-		}
-	},
-	"devDependencies": {
-		"@earendil-works/pi-ai": "^0.84.1",
-		"@earendil-works/pi-coding-agent": "0.84.1",
-		"@earendil-works/pi-tui": "^0.84.1",
-		"@modelcontextprotocol/conformance": "0.1.16",
-		"@types/bun": "^1.0.0",
-		"@types/cross-spawn": "6.0.6",
-		"@types/node": "20.19.43",
-		"@types/open": "^6.2.1",
-		"tsx": "^4.21.0",
-		"typebox": "1.3.3",
-		"typescript": "5.9.3",
-		"vitest": "^3.0.0"
-	}
+  "name": "pi-mcp-adapter",
+  "version": "2.26.0",
+  "description": "MCP (Model Context Protocol) adapter extension for Pi coding agent",
+  "type": "module",
+  "types": "./index.ts",
+  "exports": {
+    ".": {
+      "types": "./index.ts",
+      "import": "./index.ts",
+      "default": "./index.ts"
+    },
+    "./types": {
+      "types": "./types.ts",
+      "import": "./types.ts",
+      "default": "./types.ts"
+    },
+    "./oauth": {
+      "types": "./oauth.ts",
+      "import": "./oauth.ts",
+      "default": "./oauth.ts"
+    }
+  },
+  "license": "MIT",
+  "author": "Nico Bailon",
+  "engines": {
+    "node": ">=20"
+  },
+  "bin": {
+    "pi-mcp-adapter": "cli.js"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
+    "test:oauth": "PI_MCP_ADAPTER_TEST_AUTH_STORE=memory PI_MCP_ADAPTER_DISABLE_AUTH_CACHE=1 node --import tsx --test --test-concurrency=1 oauth-public-api.test.ts mcp-auth.test.ts mcp-auth-flow.test.ts mcp-callback-server.test.ts mcp-oauth-provider.test.ts",
+    "test:oauth-provider": "PI_MCP_ADAPTER_TEST_AUTH_STORE=memory PI_MCP_ADAPTER_DISABLE_AUTH_CACHE=1 node --import tsx --test mcp-oauth-provider.test.ts",
+    "test:conformance": "bash conformance/run.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nicobailon/pi-mcp-adapter.git"
+  },
+  "keywords": [
+    "pi-package",
+    "pi",
+    "mcp",
+    "model-context-protocol",
+    "ai",
+    "coding-agent",
+    "extension",
+    "claude",
+    "llm"
+  ],
+  "pi": {
+    "extensions": [
+      "./index.ts"
+    ],
+    "skills": [
+      "./skills"
+    ],
+    "video": "https://github.com/nicobailon/pi-mcp-adapter/raw/refs/heads/main/pi-mcp.mp4"
+  },
+  "files": [
+    "cli.js",
+    "agent-dir.ts",
+    "index.ts",
+    "error-signal.ts",
+    "state.ts",
+    "utils.ts",
+    "abort.ts",
+    "runtime-owner.ts",
+    "tool-metadata.ts",
+    "ts-shape.ts",
+    "search-ranking.ts",
+    "tool-approval.ts",
+    "init.ts",
+    "ui-session.ts",
+    "proxy-modes.ts",
+    "direct-tools.ts",
+    "commands.ts",
+    "prompts.ts",
+    "onboarding-state.ts",
+    "mcp-setup-panel.ts",
+    "types.ts",
+    "ui-stream-types.ts",
+    "ui-tool-visibility.ts",
+    "ui-app-bridge-helpers.ts",
+    "config.ts",
+    "server-manager.ts",
+    "request-headers-command.ts",
+    "unix-socket-transport.ts",
+    "json-schema-validator.ts",
+    "session-recovery.ts",
+    "sampling-handler.ts",
+    "elicitation-handler.ts",
+    "tool-registrar.ts",
+    "tool-result-renderer.ts",
+    "mcp-output-guard.ts",
+    "mcp-code.ts",
+    "mcp-script-worker.mjs",
+    "mcp-probe.ts",
+    "agent-plugin-loader.ts",
+    "resource-tools.ts",
+    "lifecycle.ts",
+    "mcp-status.ts",
+    "metadata-cache.ts",
+    "host-html-template.ts",
+    "ui-resource-handler.ts",
+    "consent-manager.ts",
+    "ui-server.ts",
+    "glimpse-ui.ts",
+    "npx-resolver.ts",
+    "oauth-handler.ts",
+    "oauth.ts",
+    "mcp-auth.ts",
+    "mcp-keyring-helper.cjs",
+    "mcp-oauth-provider.ts",
+    "mcp-callback-server.ts",
+    "mcp-auth-flow.ts",
+    "mcp-panel.ts",
+    "panel-keys.ts",
+    "mcp-trace.ts",
+    "logger.ts",
+    "errors.ts",
+    "app-bridge.bundle.js",
+    "banner.png",
+    "skills",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
+  "dependencies": {
+    "@modelcontextprotocol/client": "2.0.0",
+    "@modelcontextprotocol/core": "2.0.0",
+    "@modelcontextprotocol/ext-apps": "^1.2.2",
+    "@napi-rs/keyring": "^1.3.0",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
+    "cross-spawn": "^7.0.6",
+    "open": "^10.2.0",
+    "recheck": "^4.5.0",
+    "smol-toml": "^1.6.1",
+    "strip-json-comments": "^5.0.3",
+    "zod": "^3.25.0 || ^4.0.0"
+  },
+  "peerDependencies": {
+    "@earendil-works/pi-ai": "^0.84.1",
+    "@earendil-works/pi-tui": "*",
+    "typebox": "*",
+    "zod": "^3.25.0 || ^4.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@earendil-works/pi-ai": {
+      "optional": true
+    },
+    "@earendil-works/pi-tui": {
+      "optional": true
+    },
+    "typebox": {
+      "optional": true
+    }
+  },
+  "devDependencies": {
+    "@earendil-works/pi-ai": "^0.84.1",
+    "@earendil-works/pi-coding-agent": "0.84.1",
+    "@earendil-works/pi-tui": "^0.84.1",
+    "@modelcontextprotocol/conformance": "0.1.16",
+    "@types/bun": "^1.0.0",
+    "@types/cross-spawn": "6.0.6",
+    "@types/node": "20.19.43",
+    "@types/open": "^6.2.1",
+    "tsx": "^4.21.0",
+    "typebox": "1.3.3",
+    "typescript": "5.9.3",
+    "vitest": "^3.0.0"
+  }
 }