@humain/terminal 0.0.3-beta.3 → 0.0.4-beta.2

package/dist/humain/mcp-adapter/vendor/package-mcp-loader.ts

@@ -0,0 +1,168 @@
+import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { isAbsolute, join, relative, resolve, sep } from "node:path";
+import stripJsonComments from "strip-json-comments";
+import { getAgentDir, getConfigDirName } from "./agent-dir.ts";
+import type { McpConfig, ServerEntry } from "./types.ts";
+
+interface PackageSetting {
+  source: string;
+}
+
+interface PackageManifest {
+  name?: unknown;
+  pi?: { mcp?: unknown };
+}
+
+export function loadPackageMcpConfigs(cwd = process.cwd()): McpConfig {
+  const mcpServers: Record<string, ServerEntry> = {};
+  const seen = new Set<string>();
+
+  for (const packageRoot of getConfiguredPackageRoots(cwd)) {
+    const manifest = readPackageManifest(packageRoot);
+    if (!manifest || typeof manifest.name !== "string" || !manifest.name) continue;
+    const paths = getManifestMcpPaths(manifest.pi?.mcp, manifest.name);
+    if (!paths) continue;
+
+    const packagePrefix = formatPackageName(manifest.name);
+    const packageServers = new Set<string>();
+    for (const path of paths) {
+      const configPath = resolvePackageConfigPath(packageRoot, path);
+      if (!configPath) {
+        console.warn(`Pi package ${manifest.name} skips MCP config ${path}: file must stay inside the package`);
+        continue;
+      }
+
+      const config = readMcpConfig(configPath, manifest.name);
+      if (!config) continue;
+      for (const [serverName, server] of Object.entries(config.mcpServers)) {
+        const normalizedName = `${packagePrefix}__${formatServerName(serverName)}`;
+        if (packageServers.has(normalizedName) || seen.has(normalizedName)) {
+          console.warn(`Pi package ${manifest.name} skips duplicate normalized MCP server ${normalizedName}`);
+          continue;
+        }
+        packageServers.add(normalizedName);
+        seen.add(normalizedName);
+        mcpServers[normalizedName] = server;
+      }
+    }
+  }
+
+  return { mcpServers };
+}
+
+function getConfiguredPackageRoots(cwd: string): string[] {
+  const roots: string[] = [];
+  for (const [settingsPath, scope] of [
+    [join(cwd, getConfigDirName(), "settings.json"), "project"],
+    [join(getAgentDir(), "settings.json"), "user"],
+  ] as const) {
+    const settings = readOptionalJson(settingsPath, `${scope} Pi settings`);
+    if (settings === undefined) continue;
+    if (typeof settings !== "object" || settings === null || Array.isArray(settings)) {
+      throw new Error(`${scope} Pi settings ${settingsPath} must be a JSON object`);
+    }
+    const packages = (settings as { packages?: unknown }).packages;
+    if (packages === undefined) continue;
+    if (!Array.isArray(packages)) throw new Error(`${scope} Pi settings ${settingsPath} packages must be an array`);
+    for (const entry of packages) {
+      const source = typeof entry === "string"
+        ? entry
+        : entry && typeof entry === "object" && !Array.isArray(entry) && typeof (entry as PackageSetting).source === "string"
+          ? (entry as PackageSetting).source
+          : undefined;
+      if (!source) throw new Error(`${scope} Pi settings ${settingsPath} package entries must be strings or objects with a string source`);
+      const root = resolvePackageRoot(source, scope, cwd);
+      if (root && !roots.includes(root)) roots.push(root);
+    }
+  }
+  return roots;
+}
+
+function resolvePackageRoot(source: string, scope: "user" | "project", cwd: string): string | null {
+  const baseDir = scope === "user" ? getAgentDir() : join(cwd, getConfigDirName());
+  if (source.startsWith("npm:")) {
+    const name = source.slice(4).trim().match(/^(@?[^@]+(?:\/[^@]+)?)/)?.[1];
+    return name ? resolveContainedPath(join(baseDir, "npm", "node_modules"), name) : null;
+  }
+  const gitSource = source.startsWith("git:")
+    ? source.slice(4).trim()
+    : /^(?:(?:https?|ssh):\/\/|git@[^:]+:)/.test(source) ? source : null;
+  if (gitSource) {
+    const value = gitSource
+      .replace(/^ssh:\/\/git@/, "")
+      .replace(/^git@([^:]+):/, "$1/")
+      .replace(/^[a-z]+:\/\//i, "");
+    const path = value.replace(/@[^/]+$/, "").replace(/\.git$/, "");
+    return path && !path.startsWith("/") ? resolveContainedPath(join(baseDir, "git"), path) : null;
+  }
+  return isAbsolute(source) ? resolve(source) : resolve(baseDir, source);
+}
+
+function readPackageManifest(packageRoot: string): PackageManifest | null {
+  const manifest = readOptionalJson(join(packageRoot, "package.json"), `Pi package manifest ${packageRoot}`);
+  return manifest && typeof manifest === "object" && !Array.isArray(manifest) ? manifest as PackageManifest : null;
+}
+
+function getManifestMcpPaths(value: unknown, packageName: string): string[] | null {
+  const paths = typeof value === "string" ? [value] : Array.isArray(value) && value.every((path): path is string => typeof path === "string") ? value : null;
+  if (value !== undefined && !paths) console.warn(`Pi package ${packageName} ignores invalid pi.mcp manifest entry`);
+  return paths;
+}
+
+function readMcpConfig(path: string, packageName: string): McpConfig | null {
+  const config = readRequiredJson(path, `Pi package ${packageName} MCP config`);
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error(`Pi package ${packageName} MCP config ${path} must be a JSON object`);
+  }
+  const servers = (config as { mcpServers?: unknown }).mcpServers;
+  if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
+    throw new Error(`Pi package ${packageName} MCP config ${path} must contain a JSON object mcpServers field`);
+  }
+  const mcpServers: Record<string, ServerEntry> = {};
+  for (const [name, server] of Object.entries(servers)) {
+    if (!server || typeof server !== "object" || Array.isArray(server)) {
+      throw new Error(`Pi package ${packageName} MCP config ${path} server ${name} must be a JSON object`);
+    }
+    mcpServers[name] = server as ServerEntry;
+  }
+  return { mcpServers };
+}
+
+function readRequiredJson(path: string, description: string): unknown {
+  try {
+    return JSON.parse(stripJsonComments(readFileSync(path, "utf8"), { trailingCommas: true }));
+  } catch (error) {
+    throw new Error(`${description} ${path} contains invalid JSON: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+  }
+}
+
+function readOptionalJson(path: string, description: string): unknown | undefined {
+  if (!existsSync(path)) return undefined;
+  return readRequiredJson(path, description);
+}
+
+function resolveContainedPath(root: string, path: string): string | null {
+  const resolved = resolve(root, path);
+  const rel = relative(root, resolved);
+  return rel === "" || (!rel.startsWith("..") && !rel.startsWith(sep) && !isAbsolute(rel)) ? resolved : null;
+}
+
+function resolvePackageConfigPath(packageRoot: string, path: string): string | null {
+  const lexicalPath = resolveContainedPath(packageRoot, path);
+  if (!lexicalPath || !existsSync(lexicalPath) || !statSync(lexicalPath).isFile()) return null;
+  try {
+    const realPackageRoot = realpathSync(packageRoot);
+    const realConfigPath = realpathSync(lexicalPath);
+    return resolveContainedPath(realPackageRoot, realConfigPath);
+  } catch {
+    return null;
+  }
+}
+
+function formatPackageName(name: string): string {
+  return name.replace(/[^A-Za-z0-9_-]+/g, "_").replace(/^[_-]+|[_-]+$/g, "") || "package";
+}
+
+function formatServerName(name: string): string {
+  return name.replace(/[^A-Za-z0-9_-]+/g, "_").replace(/^[_-]+|[_-]+$/g, "") || "server";
+}

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

@@ -1,179 +1,181 @@
 {
-  "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"
-  }
+	"name": "pi-mcp-adapter",
+	"version": "2.27.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",
+		"package-mcp-loader.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-bearer-store.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.2",
+		"@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.2",
+		"@earendil-works/pi-coding-agent": "0.84.1",
+		"@earendil-works/pi-tui": "^0.84.2",
+		"@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"
+	}
 }

package/dist/humain/mcp-adapter/vendor/proxy-modes.ts

@@ -13,7 +13,7 @@ import { reconstructPromptMetadata } from "./metadata-cache.ts";
 import { resolveMcpResultContent, transformMcpContent, transformMcpResourceContents } from "./tool-registrar.ts";
 import { guardMcpOutput, guardedMcpDetails, resolveMcpOutputGuardOptions } from "./mcp-output-guard.ts";
 import { maybeStartUiSession, summarizeUiSessionResult, type UiSessionRuntime } from "./ui-session.ts";
-import { formatAuthRequiredMessage, formatMcpStatus, resolveServerUrl, truncateAtWord } from "./utils.ts";
+import { formatAuthRequiredMessage, formatMcpStatus, normalizeToolArguments, resolveServerUrl, truncateAtWord } from "./utils.ts";
 import { authenticate, completeAuthFromInput, startAuth, supportsOAuth } from "./mcp-auth-flow.ts";
 import { SessionRecoveryAuthRequiredError, withSessionRecovery } from "./session-recovery.ts";
 import { paginate, rankSuggestions, rankToolMatches, resolveSearchKeywords } from "./search-ranking.ts";
@@ -1136,11 +1136,12 @@ export async function executeCall(
     return disabledCallResult(serverName, toolMeta);
   }
 
+  const normalizedArgs = toolMeta.resourceUri ? args ?? {} : normalizeToolArguments(args);
   const approval = await ensureToolCallApproved(
     state,
     serverName,
     toolMeta,
-    args,
+    normalizedArgs,
     ownedSignal,
     origin ?? (toolMeta.resourceUri ? "resource" : "proxy"),
   );
@@ -1217,7 +1218,7 @@ export async function executeCall(
       ? await maybeStartUiSession(state, {
           serverName,
           toolName: toolMeta.originalName,
-          toolArgs: args ?? {},
+          toolArgs: normalizedArgs,
           uiResourceUri: toolMeta.uiResourceUri,
           ...(toolMeta.uiStreamMode !== undefined ? { streamMode: toolMeta.uiStreamMode } : {}),
           ...(signal ? { signal } : {}),
@@ -1235,7 +1236,7 @@ export async function executeCall(
       serverName,
       (conn) => abortable(conn.client.callTool({
         name: toolMeta.originalName,
-        arguments: args ?? {},
+        arguments: normalizedArgs,
         _meta: uiSession?.requestMeta,
       }, requestOptions), ownedSignal),
     );