@yanlinglabs/winter-agent-runtime 0.0.32 → 0.0.34

package/dist/embedded-worker.js

@@ -1,15 +1,15 @@
-import"./index-qdang0ag.js";
+import"./index-rprst8z5.js";
 import {
   liveProcessGroups,
   onProcessGroupChange
-} from "./index-9s68t0pd.js";
-import"./index-z6s3r4xm.js";
-import"./index-bgeqc7ax.js";
+} from "./index-1hef2gff.js";
+import"./index-mwew595z.js";
+import"./index-2wgfv0pa.js";
 import"./index-bef62z3r.js";
-import"./index-yg5ve6sg.js";
+import"./index-dske1c00.js";
 import {
   runEmbeddedSession2
-} from "./index-y8vfq85w.js";
+} from "./index-1bcfabm4.js";
 import {
   Queue
 } from "./index-97t2rmtf.js";

package/dist/embedded.js

@@ -1,12 +1,12 @@
 import {
   runEmbeddedSession2
-} from "./index-y8vfq85w.js";
-import"./index-yg5ve6sg.js";
-import"./index-qdang0ag.js";
-import"./index-bgeqc7ax.js";
+} from "./index-1bcfabm4.js";
+import"./index-dske1c00.js";
+import"./index-rprst8z5.js";
+import"./index-2wgfv0pa.js";
 import"./index-bef62z3r.js";
-import"./index-9s68t0pd.js";
-import"./index-z6s3r4xm.js";
+import"./index-1hef2gff.js";
+import"./index-mwew595z.js";
 export {
   runEmbeddedSession2 as runEmbeddedSession
 };

package/dist/hooks/runner.d.ts

@@ -1,4 +1,4 @@
-import type { HookEvent, HookPermissionDecision } from "@yanlinglabs/winter-agent-sdk";
+import type { HookEvent, HookPermissionDecision, McpServerIdentity } from "@yanlinglabs/winter-agent-sdk";
 import { type HookRegistry } from "./registry.js";
 import { type HookComposite } from "./reducer.js";
 import type { AsyncHookQueue } from "./async-hooks.js";
@@ -17,6 +17,12 @@ export interface HookInvocationRequest {
      */
     mcpServerName?: string;
     mcpToolName?: string;
+    /**
+     * WS-27: the exact server identity (`mcpServerIdentity` below) -- PreToolUse/PostToolUse/
+     * PostToolUseFailure only (`MCP_SERVER_IDENTITY_EVENTS`). Both input builders turn it into
+     * `winter_mcp_server`.
+     */
+    mcpServer?: McpServerIdentity;
     input?: Record<string, unknown>;
     payload?: unknown;
     policyVersion: string;
@@ -29,6 +35,9 @@ export interface McpToolProvenanceInfo {
     tool: string;
 }
 export declare function mcpToolProvenance(toolName: string): McpToolProvenanceInfo | undefined;
+export declare function mcpServerIdentity(toolName: string, renames?: Readonly<Record<string, string>>): McpServerIdentity | undefined;
+/** The events whose input carries `winter_mcp_server` (the pinned WS-27 contract). */
+export declare const MCP_SERVER_IDENTITY_EVENTS: ReadonlySet<HookEvent>;
 export interface HookInvoker {
     invoke(request: HookInvocationRequest, opts: {
         signal: AbortSignal;
@@ -77,6 +86,8 @@ export declare function isGatingHookEvent(event: HookEvent): boolean;
 export interface RunHooksCallInfo {
     toolUseID?: string;
     toolName?: string;
+    /** WS-27: the called tool's server identity, as the ENGINE computed it (`mcpServerIdentity`, from the name the model called). Never derived here. */
+    mcpServer?: McpServerIdentity;
     input?: Record<string, unknown>;
     payload?: unknown;
 }

package/dist/{index-y8vfq85w.js → index-1bcfabm4.js}

@@ -9,14 +9,14 @@ import {
   resolveEngineSession2,
   resolveProductionWinterHome2,
   resolveProductionStoreHome
-} from "./index-qdang0ag.js";
+} from "./index-rprst8z5.js";
 import {
   registerDefaultChildEngineFactory,
   loadResumedChain,
   buildProductionWiring,
   withAutoSkillPermissions,
   restoreChildRoster
-} from "./index-yg5ve6sg.js";
+} from "./index-dske1c00.js";
 
 // src/embedded.ts
 import { splitFrames, encodeFrame } from "@yanlinglabs/winter-agent-sdk";

package/dist/{index-9s68t0pd.js → index-1hef2gff.js}

@@ -4,7 +4,7 @@ import {
   MCP_OAUTH_SESSION_CACHE_MS2,
   readTokenRecordLenient,
   refreshMcpOAuthToken2
-} from "./index-z6s3r4xm.js";
+} from "./index-mwew595z.js";
 
 // src/process-groups.ts
 var live = new Map;
@@ -46,6 +46,7 @@ function onProcessGroupChange(listener) {
 // src/mcp/elicitation.ts
 var MCP_ELICITATION_SUBTYPE = "mcp_elicitation";
 var DETERMINISTIC_DECLINE = { action: "decline" };
+var CANCELLED = { action: "cancel" };
 function isElicitationAction(value) {
   return value === "accept" || value === "decline" || value === "cancel";
 }
@@ -64,11 +65,17 @@ function createElicitationAsker2(sender) {
   if (!sender) {
     return async () => DETERMINISTIC_DECLINE;
   }
-  return async (payload) => {
+  return async (payload, opts) => {
+    const signal = opts?.signal;
+    const cancelled = () => signal?.aborted === true;
+    if (cancelled())
+      return CANCELLED;
     let raw;
     try {
-      raw = await sender.request(MCP_ELICITATION_SUBTYPE, payload);
+      raw = await sender.request(MCP_ELICITATION_SUBTYPE, payload, signal !== undefined ? { signal } : undefined);
     } catch {
+      if (cancelled())
+        return CANCELLED;
       return DETERMINISTIC_DECLINE;
     }
     return toResultPayload(raw);
@@ -94,10 +101,12 @@ function rawElicitParamsOf(params) {
     ...p.requestedSchema !== undefined ? { requestedSchema: p.requestedSchema } : {}
   };
 }
-function installElicitationHandler(client, serverName, ask) {
-  client.setRequestHandler("elicitation/create", async (request) => {
+function installElicitationHandler(client, serverName, ask, callScope) {
+  client.setRequestHandler("elicitation/create", async (request, ctx) => {
     const payload = buildElicitationPayload(serverName, rawElicitParamsOf(request.params));
-    const result = await ask(payload);
+    const signals = [ctx?.mcpReq?.signal, callScope?.()].filter((s) => s !== undefined);
+    const signal = signals.length === 0 ? undefined : signals.length === 1 ? signals[0] : AbortSignal.any(signals);
+    const result = await ask(payload, signal !== undefined ? { signal } : undefined);
     if (result.content === undefined)
       return { action: result.action };
     const content = toWireElicitContent(result.content);
@@ -585,7 +594,22 @@ async function connectOnce(opts, mode, connectTimeoutMs, probeTimeoutMs) {
         }
       } : {}
     });
-    installElicitationHandler(client, name, elicitationAsk);
+    const callsInFlight = new Set;
+    const callScope = () => {
+      if (callsInFlight.size === 0)
+        return;
+      const ended = new AbortController;
+      let remaining = callsInFlight.size;
+      const settle = () => {
+        remaining--;
+        if (remaining === 0)
+          ended.abort();
+      };
+      for (const call of callsInFlight)
+        call.then(settle, settle);
+      return ended.signal;
+    };
+    installElicitationHandler(client, name, elicitationAsk, callScope);
     await raceConnect(client, transport, connectTimeoutMs);
     const protocolVersion = client.getNegotiatedProtocolVersion();
     let closed = false;
@@ -629,7 +653,18 @@ async function connectOnce(opts, mode, connectTimeoutMs, probeTimeoutMs) {
         });
       },
       async callTool(toolName, args, callOpts) {
-        const result = await client.callTool({ name: toolName, arguments: args }, callOpts?.timeoutMs !== undefined ? { timeout: callOpts.timeoutMs } : undefined);
+        const requestOpts = {
+          ...callOpts?.timeoutMs !== undefined ? { timeout: callOpts.timeoutMs } : {},
+          ...callOpts?.signal !== undefined ? { signal: callOpts.signal } : {}
+        };
+        const call = client.callTool({ name: toolName, arguments: args }, Object.keys(requestOpts).length > 0 ? requestOpts : undefined);
+        callsInFlight.add(call);
+        let result;
+        try {
+          result = await call;
+        } finally {
+          callsInFlight.delete(call);
+        }
         return {
           content: result.content ?? [],
           ...result.isError === true ? { isError: true } : {}

package/dist/{index-bgeqc7ax.js → index-2wgfv0pa.js}

@@ -1,7 +1,7 @@
 import {
   evaluateMcpAuthUrl2,
   isLoopbackMcpServer
-} from "./index-z6s3r4xm.js";
+} from "./index-mwew595z.js";
 
 // src/mcp-auth/config.ts
 var OAUTH_KEYS = new Set(["clientId", "clientSecretRef", "callbackPort", "authServerMetadataUrl", "scopes"]);

package/dist/{index-yg5ve6sg.js → index-dske1c00.js}

@@ -85,7 +85,7 @@ import {
   providerCredentialRef2,
   createModelClassifier2,
   selectClassifierRoute2
-} from "./index-qdang0ag.js";
+} from "./index-rprst8z5.js";
 import {
   createKeychainCredentialStore,
   createKeychainSecretReader,
@@ -95,7 +95,7 @@ import {
   mcpOAuthTestStoreEnvName,
   resolveSessionMcpOAuthStore,
   createHostBrokeredMcpOAuthStore
-} from "./index-z6s3r4xm.js";
+} from "./index-mwew595z.js";
 import {
   createInMemoryChannel2
 } from "./index-97t2rmtf.js";

package/dist/{index-z6s3r4xm.js → index-mwew595z.js}

@@ -421,8 +421,39 @@ import { DEFAULT_KEYCHAIN_SERVICE as DEFAULT_KEYCHAIN_SERVICE2, envName, WINTER_
 
 // src/provider/keychain-store.ts
 import { CredentialResolutionError, redactRef } from "@yanlinglabs/winter-provider-runtime";
-import { DEFAULT_KEYCHAIN_SERVICE } from "@yanlinglabs/winter-agent-sdk";
+import { DEFAULT_KEYCHAIN_SERVICE, TEST_KEYCHAIN_ENV, TEST_KEYCHAIN_MEMORY } from "@yanlinglabs/winter-agent-sdk";
+var memorySecrets = new Map;
+var memoryKey = (service, name) => `${service}\x00${name}`;
+var MEMORY_SECRETS_BACKEND = {
+  async get({ service, name }) {
+    return memorySecrets.get(memoryKey(service, name)) ?? null;
+  },
+  async set({ service, name, value }) {
+    memorySecrets.set(memoryKey(service, name), value);
+  },
+  async delete({ service, name }) {
+    return memorySecrets.delete(memoryKey(service, name));
+  }
+};
+var memoryBackendAnnounced = false;
+function announceMemoryBackend() {
+  if (memoryBackendAnnounced)
+    return;
+  memoryBackendAnnounced = true;
+  try {
+    process.stderr.write(`winter: ${TEST_KEYCHAIN_ENV}=${TEST_KEYCHAIN_MEMORY} -- the Keychain is replaced by an in-memory store for this process (test runs only)
+`);
+  } catch {}
+}
 function defaultSecretsBackend() {
+  const redirect = process.env[TEST_KEYCHAIN_ENV];
+  if (redirect !== undefined && redirect !== "") {
+    if (redirect === TEST_KEYCHAIN_MEMORY) {
+      announceMemoryBackend();
+      return MEMORY_SECRETS_BACKEND;
+    }
+    throw new CredentialResolutionError("io", `${TEST_KEYCHAIN_ENV} is set to an unrecognized value; the only accepted value is "${TEST_KEYCHAIN_MEMORY}" (test runs only) -- unset it to use the Keychain`);
+  }
   const secrets = globalThis.Bun?.secrets;
   if (secrets === undefined) {
     throw new CredentialResolutionError("unsupported", "the Keychain credential store requires Bun.secrets, which is unavailable in this runtime");