@humain/terminal 0.1.1 → 0.2.2

package/dist/humain/mcp-adapter/vendor/runtime-owner.ts

@@ -52,7 +52,22 @@ export function combineAbortSignals(...signals: Array<AbortSignal | undefined>):
   const active = signals.filter((signal): signal is AbortSignal => signal !== undefined);
   if (active.length === 0) return undefined;
   if (active.length === 1) return active[0];
-  return AbortSignal.any(active);
+  if (typeof AbortSignal.any === "function") return AbortSignal.any(active);
+
+  // AbortSignal.any was added after Node 20.0.0, our minimum supported version.
+  const controller = new AbortController();
+  const alreadyAborted = active.find(signal => signal.aborted);
+  if (alreadyAborted) {
+    controller.abort(alreadyAborted.reason);
+    return controller.signal;
+  }
+
+  const onAbort = (event: Event) => {
+    for (const signal of active) signal.removeEventListener("abort", onAbort);
+    controller.abort((event.target as AbortSignal).reason);
+  };
+  for (const signal of active) signal.addEventListener("abort", onAbort, { once: true });
+  return controller.signal;
 }
 
 /** Fence session-bound UI calls after the owning extension runtime stops. */

package/dist/humain/mcp-adapter/vendor/sampling-handler.ts

@@ -1,5 +1,4 @@
-import { complete } from "@earendil-works/pi-ai/compat";
-import type { Api, AssistantMessage, Message, Model, ProviderHeaders, TextContent } from "@earendil-works/pi-ai";
+import type { Api, AssistantMessage, Message, Model, TextContent } from "@earendil-works/pi-ai";
 import { truncateAtWord } from "./utils.ts";
 import { throwIfAborted } from "./abort.ts";
 import type { ExtensionUIContext, ModelRegistry } from "@earendil-works/pi-coding-agent";
@@ -13,7 +12,7 @@ import {
 } from "@modelcontextprotocol/client";
 
 export type SamplingUIContext = Pick<ExtensionUIContext, "confirm">;
-export type SamplingModelRegistry = Pick<ModelRegistry, "getAvailable" | "getApiKeyAndHeaders">;
+export type SamplingModelRegistry = Pick<ModelRegistry, "getAvailable" | "complete">;
 
 export interface SamplingHandlerOptions {
   serverName: string;
@@ -57,7 +56,7 @@ export async function handleSamplingRequest(
   }
 
   const messages = params.messages.map(convertSamplingMessage);
-  const { model, apiKey, headers } = await resolveSamplingModel(options, params.modelPreferences);
+  const model = resolveSamplingModel(options, params.modelPreferences);
   throwIfAborted(signal);
   await confirmSampling(
     options,
@@ -66,15 +65,13 @@ export async function handleSamplingRequest(
   );
   throwIfAborted(signal);
 
-  const result = await complete(
+  const result = await options.modelRegistry.complete(
     model,
     {
       ...(params.systemPrompt !== undefined ? { systemPrompt: params.systemPrompt } : {}),
       messages,
     },
     {
-      ...(apiKey !== undefined ? { apiKey } : {}),
-      ...(headers !== undefined ? { headers } : {}),
       maxTokens: params.maxTokens,
       ...(params.temperature !== undefined ? { temperature: params.temperature } : {}),
       ...(params.metadata !== undefined ? { metadata: params.metadata as Record<string, unknown> } : {}),
@@ -124,14 +121,10 @@ function messageText(message: Message): string {
   }).join("\n");
 }
 
-async function resolveSamplingModel(
+function resolveSamplingModel(
   options: SamplingHandlerOptions,
   modelPreferences: ModelPreferences | undefined,
-): Promise<{
-  model: Model<Api>;
-  apiKey?: string;
-  headers?: ProviderHeaders;
-}> {
+): Model<Api> {
   const candidates: Model<Api>[] = [];
   const availableModels = options.modelRegistry.getAvailable();
 
@@ -153,26 +146,10 @@ async function resolveSamplingModel(
     addSamplingCandidate(candidates, model);
   }
 
-  const errors: string[] = [];
   const signal = options.getSignal();
-  for (const model of candidates) {
-    throwIfAborted(signal);
-    const auth = await options.modelRegistry.getApiKeyAndHeaders(model);
-    throwIfAborted(signal);
-    if (auth.ok === false) {
-      errors.push(`${model.provider}/${model.id}: ${auth.error}`);
-      continue;
-    }
-    return {
-      model,
-      ...(auth.apiKey !== undefined ? { apiKey: auth.apiKey } : {}),
-      ...(auth.headers !== undefined ? { headers: auth.headers } : {}),
-    };
-  }
-
-  if (errors.length > 0) {
-    throw new Error(`No configured auth for MCP sampling model. ${errors.join("; ")}`);
-  }
+  throwIfAborted(signal);
+  const model = candidates[0];
+  if (model) return model;
   throw new Error("No Pi model is available for MCP sampling");
 }
 

package/dist/humain/mcp-adapter/vendor/sandbox-proxy-template.ts

@@ -7,17 +7,22 @@ export const SANDBOX_PROXY_SANDBOX =
   "allow-scripts allow-forms allow-modals allow-popups allow-downloads allow-same-origin";
 export const SANDBOX_INNER_SANDBOX = SANDBOX_PROXY_SANDBOX;
 export const SANDBOX_PROXY_PATH = "/sandbox";
+export const SANDBOX_RESOURCE_PATH_PREFIX = "/resource/";
 
 export interface SandboxProxyTemplateInput {
   parentOrigin: string;
+  resourcePath: string;
+  allowAttribute: string;
 }
 
 /**
  * Build the static document used by the trusted, second-origin sandbox proxy.
- * The only per-session value is the exact origin of the parent host.
+ * The per-session values are the exact parent host origin and opaque resource path.
  */
 export function buildSandboxProxyHtml(input: SandboxProxyTemplateInput): string {
   const parentOrigin = safeInlineJSON(input.parentOrigin);
+  const resourcePath = safeInlineJSON(input.resourcePath);
+  const allowAttribute = escapeHtmlAttribute(input.allowAttribute);
 
   return `<!doctype html>
 <html lang="en">
@@ -31,17 +36,21 @@ export function buildSandboxProxyHtml(input: SandboxProxyTemplateInput): string
   </style>
 </head>
 <body>
-  <iframe id="mcp-app" title="MCP App" sandbox="${SANDBOX_INNER_SANDBOX}" referrerpolicy="no-referrer"></iframe>
+  <iframe id="mcp-app" title="MCP App" sandbox="${SANDBOX_INNER_SANDBOX}" allow="${allowAttribute}" referrerpolicy="no-referrer"></iframe>
   <script>
     const EXPECTED_PARENT_ORIGIN = ${parentOrigin};
+    const RESOURCE_PATH = ${resourcePath};
     const SANDBOX_PROXY_READY_METHOD = "ui/notifications/sandbox-proxy-ready";
     const SANDBOX_RESOURCE_READY_METHOD = "ui/notifications/sandbox-resource-ready";
-    const INNER_SANDBOX = ${safeInlineJSON(SANDBOX_INNER_SANDBOX)};
     const MAX_PENDING_MESSAGES = 64;
     const innerFrame = document.getElementById("mcp-app");
     const pendingToInner = [];
     let innerReady = false;
 
+    innerFrame.addEventListener("load", () => {
+      if (innerFrame.getAttribute("src") === RESOURCE_PATH) flushPendingMessages();
+    });
+
     const isObject = (value) => value !== null && typeof value === "object";
     const isMessageFromParent = (event) =>
       event.source === window.parent && event.origin === EXPECTED_PARENT_ORIGIN;
@@ -68,99 +77,13 @@ export function buildSandboxProxyHtml(input: SandboxProxyTemplateInput): string
       }
     };
 
-    const sanitizeDomains = (domains) => {
-      if (!Array.isArray(domains)) return [];
-      return [...new Set(domains.filter((domain) =>
-        typeof domain === "string" &&
-        domain.length > 0 &&
-        /^[\\x21-\\x7E]+$/.test(domain) &&
-        !/[;'\"]/.test(domain),
-      ))];
-    };
-
-    const toDirective = (name, trustedSources, domains) =>
-      name + " " + [...new Set([...trustedSources, ...domains])].join(" ");
-
-    const buildResourceCsp = (csp) => {
-      const resourceDomains = sanitizeDomains(csp?.resourceDomains);
-      const connectDomains = sanitizeDomains(csp?.connectDomains);
-      const frameDomains = sanitizeDomains(csp?.frameDomains);
-      const baseUriDomains = sanitizeDomains(csp?.baseUriDomains);
-      return [
-        "default-src 'none'",
-        "sandbox " + INNER_SANDBOX,
-        toDirective("script-src", ["'self'", "'unsafe-inline'"], resourceDomains),
-        toDirective("style-src", ["'self'", "'unsafe-inline'"], resourceDomains),
-        toDirective("font-src", ["'self'"], resourceDomains),
-        toDirective("img-src", ["'self'", "data:"], resourceDomains),
-        toDirective("media-src", ["'self'", "data:"], resourceDomains),
-        connectDomains.length > 0 ? "connect-src " + connectDomains.join(" ") : "connect-src 'none'",
-        frameDomains.length > 0 ? "frame-src " + frameDomains.join(" ") : "frame-src 'none'",
-        "worker-src 'none'",
-        "object-src 'none'",
-        baseUriDomains.length > 0 ? "base-uri " + baseUriDomains.join(" ") : "base-uri 'self'",
-      ].join("; ");
-    };
-
-    const escapeAttribute = (value) => value
-      .replace(/&/g, "&amp;")
-      .replace(/\"/g, "&quot;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;");
-
-    const injectCsp = (html, csp) => {
-      const meta = '<meta http-equiv="Content-Security-Policy" content="' + escapeAttribute(csp) + '">';
-      const head = html.match(/<head(?:\\s[^>]*)?>/i);
-      if (head && head.index !== undefined) {
-        const end = head.index + head[0].length;
-        return html.slice(0, end) + meta + html.slice(end);
-      }
-      return meta + html;
-    };
-
-    const safeSandbox = (requested) => {
-      const requestedTokens = typeof requested === "string" ? requested.split(/\\s+/) : [];
-      const allowedTokens = new Set(INNER_SANDBOX.split(" "));
-      const tokens = requestedTokens.filter((token) => allowedTokens.has(token));
-      // Provider HTML needs both script execution and a real proxy-origin
-      // storage context. Never accept popup escape or top-navigation tokens.
-      return [...new Set([
-        "allow-scripts",
-        "allow-same-origin",
-        ...tokens,
-      ])].filter((token) => allowedTokens.has(token)).join(" ");
-    };
-
-    const buildAllowAttribute = (permissions) => {
-      if (!isObject(permissions) || Array.isArray(permissions)) return "";
-      const allowed = [];
-      if (permissions.camera) allowed.push("camera");
-      if (permissions.microphone) allowed.push("microphone");
-      if (permissions.geolocation) allowed.push("geolocation");
-      if (permissions.clipboardWrite) allowed.push("clipboard-write");
-      return allowed.join("; ");
-    };
-
-    const loadResource = (params) => {
-      if (!isObject(params) || typeof params.html !== "string" || !innerFrame.contentDocument) return;
-      innerFrame.setAttribute("sandbox", safeSandbox(params.sandbox));
-      const allow = buildAllowAttribute(params.permissions);
-      if (allow) innerFrame.setAttribute("allow", allow);
-      else innerFrame.removeAttribute("allow");
-      innerReady = false;
-      const document = innerFrame.contentDocument;
-      document.open();
-      document.write(injectCsp(params.html, buildResourceCsp(params.csp)));
-      document.close();
-      flushPendingMessages();
-    };
-
     window.addEventListener("message", (event) => {
       if (isMessageFromParent(event)) {
         const data = event.data;
         if (!isObject(data)) return;
         if (data.method === SANDBOX_RESOURCE_READY_METHOD) {
-          loadResource(data.params);
+          innerReady = false;
+          innerFrame.setAttribute("src", RESOURCE_PATH);
           return;
         }
         if (data.method === SANDBOX_PROXY_READY_METHOD) return;
@@ -186,10 +109,14 @@ export function buildSandboxProxyHtml(input: SandboxProxyTemplateInput): string
 </html>`;
 }
 
+function escapeHtmlAttribute(value: string): string {
+  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+
 /**
  * CSP for the proxy document itself. It contains only the inline relay script
- * and a nested about:blank frame; provider policy is applied separately after
- * the host sends the resource-ready notification.
+ * and a same-origin nested frame. Provider policy is applied on the resource
+ * navigation response, not inherited from this relay document.
  */
 export function buildSandboxProxyCsp(): string {
   return [