agentfootprint 10.3.1 → 10.5.0

package/dist/esm/lib/abort.js

@@ -0,0 +1,322 @@
+/**
+ * abort — the ONE owner of how the library honours a cancellation.
+ *
+ * Pattern: Small pure helpers over `AbortSignal`. No state between calls.
+ * Role:    Leaf. Every provider adapter, the provider decorators and the
+ *          agent's own provider calls stop through these, so "the caller
+ *          cancelled" means the same thing at every layer. Two adapters
+ *          (Ollama, Foundry Local) each kept a private copy of the first
+ *          three helpers and the classifier kept a third; most adapters kept
+ *          none, and an aborted run left their remote calls running — and
+ *          billing. `test/architecture/abortOwner.test.ts` refuses a fourth.
+ * Emits:   N/A.
+ *
+ * ── THE LAW ──────────────────────────────────────────────────────────────
+ * Once a request's signal has fired:
+ *   1. nothing more is SENT — `throwIfAborted` before every dispatch, because
+ *      an already-aborted signal never dispatches another 'abort' event, so a
+ *      listener alone cannot see it;
+ *   2. nothing more is WAITED FOR — `untilAborted` races every wait (the
+ *      response, a body read, a stream's next chunk) against the signal, so a
+ *      transport that ignores its signal still cannot hold the call open;
+ *   3. nothing more is READ — `abortableIterable` closes the source (its
+ *      iterator's `return()`, plus the caller's own `close`, e.g. an SDK
+ *      stream's `abort()`), so the socket is released and the server stops
+ *      generating for nobody;
+ *   4. nothing that arrives LATE counts — a response or chunk that lands after
+ *      the abort is refused with the abort, never returned as a success, so it
+ *      cannot be recorded as an answer or billed into a run's usage.
+ *
+ * ── WHAT AN ABORT REACHES THE CALLER AS ──────────────────────────────────
+ * The signal's own `reason` when it is an `Error` — what every runtime
+ * supplies (a `DOMException` named 'AbortError', or 'TimeoutError' for
+ * `AbortSignal.timeout`), and what a caller who passed their own reason
+ * expects back. Anything else becomes an `Error` named 'AbortError' that keeps
+ * the reason as `cause`. An abort is the caller's word: it is never dressed up
+ * as a provider failure, never retried, never fallen back from.
+ */
+/**
+ * The error an aborted wait rejects with. See the module notes.
+ *
+ * Never throws. A reason that cannot even be classified (a revoked `Proxy`,
+ * one whose `getPrototypeOf` throws) becomes a plain `AbortError` WITHOUT it:
+ * this runs inside abort listeners, where a throw would escape as an uncaught
+ * exception and leave the wait it should end unsettled.
+ */
+export function abortErrorOf(signal) {
+    let reason;
+    try {
+        reason = signal.reason;
+        if (reason instanceof Error)
+            return reason;
+    }
+    catch {
+        return Object.assign(new Error('This operation was aborted'), { name: 'AbortError' });
+    }
+    return Object.assign(new Error('This operation was aborted'), {
+        name: 'AbortError',
+        ...(reason !== undefined && { cause: reason }),
+    });
+}
+/** Stop right here when `signal` has already fired. */
+export function throwIfAborted(signal) {
+    if (signal?.aborted)
+        throw abortErrorOf(signal);
+}
+/**
+ * `pending`, except that an abort ends the wait at once — with the abort,
+ * whatever `pending` later does. The abandoned promise's own rejection is
+ * swallowed, so the work given up on never surfaces as an unhandled rejection.
+ * With no signal, `pending` itself.
+ */
+export function untilAborted(pending, signal) {
+    if (signal === undefined)
+        return Promise.resolve(pending);
+    if (signal.aborted) {
+        Promise.resolve(pending).catch(() => undefined);
+        return Promise.reject(abortErrorOf(signal));
+    }
+    return new Promise((resolve, reject) => {
+        const onAbort = () => reject(abortErrorOf(signal));
+        signal.addEventListener('abort', onAbort, { once: true });
+        Promise.resolve(pending).then((value) => {
+            signal.removeEventListener('abort', onAbort);
+            resolve(value);
+        }, (err) => {
+            signal.removeEventListener('abort', onAbort);
+            reject(err);
+        });
+    });
+}
+/**
+ * A signal that fires when ANY of `signals` does, with that signal's reason.
+ * `undefined` when none is given, the one signal itself when only one is.
+ *
+ * `AbortSignal.any` where the runtime has it (Node 20.3+, every current
+ * browser): it holds its sources weakly, so a long-lived signal combined into
+ * every call does not collect a listener per call. The fallback (an older
+ * browser) listens until the first source fires, so the library's hot paths do
+ * not lean on it: a run's signal and a call's deadline are combined with
+ * {@link linkedController}, whose links end with the run or the call.
+ */
+export function eitherSignal(...signals) {
+    const sources = [...new Set(signals.filter((s) => s !== undefined))];
+    if (sources.length === 0)
+        return undefined;
+    if (sources.length === 1)
+        return sources[0];
+    const any = AbortSignal.any;
+    if (typeof any === 'function')
+        return any.call(AbortSignal, sources);
+    const controller = new AbortController();
+    const fired = sources.find((s) => s.aborted);
+    if (fired !== undefined) {
+        controller.abort(fired.reason);
+        return controller.signal;
+    }
+    const onAbort = (event) => {
+        for (const s of sources)
+            s.removeEventListener('abort', onAbort);
+        controller.abort(event.target.reason);
+    };
+    for (const s of sources)
+        s.addEventListener('abort', onAbort, { once: true });
+    return controller.signal;
+}
+/** The longest delay a platform timer holds; Node turns a longer one into 1 ms. */
+const MAX_TIMER_MS = 2 ** 31 - 1;
+/**
+ * A controller of the caller's own, following `sources` until `unlink()` —
+ * for work that must be cancellable by the caller's signals AND by itself (a
+ * deadline), for exactly that work's lifetime. Aborted at once when a source
+ * already has; aborted with a source's reason when one fires; `unlink()` takes
+ * every listener off the sources, so nothing outlives the work on a
+ * long-lived signal. Idempotent.
+ */
+export function linkedController(...sources) {
+    const controller = new AbortController();
+    const linked = [...new Set(sources.filter((s) => s !== undefined))];
+    const fired = linked.find((s) => s.aborted);
+    if (fired !== undefined) {
+        controller.abort(fired.reason);
+        return { controller, unlink: () => undefined };
+    }
+    const unlink = () => {
+        for (const s of linked)
+            s.removeEventListener('abort', onAbort);
+    };
+    const onAbort = (event) => {
+        unlink();
+        controller.abort(event.target.reason);
+    };
+    for (const s of linked)
+        s.addEventListener('abort', onAbort, { once: true });
+    return { controller, unlink };
+}
+/**
+ * Abort `controller` with `reason()` once `ms` have passed — a DEADLINE, not a
+ * wait (`sleep.ts` owns waits). Returns the disarm: a deadline is released
+ * when the work it bounds settles, as the engine releases its own, so it never
+ * fires on work that already finished. A delay past what a timer holds
+ * (2^31 − 1 ms, about 24.8 days) is held at that maximum rather than firing at
+ * once.
+ *
+ * The timer is NOT `unref`'d, exactly like the engine's: while the work it
+ * bounds is pending it keeps the process alive, so a stage that hangs on work
+ * holding no handle of its own still gets its timeout instead of a process
+ * that exits with the run never settled. The disarm is what lets it go.
+ */
+export function armDeadline(controller, ms, reason) {
+    const timer = setTimeout(() => controller.abort(reason()), Math.min(Math.max(ms, 0), MAX_TIMER_MS));
+    return () => clearTimeout(timer);
+}
+/**
+ * `request` carrying `signal` as well as any signal it already carried — the
+ * SAME object when there is nothing to add. Every place the library hands a
+ * request to a provider stamps the run's signal through here.
+ */
+export function withRequestSignal(request, signal) {
+    if (signal === undefined || request.signal === signal)
+        return request;
+    return { ...request, signal: eitherSignal(request.signal, signal) };
+}
+/**
+ * One non-streaming call under `signal` — the four laws in one place, for the
+ * library's own provider calls (the agent, `LLMCall`, the summarizers, the
+ * extractors, the gates): refused before it is sent when the signal has
+ * already fired, handed the request WITH the signal so the provider can cancel
+ * its own request, raced so an adapter that ignores it cannot hold the caller,
+ * and refused when its answer lands after the abort — so a late answer is
+ * never recorded or billed as if the call had completed.
+ */
+export function callUnder(request, signal, call) {
+    return awaitUnder(signal, () => call(withRequestSignal(request, signal)));
+}
+/**
+ * Laws 1, 2 and 4 for one piece of work that cannot be handed the signal (a
+ * callback with no signal in its contract): not started when the signal has
+ * already fired, not waited for once it fires, and refused when it lands after.
+ */
+export async function awaitUnder(signal, start) {
+    throwIfAborted(signal);
+    const answer = await untilAborted(start(), signal);
+    throwIfAborted(signal);
+    return answer;
+}
+/**
+ * Iterate `source` under `signal` — laws 2, 3 and 4 for a stream. With no
+ * signal, `source` itself.
+ *
+ * Each `next()` is raced against the signal; on abort the source is CLOSED —
+ * `close()` first (an SDK stream's `abort()`, a body reader's `cancel()`),
+ * then its iterator's `return()` — and the iteration rejects with the abort. A
+ * step that lands after the abort is refused, never handed on. A consumer that
+ * stops early (`break`, a throw) on a live signal closes the source as
+ * `for await` does — its `return()` waited for, its errors propagated.
+ *
+ * The source's `return()` is NOT awaited: a source suspended inside its own
+ * await (a read the transport will never answer) cannot finish returning, and
+ * waiting for it would re-create the hang this exists to end.
+ */
+export function abortableIterable(source, signal, close) {
+    if (signal === undefined)
+        return source;
+    const watched = signal;
+    return {
+        [Symbol.asyncIterator]() {
+            const it = source[Symbol.asyncIterator]();
+            let shut = false;
+            const closeSource = () => {
+                if (shut)
+                    return;
+                shut = true;
+                settleQuietly(() => close?.());
+                settleQuietly(() => it.return?.());
+            };
+            const refuse = () => {
+                closeSource();
+                throw abortErrorOf(watched);
+            };
+            return {
+                async next() {
+                    if (watched.aborted)
+                        refuse();
+                    let step;
+                    try {
+                        step = await untilAborted(it.next(), watched);
+                    }
+                    catch (err) {
+                        if (watched.aborted)
+                            refuse();
+                        throw err;
+                    }
+                    if (watched.aborted)
+                        refuse();
+                    if (step.done)
+                        shut = true;
+                    return step;
+                },
+                async return(value) {
+                    // A consumer that stops early on a live signal closes the source
+                    // the way `for await` always did: waited for, its errors its own.
+                    // Only once the signal has fired is the close not waited for.
+                    if (!shut && !watched.aborted) {
+                        shut = true;
+                        await untilAborted(it.return?.(value), watched).catch((err) => {
+                            if (!watched.aborted)
+                                throw err;
+                        });
+                        return { done: true, value: value };
+                    }
+                    closeSource();
+                    return { done: true, value: value };
+                },
+            };
+        },
+    };
+}
+/**
+ * The chunks of a fetch body, read under `signal` — the raw-`fetch` adapters'
+ * one reader. Each read is raced against the signal, and the body is
+ * CANCELLED on every way out (the end, a consumer that stops early, an error,
+ * an abort): an open body is a socket held and, on a local model, a
+ * generation that keeps running for nobody.
+ */
+export async function* bodyChunks(body, signal) {
+    const reader = body.getReader();
+    try {
+        for (;;) {
+            const { value, done } = await untilAborted(reader.read(), signal);
+            if (done)
+                return;
+            if (value !== undefined)
+                yield value;
+        }
+    }
+    finally {
+        // Not awaited when aborted: a reader whose transport ignores the abort may
+        // never settle its cancel, and the caller is owed the abort now.
+        const cancelled = reader.cancel().catch(() => undefined);
+        if (!signal?.aborted)
+            await cancelled;
+        try {
+            reader.releaseLock();
+        }
+        catch {
+            /* a lock the runtime already dropped, or a read still pending */
+        }
+    }
+}
+/** Run `fn`, swallowing a throw AND a rejected promise it returns. */
+function settleQuietly(fn) {
+    try {
+        const out = fn();
+        if (out !== null && typeof out === 'object' && 'then' in out) {
+            Promise.resolve(out).catch(() => undefined);
+        }
+    }
+    catch {
+        /* closing is best-effort: the abort is what the caller is owed */
+    }
+}
+//# sourceMappingURL=abort.js.map

package/dist/esm/lib/abort.js.map

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

package/dist/esm/lib/humanizeLLMError.d.ts

@@ -12,6 +12,21 @@
  * as new provider failure modes surface — keep each message short and
  * tell the user what to DO.
  */
+/**
+ * The FIXED sentences {@link humanizeLLMError} answers with — every answer
+ * except the fallback, which quotes the raw message. A reader that sends a
+ * failure somewhere a person reads it (an AG-UI `RUN_ERROR`) passes on only
+ * these: the fallback's raw text may hold anything a provider put in it.
+ */
+export declare const LLM_ERROR_SENTENCES: Readonly<{
+    readonly unreachable: "Couldn't reach the AI model. Check your internet connection, and that the provider/API key is set up correctly.";
+    readonly auth: "The AI provider rejected the request — the API key looks missing or invalid. Add or fix it in Settings.";
+    readonly rateLimited: "The AI provider is busy (rate limit / quota). Wait a moment, then try again.";
+    readonly timeout: "The AI model took too long to respond. Try again — if it keeps happening, simplify the request.";
+    readonly providerDown: "The AI provider had a temporary problem on their end. Try again in a moment.";
+    readonly rejected: "The AI request was rejected — the model name or request may be wrong. Check the model in the code.";
+    readonly unknown: "The AI call failed for an unknown reason.";
+}>;
 /** Map a thrown provider/SDK error to a friendly, actionable sentence. */
 export declare function humanizeLLMError(err: unknown): string;
 /**

package/dist/esm/lib/humanizeLLMError.js

@@ -12,6 +12,21 @@
  * as new provider failure modes surface — keep each message short and
  * tell the user what to DO.
  */
+/**
+ * The FIXED sentences {@link humanizeLLMError} answers with — every answer
+ * except the fallback, which quotes the raw message. A reader that sends a
+ * failure somewhere a person reads it (an AG-UI `RUN_ERROR`) passes on only
+ * these: the fallback's raw text may hold anything a provider put in it.
+ */
+export const LLM_ERROR_SENTENCES = Object.freeze({
+    unreachable: "Couldn't reach the AI model. Check your internet connection, and that the provider/API key is set up correctly.",
+    auth: 'The AI provider rejected the request — the API key looks missing or invalid. Add or fix it in Settings.',
+    rateLimited: 'The AI provider is busy (rate limit / quota). Wait a moment, then try again.',
+    timeout: 'The AI model took too long to respond. Try again — if it keeps happening, simplify the request.',
+    providerDown: 'The AI provider had a temporary problem on their end. Try again in a moment.',
+    rejected: 'The AI request was rejected — the model name or request may be wrong. Check the model in the code.',
+    unknown: 'The AI call failed for an unknown reason.',
+});
 /** Map a thrown provider/SDK error to a friendly, actionable sentence. */
 export function humanizeLLMError(err) {
     const e = (err ?? {});
@@ -22,7 +37,7 @@ export function humanizeLLMError(err) {
     // "connection error" is the Stainless SDKs' APIConnectionError message
     // (@anthropic-ai/sdk, openai v4/v5) — it carries NO status code.
     if (/failed to fetch|fetch failed|network ?error|connection error|enotfound|eai_again|econnrefused|econnreset|socket hang up|load failed/i.test(raw)) {
-        return "Couldn't reach the AI model. Check your internet connection, and that the provider/API key is set up correctly.";
+        return LLM_ERROR_SENTENCES.unreachable;
     }
     // Auth — missing/invalid API key (or, for Bedrock, IAM/model access:
     // AccessDeniedException says "You don't have access to the model..."
@@ -30,26 +45,26 @@ export function humanizeLLMError(err) {
     if (status === 401 ||
         status === 403 ||
         /unauthorized|forbidden|api[ _-]?key|authentication|invalid x-api-key|permission|access denied|don.?t have access/i.test(lc)) {
-        return 'The AI provider rejected the request — the API key looks missing or invalid. Add or fix it in Settings.';
+        return LLM_ERROR_SENTENCES.auth;
     }
     // Rate limit.
     if (status === 429 || /rate.?limit|too many requests|quota/i.test(lc)) {
-        return 'The AI provider is busy (rate limit / quota). Wait a moment, then try again.';
+        return LLM_ERROR_SENTENCES.rateLimited;
     }
     // Timeout.
     if (/timeout|timed out|etimedout|deadline/i.test(lc)) {
-        return 'The AI model took too long to respond. Try again — if it keeps happening, simplify the request.';
+        return LLM_ERROR_SENTENCES.timeout;
     }
     // Transient server-side (5xx).
     if (typeof status === 'number' && status >= 500 && status < 600) {
-        return 'The AI provider had a temporary problem on their end. Try again in a moment.';
+        return LLM_ERROR_SENTENCES.providerDown;
     }
     // Bad request — usually a model name or payload issue.
     if (status === 400 || /not found|no such model|invalid model|model.*not/i.test(lc)) {
-        return 'The AI request was rejected — the model name or request may be wrong. Check the model in the code.';
+        return LLM_ERROR_SENTENCES.rejected;
     }
     // Fallback: keep the raw text but frame it so it doesn't read as a crash.
-    return raw ? `The AI call failed: ${raw}` : 'The AI call failed for an unknown reason.';
+    return raw ? `The AI call failed: ${raw}` : LLM_ERROR_SENTENCES.unknown;
 }
 /**
  * Wrap a raw provider error in a fresh Error whose `.message` is the

package/dist/esm/lib/humanizeLLMError.js.map

@@ -1 +1 @@
-{"version":3,"file":"humanizeLLMError.js","sourceRoot":"","sources":["../../../src/lib/humanizeLLMError.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAUH,0EAA0E;AAC1E,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAc,CAAC;IACnC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;IACxC,MAAM,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAE7B,kEAAkE;IAClE,uEAAuE;IACvE,iEAAiE;IACjE,IACE,sIAAsI,CAAC,IAAI,CACzI,GAAG,CACJ,EACD,CAAC;QACD,OAAO,iHAAiH,CAAC;IAC3H,CAAC;IAED,qEAAqE;IACrE,qEAAqE;IACrE,6DAA6D;IAC7D,IACE,MAAM,KAAK,GAAG;QACd,MAAM,KAAK,GAAG;QACd,mHAAmH,CAAC,IAAI,CACtH,EAAE,CACH,EACD,CAAC;QACD,OAAO,yGAAyG,CAAC;IACnH,CAAC;IAED,cAAc;IACd,IAAI,MAAM,KAAK,GAAG,IAAI,sCAAsC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACtE,OAAO,8EAA8E,CAAC;IACxF,CAAC;IAED,WAAW;IACX,IAAI,uCAAuC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACrD,OAAO,iGAAiG,CAAC;IAC3G,CAAC;IAED,+BAA+B;IAC/B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;QAChE,OAAO,8EAA8E,CAAC;IACxF,CAAC;IAED,uDAAuD;IACvD,IAAI,MAAM,KAAK,GAAG,IAAI,mDAAmD,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACnF,OAAO,oGAAoG,CAAC;IAC9G,CAAC;IAED,0EAA0E;IAC1E,OAAO,GAAG,CAAC,CAAC,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC,CAAC,2CAA2C,CAAC;AAC1F,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,GAAY;IACvC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvC,sEAAsE;IACtE,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAChF,CAAC"}
+{"version":3,"file":"humanizeLLMError.js","sourceRoot":"","sources":["../../../src/lib/humanizeLLMError.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAUH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,WAAW,EACT,iHAAiH;IACnH,IAAI,EAAE,yGAAyG;IAC/G,WAAW,EAAE,8EAA8E;IAC3F,OAAO,EACL,iGAAiG;IACnG,YAAY,EAAE,8EAA8E;IAC5F,QAAQ,EACN,oGAAoG;IACtG,OAAO,EAAE,2CAA2C;CAC5C,CAAC,CAAC;AAEZ,0EAA0E;AAC1E,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAc,CAAC;IACnC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,CAAC;IACxC,MAAM,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAE7B,kEAAkE;IAClE,uEAAuE;IACvE,iEAAiE;IACjE,IACE,sIAAsI,CAAC,IAAI,CACzI,GAAG,CACJ,EACD,CAAC;QACD,OAAO,mBAAmB,CAAC,WAAW,CAAC;IACzC,CAAC;IAED,qEAAqE;IACrE,qEAAqE;IACrE,6DAA6D;IAC7D,IACE,MAAM,KAAK,GAAG;QACd,MAAM,KAAK,GAAG;QACd,mHAAmH,CAAC,IAAI,CACtH,EAAE,CACH,EACD,CAAC;QACD,OAAO,mBAAmB,CAAC,IAAI,CAAC;IAClC,CAAC;IAED,cAAc;IACd,IAAI,MAAM,KAAK,GAAG,IAAI,sCAAsC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACtE,OAAO,mBAAmB,CAAC,WAAW,CAAC;IACzC,CAAC;IAED,WAAW;IACX,IAAI,uCAAuC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACrD,OAAO,mBAAmB,CAAC,OAAO,CAAC;IACrC,CAAC;IAED,+BAA+B;IAC/B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;QAChE,OAAO,mBAAmB,CAAC,YAAY,CAAC;IAC1C,CAAC;IAED,uDAAuD;IACvD,IAAI,MAAM,KAAK,GAAG,IAAI,mDAAmD,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACnF,OAAO,mBAAmB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,0EAA0E;IAC1E,OAAO,GAAG,CAAC,CAAC,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC;AAC1E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,GAAY;IACvC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvC,sEAAsE;IACtE,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAChF,CAAC"}

package/dist/esm/maps/engagement/parkCard.d.ts

@@ -36,8 +36,12 @@ import type { EngagementPlan, MapEngagement } from './types.js';
  *
  * Returns `undefined` when nothing is parked — the caller then adds nothing to
  * the prompt at all, which keeps the unparked path byte-identical.
+ *
+ * `mayName` is the caller's role filter (`isHiddenSkill`, negated): a member
+ * skill the role may not read is never named, and a parked map with no member
+ * left to name gets no card line at all (may omit, never deny).
  */
-export declare function parkCard(plan: EngagementPlan, engagement: MapEngagement | undefined): string | undefined;
+export declare function parkCard(plan: EngagementPlan, engagement: MapEngagement | undefined, mayName?: (skillId: string) => boolean): string | undefined;
 /**
  * The injection id the card is served under.
  *

package/dist/esm/maps/engagement/parkCard.js

@@ -54,8 +54,12 @@ function reasonOf(record) {
  *
  * Returns `undefined` when nothing is parked — the caller then adds nothing to
  * the prompt at all, which keeps the unparked path byte-identical.
+ *
+ * `mayName` is the caller's role filter (`isHiddenSkill`, negated): a member
+ * skill the role may not read is never named, and a parked map with no member
+ * left to name gets no card line at all (may omit, never deny).
  */
-export function parkCard(plan, engagement) {
+export function parkCard(plan, engagement, mayName = () => true) {
     if (engagement === undefined || engagement.length === 0)
         return undefined;
     const byId = new Map(plan.maps.map((m) => [m.id, m]));
@@ -70,8 +74,11 @@ export function parkCard(plan, engagement) {
         // "engagement: parked" beside a skill id needs to be told in the same
         // breath that its position did not move, or the obvious inference is that
         // it was thrown out of the skill.
-        const cursor = record.at ?? '(unknown)';
-        const members = map.memberIds.join(', ');
+        const visible = map.memberIds.filter(mayName);
+        if (visible.length === 0)
+            continue;
+        const cursor = record.at !== undefined && mayName(record.at) ? record.at : '(unknown)';
+        const members = visible.join(', ');
         lines.push(`  - ${map.id} — cursor: ${cursor} (unchanged) · engagement: PARKED · ` +
             `reason: ${reasonOf(record)} · re-engage: available`);
         // SAYS WHAT PARKING DOES, NOT WHAT THIS WIRE HOLDS. "…are not being sent

package/dist/esm/maps/engagement/parkCard.js.map

@@ -1 +1 @@
-{"version":3,"file":"parkCard.js","sourceRoot":"","sources":["../../../../src/maps/engagement/parkCard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAIH,gFAAgF;AAChF,MAAM,MAAM,GAAG,6EAA6E,CAAC;AAE7F;;;;;;GAMG;AACH,SAAS,QAAQ,CAAC,MAA2B;IAC3C,OAAO,MAAM,CAAC,EAAE,KAAK,SAAS;QAC5B,CAAC,CAAC,gDAAgD;QAClD,CAAC,CAAC,2DAA2D,CAAC;AAClE,CAAC;AAED,yCAAyC;AACzC,wGAAwG;AACxG,mGAAmG;AACnG,iFAAiF;AACjF,mFAAmF;AACnF;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CACtB,IAAoB,EACpB,UAAqC;IAErC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1E,MAAM,IAAI,GAAG,IAAI,GAAG,CAAqB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ;YAAE,SAAS;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,GAAG,KAAK,SAAS;YAAE,SAAS;QAEhC,kEAAkE;QAClE,sEAAsE;QACtE,0EAA0E;QAC1E,kCAAkC;QAClC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,IAAI,WAAW,CAAC;QACxC,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,KAAK,CAAC,IAAI,CACR,OAAO,GAAG,CAAC,EAAE,cAAc,MAAM,sCAAsC;YACrE,WAAW,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CACvD,CAAC;QACF,yEAAyE;QACzE,2EAA2E;QAC3E,4EAA4E;QAC5E,2EAA2E;QAC3E,wEAAwE;QACxE,0EAA0E;QAC1E,KAAK,CAAC,IAAI,CACR,kFAAkF;YAChF,qCAAqC,OAAO,iCAAiC;YAC7E,8EAA8E;YAC9E,4EAA4E;YAC5E,4CAA4C,CAC/C,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAC3E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,2BAA2B,CAAC"}
+{"version":3,"file":"parkCard.js","sourceRoot":"","sources":["../../../../src/maps/engagement/parkCard.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAIH,gFAAgF;AAChF,MAAM,MAAM,GAAG,6EAA6E,CAAC;AAE7F;;;;;;GAMG;AACH,SAAS,QAAQ,CAAC,MAA2B;IAC3C,OAAO,MAAM,CAAC,EAAE,KAAK,SAAS;QAC5B,CAAC,CAAC,gDAAgD;QAClD,CAAC,CAAC,2DAA2D,CAAC;AAClE,CAAC;AAED,yCAAyC;AACzC,wGAAwG;AACxG,mGAAmG;AACnG,iFAAiF;AACjF,mFAAmF;AACnF;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CACtB,IAAoB,EACpB,UAAqC,EACrC,UAAwC,GAAG,EAAE,CAAC,IAAI;IAElD,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1E,MAAM,IAAI,GAAG,IAAI,GAAG,CAAqB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;QAChC,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ;YAAE,SAAS;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,GAAG,KAAK,SAAS;YAAE,SAAS;QAEhC,kEAAkE;QAClE,sEAAsE;QACtE,0EAA0E;QAC1E,kCAAkC;QAClC,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QACvF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,KAAK,CAAC,IAAI,CACR,OAAO,GAAG,CAAC,EAAE,cAAc,MAAM,sCAAsC;YACrE,WAAW,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CACvD,CAAC;QACF,yEAAyE;QACzE,2EAA2E;QAC3E,4EAA4E;QAC5E,2EAA2E;QAC3E,wEAAwE;QACxE,0EAA0E;QAC1E,KAAK,CAAC,IAAI,CACR,kFAAkF;YAChF,qCAAqC,OAAO,iCAAiC;YAC7E,8EAA8E;YAC9E,4EAA4E;YAC5E,4CAA4C,CAC/C,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAC3E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,2BAA2B,CAAC"}

package/dist/esm/mcp/mcpClient.js

@@ -142,6 +142,8 @@ async function openConnection(opts) {
 }
 // ─── SDK construction (lazy require, unless the caller supplied it) ─
 async function resolveClient(transport, clientInfo, signal, retryOnThrottle, sdk) {
+    if (sdk !== undefined)
+        assertSdk(sdk, transport.transport);
     const mod = sdk ?? loadClientModule();
     const client = new mod.Client(clientInfo ?? DEFAULT_CLIENT_INFO, {
         capabilities: {},
@@ -154,6 +156,31 @@ async function resolveClient(transport, clientInfo, signal, retryOnThrottle, sdk
         await client.connect(transportImpl);
     return client;
 }
+/**
+ * An injected `sdk` is checked before anything is built, so a wrong import (a
+ * namespace object, one module of the two) is refused by name here rather
+ * than surfacing later as "x is not a constructor".
+ */
+function assertSdk(sdk, transport) {
+    const needed = transport === 'stdio' ? ['Client'] : ['Client', 'StreamableHTTPClientTransport'];
+    const given = sdk;
+    const missing = needed.filter((key) => typeof given !== 'object' || given === null || typeof given[key] !== 'function');
+    if (missing.length === 0)
+        return;
+    const sources = {
+        Client: "`import { Client } from '@modelcontextprotocol/sdk/client/index.js'`",
+        StreamableHTTPClientTransport: '`import { StreamableHTTPClientTransport } from ' +
+            "'@modelcontextprotocol/sdk/client/streamableHttp.js'`",
+    };
+    throw new TypeError(`mcpClient: \`sdk\` has no ${missing.map((key) => `\`${key}\``).join(' or ')} constructor. ` +
+        `Pass ${needed.length > 1 ? 'the classes themselves' : 'the class itself'}: ` +
+        `${needed.map((key) => sources[key]).join(', ')}, ` +
+        `then \`sdk: { ${needed.join(', ')} }\`.`);
+}
+/** What every not-installed message adds: the bundler case, and the hook past it. */
+const BUNDLED_HINT = '  Installed, and your app is bundled (esbuild, webpack)? The bundler cannot follow\n' +
+    '  this lazy load: import the SDK yourself and pass it as `sdk`\n' +
+    '  (sdk: { Client, StreamableHTTPClientTransport }), or pass `connection`.';
 /** The Node loader path, unchanged — reached only when no `sdk` was supplied. */
 function loadClientModule() {
     try {
@@ -163,7 +190,7 @@ function loadClientModule() {
         throw new Error(sdkLoadFailure(err, {
             notInstalled: 'mcpClient requires @modelcontextprotocol/sdk.\n' +
                 '  Install:  npm install @modelcontextprotocol/sdk\n' +
-                '  Or pass `_client` for test injection.',
+                BUNDLED_HINT,
             caller: 'mcpClient',
             specifier: '@modelcontextprotocol/sdk/client/index.js',
             instead: 'Pass `sdk` (the two SDK modules, imported statically) or `connection` ' +
@@ -238,7 +265,8 @@ function loadHttpModule(transport) {
     catch (err) {
         throw new Error(sdkLoadFailure(err, {
             notInstalled: `mcpClient(${transport}) requires @modelcontextprotocol/sdk/client/streamableHttp.js — ` +
-                'check that @modelcontextprotocol/sdk is installed at the latest version.',
+                'check that @modelcontextprotocol/sdk is installed at the latest version.\n' +
+                BUNDLED_HINT,
             caller: `mcpClient(${transport})`,
             specifier: '@modelcontextprotocol/sdk/client/streamableHttp.js',
             instead: 'Pass `sdk` (the two SDK modules, imported statically) or `connection` ' +

package/dist/esm/mcp/mcpClient.js.map

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

package/dist/esm/mcp/mcpServe.js

@@ -61,6 +61,7 @@
  */
 import { ToolSessionTier } from '../tools/toolSessions.js';
 import { unconfiguredCredentialProvider } from '../identity/types.js';
+import { bindRequest } from '../identity/requestContext.js';
 import { unconfiguredArtifacts } from '../artifacts/capability.js';
 import { wantsNeedsStoreRefusal } from '../artifacts/wants.js';
 import { doorGuard, warnAllowedHostsUnset } from '../hosting/doorGuard.js';
@@ -86,7 +87,10 @@ export async function mcpServe(tools, opts = {}) {
     const name = opts.name ?? DEFAULT_SERVER_NAME;
     const version = opts.version ?? DEFAULT_SERVER_VERSION;
     const byName = validateServableTools(tools, name, opts.credentials);
-    const credentials = opts.credentials ?? unconfiguredCredentialProvider();
+    // A served call belongs to no agent run, so it carries no incoming request:
+    // whatever `request` a tool presents is removed (`bindRequest`), and a
+    // request-sourced credential fails closed here by name.
+    const credentials = bindRequest(opts.credentials ?? unconfiguredCredentialProvider(), undefined, undefined);
     const listing = tools.map((t) => {
         // The declaration half of the tool, in MCP's own extensibility bag
         // (9.71.0). Absent fields stay absent and a tool that declares NOTHING