@zackbart/connecta 0.7.7 → 0.7.9

package/dist/meta-tools.d.ts

@@ -194,10 +194,10 @@ export interface SkillArgs {
  * supplies a deadline for calls that don't carry one. (execute_code, the
  * optional tenth tool, is registered separately by registerExecuteTool.)
  *
- * The deployment-wide result-size cap is read off the registry view rather than
- * passed in: `ConnectaConfig.calls.maxResultBytes` and the per-connector
- * override are the only places a cap is set, so there is one answer to where a
- * deployment sets it (issue #44).
+ * Deployment-wide result-size caps are read off the registry view rather than
+ * passed in: `ConnectaConfig.calls.maxResultBytes`, its per-connector override,
+ * and the independent `calls.maxBatchResultBytes` final-envelope boundary each
+ * have one runtime source of truth.
  */
 export declare function createMetaTools(registry: RegistryView, baseUrl: string, opts?: {
     /** Deadline applied when a call passes no `timeoutMs`. Off when unset. */
@@ -205,6 +205,8 @@ export declare function createMetaTools(registry: RegistryView, baseUrl: string,
     /** Per-connector deadline for the list/search/describe probe fan-out. Default 30_000. */
     probeTimeoutMs?: number;
     activity?: ActivityRequestContext;
+    /** Inbound request cancellation shared by direct and batch child calls. */
+    requestSignal?: AbortSignal;
     /** Runtime continuation for the bounded tail of probe-owned teardown. */
     defer?: DeferredWork;
 }): {
@@ -224,6 +226,7 @@ export declare function registerMetaTools(server: McpServer, registry: RegistryV
     defaultToolTimeoutMs?: number;
     probeTimeoutMs?: number;
     activity?: ActivityRequestContext;
+    requestSignal?: AbortSignal;
     defer?: DeferredWork;
 }): void;
 export {};

package/dist/meta-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta-tools.d.ts","sourceRoot":"","sources":["../src/meta-tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"meta-tools.d.ts","sourceRoot":"","sources":["../src/meta-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGzE,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,eAAe,CAAC;AAgBvB,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AACD,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAID,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAOnD;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAEvD;AAMD,eAAO,MAAM,oBAAoB,KAAK,CAAC;AACvC;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,MAAM,CAAC;AACpC,+DAA+D;AAC/D,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAC1C;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,SAAU,CAAC;AAMlD,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,kBAAkB;gBAAzC,IAAI,EAAE,cAAc,GAAG,kBAAkB,EAClD,OAAO,EAAE,MAAM;CAKlB;AAED,gFAAgF;AAChF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAc3D;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,EAAE,CAc5D;AAqBD,wEAAwE;AACxE,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,MAAM,GACX,IAAI,CAEN;AA+BD;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GAAG,SAAS,GAC/B,MAAM,GAAG,SAAS,CAKpB;AA8BD,kDAAkD;AAClD,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,MAAM,GACb,MAAM,CAIR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GACZ,MAAM,CAaR;AAsDD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAG1D;AAuID,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;CACrC;AACD,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AACD,MAAM,WAAW,QAAQ;IACvB,wEAAwE;IACxE,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,CAAC;AACzC,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AACD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IACJ,0EAA0E;IAC1E,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,yFAAyF;IACzF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,2EAA2E;IAC3E,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,yEAAyE;IACzE,KAAK,CAAC,EAAE,YAAY,CAAC;CACjB;kBA4Ye,SAAS,GAAQ,OAAO,CAAC,UAAU,CAAC;0BAqB5B,QAAQ,GAAQ,OAAO,CAAC,UAAU,CAAC;sBA4LtC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;wBAmJ9B,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC;mBAqFvC,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;8BAInB,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;oBAMxC,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC;oBA2DnC,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;6BA8GtB,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC;EAmDrE;AAsED,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,YAAY,EACtB,GAAG,EAAE;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,aAAa,CAAC,EAAE,WAAW,CAAC;IAC5B,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB,GACA,IAAI,CA8KN"}

package/dist/meta-tools.js

@@ -4,6 +4,7 @@ import { recordToolActivity, } from "./activity.js";
 import { closeConnectorScope, } from "./connector-scope.js";
 import { unwrapMcpResult } from "./mcp-result.js";
 import { classifyCallError, ConnectorCallError, messageLooksRetryable, } from "./errors.js";
+import { isCallAdmissionError } from "./call-admission.js";
 import { isValidMaxResultBytes, MIN_MAX_RESULT_BYTES, resolveMaxResultBytes, } from "./registry.js";
 import { connectorGuide, connectorSkillName, hasConnectorGuides, listSkills, resolveSkill, } from "./skills.js";
 import { DEFAULT_PROBE_TIMEOUT_MS, normalizeTimeoutMs, withAbortableTimeout, } from "./timeout.js";
@@ -148,6 +149,17 @@ export function retryBackoffMs(attempt, retryAfterMs) {
 function errorDetails(code, message) {
     return { code, message, retryable: messageLooksRetryable(message) };
 }
+function callerCancelledDetails() {
+    return {
+        code: "cancelled",
+        message: "Tool call was cancelled by the caller.",
+        retryable: false,
+    };
+}
+function isCallerCancellation(error, signal) {
+    return (signal?.aborted === true ||
+        (isCallAdmissionError(error) && error.admissionKind === "cancelled"));
+}
 /** True if `b` is a UTF-8 continuation byte (0b10xxxxxx). */
 function isContinuationByte(b) {
     return (b & 0xc0) === 0x80;
@@ -301,6 +313,15 @@ async function stashResult(text, results, totalBytes) {
         hint: "use get_result {id, offset} to page, or re-call with fields to select less",
     };
 }
+/** Keep an oversized batch's inline outcome summary at fixed string overhead. */
+function batchSummaryString(value) {
+    const bytes = enc.encode(value);
+    const maxBytes = 512;
+    if (bytes.length <= maxBytes)
+        return value;
+    const end = alignEndToCharBoundary(bytes, 0, maxBytes, bytes.length);
+    return `${dec.decode(bytes.slice(0, end))}…`;
+}
 /**
  * Return `text` as a single content block; if it exceeds `cap` bytes, stash the
  * full text and return the first `cap` bytes followed by a JSON truncation
@@ -382,14 +403,15 @@ async function guardContent(content, results, cap) {
  * supplies a deadline for calls that don't carry one. (execute_code, the
  * optional tenth tool, is registered separately by registerExecuteTool.)
  *
- * The deployment-wide result-size cap is read off the registry view rather than
- * passed in: `ConnectaConfig.calls.maxResultBytes` and the per-connector
- * override are the only places a cap is set, so there is one answer to where a
- * deployment sets it (issue #44).
+ * Deployment-wide result-size caps are read off the registry view rather than
+ * passed in: `ConnectaConfig.calls.maxResultBytes`, its per-connector override,
+ * and the independent `calls.maxBatchResultBytes` final-envelope boundary each
+ * have one runtime source of truth.
  */
 export function createMetaTools(registry, baseUrl, opts = {}) {
     // Already normalized and warned about at registry construction.
     const globalCap = registry.maxResultBytes;
+    const batchCap = registry.maxBatchResultBytes;
     const defaultToolTimeoutMs = normalizeTimeoutMs(opts.defaultToolTimeoutMs);
     const probeTimeoutMs = normalizeTimeoutMs(opts.probeTimeoutMs) ?? DEFAULT_PROBE_TIMEOUT_MS;
     // createMetaTools() is called once per inbound MCP request. Sharing this
@@ -401,12 +423,14 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
     async function runCall(call, source, options = {}) {
         const started = Date.now();
         let catalogMs = 0;
+        let admissionMs = 0;
         let connectorMs = 0;
         let backoffMs = 0;
         let resultProcessingMs = 0;
         let attempts = 0;
         const timing = () => ({
             catalogMs,
+            admissionMs,
             connectorMs,
             backoffMs,
             resultProcessingMs,
@@ -430,7 +454,11 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
         const failed = (error) => {
             const durationMs = Date.now() - started;
             const diagnostics = timing();
-            record(error.code === "timeout" ? "timeout" : "error", error.code);
+            record(error.code === "timeout"
+                ? "timeout"
+                : error.code === "cancelled"
+                    ? "cancelled"
+                    : "error", error.code);
             return {
                 toolResult: call.resultMode === "value"
                     ? jsonResult({
@@ -470,6 +498,9 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
         }
         catch (err) {
             catalogMs += Date.now() - catalogStarted;
+            if (opts.requestSignal?.aborted) {
+                return failed(callerCancelledDetails());
+            }
             // A connector whose catalog cannot be fetched is as unusable as one whose
             // execution fails, so it feeds health accounting the same way the
             // execution catch below does — otherwise a connector every call_tool
@@ -502,56 +533,132 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
         let result;
         while (true) {
             attempts++;
-            const controller = timeoutMs ? new AbortController() : undefined;
+            let permit;
+            const controller = timeoutMs || opts.requestSignal ? new AbortController() : undefined;
+            const forwardAbort = () => controller?.abort(opts.requestSignal?.reason);
+            if (opts.requestSignal?.aborted)
+                forwardAbort();
+            else {
+                opts.requestSignal?.addEventListener("abort", forwardAbort, {
+                    once: true,
+                });
+            }
             let timer;
-            const ctx = registry.contextFor(resolved.connector.id, baseUrl, requestScope, { signal: controller?.signal, timeoutMs });
-            const connectorStarted = Date.now();
+            let onAbort;
+            let attemptFailed = false;
+            let attemptError;
             try {
-                const pending = resolved.connector.callTool(resolved.toolName, call.args ?? {}, ctx);
-                result = timeoutMs
-                    ? await Promise.race([
-                        pending,
-                        new Promise((_, reject) => {
-                            timer = setTimeout(() => {
-                                reject(new ConnectorCallError("timeout", `Tool call timed out after ${timeoutMs}ms`));
-                                controller?.abort();
-                            }, timeoutMs);
-                        }),
-                    ])
-                    : await pending;
-                connectorMs += Date.now() - connectorStarted;
+                const admissionStarted = Date.now();
+                try {
+                    permit = await registry.admitCall(resolved.connector.id, {
+                        toolName: resolved.toolName,
+                        args: call.args ?? {},
+                        signal: opts.requestSignal,
+                    });
+                }
+                finally {
+                    admissionMs += Date.now() - admissionStarted;
+                }
+                const ctx = registry.contextFor(resolved.connector.id, baseUrl, requestScope, { signal: controller?.signal, timeoutMs });
+                let rejectCancelled;
+                const cancelled = controller
+                    ? new Promise((_, reject) => {
+                        rejectCancelled = reject;
+                    })
+                    : undefined;
+                onAbort = () => {
+                    rejectCancelled(controller?.signal.reason ??
+                        new ConnectorCallError("timeout", "Tool call was cancelled"));
+                };
+                controller?.signal.addEventListener("abort", onAbort, { once: true });
+                if (controller?.signal.aborted)
+                    onAbort();
+                if (controller?.signal.aborted)
+                    await cancelled;
+                if (timeoutMs) {
+                    timer = setTimeout(() => {
+                        controller?.abort(new ConnectorCallError("timeout", `Tool call timed out after ${timeoutMs}ms`));
+                    }, timeoutMs);
+                }
+                const connectorStarted = Date.now();
+                try {
+                    const pending = resolved.connector.callTool(resolved.toolName, call.args ?? {}, ctx);
+                    result = cancelled
+                        ? await Promise.race([pending, cancelled])
+                        : await pending;
+                }
+                finally {
+                    connectorMs += Date.now() - connectorStarted;
+                }
                 const mcpResult = result;
                 if (resolved.connector.kind === "mcp" && mcpResult?.isError) {
                     throw new Error(mcpResult.content?.map((block) => block.text).join("") ||
                         "Downstream tool call failed");
                 }
-                break;
             }
             catch (err) {
-                // Includes connector setup, downstream execution, and timeout wait.
-                connectorMs += Date.now() - connectorStarted;
-                const details = classifyCallError(err);
-                if (attempts <= maxRetries && retrySafe && details.retryable) {
+                attemptFailed = true;
+                attemptError = err;
+            }
+            finally {
+                if (timer)
+                    clearTimeout(timer);
+                if (onAbort) {
+                    controller?.signal.removeEventListener("abort", onAbort);
+                }
+                opts.requestSignal?.removeEventListener("abort", forwardAbort);
+                permit?.release();
+            }
+            if (attemptFailed) {
+                const callerCancelled = isCallerCancellation(attemptError, opts.requestSignal);
+                const details = callerCancelled
+                    ? callerCancelledDetails()
+                    : classifyCallError(attemptError);
+                if (!callerCancelled &&
+                    attempts <= maxRetries &&
+                    retrySafe &&
+                    details.retryable) {
                     const wait = retryBackoffMs(attempts, details.retryAfterMs);
                     if (wait !== undefined) {
                         const backoffStarted = Date.now();
                         if (wait > 0) {
-                            await new Promise((resolve) => setTimeout(resolve, wait));
+                            const completed = await new Promise((resolve) => {
+                                let settled = false;
+                                const finish = (value) => {
+                                    if (settled)
+                                        return;
+                                    settled = true;
+                                    clearTimeout(timer);
+                                    opts.requestSignal?.removeEventListener("abort", cancel);
+                                    resolve(value);
+                                };
+                                const timer = setTimeout(() => finish(true), wait);
+                                const cancel = () => finish(false);
+                                opts.requestSignal?.addEventListener("abort", cancel, {
+                                    once: true,
+                                });
+                                if (opts.requestSignal?.aborted)
+                                    cancel();
+                            });
+                            backoffMs += Date.now() - backoffStarted;
+                            if (!completed)
+                                return failed(callerCancelledDetails());
+                        }
+                        else {
+                            backoffMs += Date.now() - backoffStarted;
                         }
-                        backoffMs += Date.now() - backoffStarted;
                         continue;
                     }
                     // The reported window is longer than the engine will park a
                     // synchronous request for. Fall through to failure with
                     // retryAfterMs reported verbatim so the agent can re-issue.
                 }
-                registry.recordFailure(resolved.connector.id, Date.now() - started, err);
+                if (!callerCancelled && !isCallAdmissionError(attemptError)) {
+                    registry.recordFailure(resolved.connector.id, Date.now() - started, attemptError);
+                }
                 return failed(details);
             }
-            finally {
-                if (timer)
-                    clearTimeout(timer);
-            }
+            break;
         }
         registry.recordSuccess(resolved.connector.id, Date.now() - started);
         const processingStarted = Date.now();
@@ -816,26 +923,36 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
                 : registry.listConnectors();
             const matches = [];
             const catalogs = await Promise.allSettled(conns.map((c) => withProbeDeadline(`search_tools probe of "${c.id}"`, (options) => registry.getTools(c.id, baseUrl, requestScope, options))));
-            let orderBase = 0;
-            catalogs.forEach((catalog, connectorIndex) => {
-                const c = conns[connectorIndex];
-                if (catalog.status === "fulfilled") {
-                    for (const ranked of rankTools(catalog.value, q)) {
-                        matches.push({
-                            connectorId: c.id,
-                            connectorTitle: c.title,
-                            connectorDescription: c.description,
-                            ...(connectorGuide(c)
-                                ? { connectorGuideSkill: connectorSkillName(c.id) }
-                                : {}),
-                            tool: ranked.tool,
-                            score: ranked.score,
-                            order: orderBase + ranked.order,
-                        });
+            let matchMode = "all";
+            const collectMatches = (mode) => {
+                matches.length = 0;
+                let orderBase = 0;
+                catalogs.forEach((catalog, connectorIndex) => {
+                    const c = conns[connectorIndex];
+                    if (catalog.status === "fulfilled") {
+                        for (const ranked of rankTools(catalog.value, q, mode)) {
+                            matches.push({
+                                connectorId: c.id,
+                                connectorTitle: c.title,
+                                connectorDescription: c.description,
+                                ...(connectorGuide(c)
+                                    ? { connectorGuideSkill: connectorSkillName(c.id) }
+                                    : {}),
+                                tool: ranked.tool,
+                                score: ranked.score,
+                                order: orderBase + ranked.order,
+                            });
+                        }
                     }
-                }
-                orderBase += catalog.status === "fulfilled" ? catalog.value.length : 1;
-            });
+                    orderBase +=
+                        catalog.status === "fulfilled" ? catalog.value.length : 1;
+                });
+            };
+            collectMatches("all");
+            if (q.trim() && matches.length === 0) {
+                matchMode = "partial";
+                collectMatches(matchMode);
+            }
             matches.sort((a, b) => b.score - a.score || a.order - b.order);
             const page = matches.slice(offset, offset + limit);
             const groups = [];
@@ -889,6 +1006,9 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
                 limit,
                 hasMore: nextOffset !== undefined,
                 ...(nextOffset !== undefined ? { nextOffset } : {}),
+                ...(matchMode === "partial" && matches.length > 0
+                    ? { matchMode }
+                    : {}),
             }, "Request a smaller limit, omit fullDescriptions, or use compact schemas.");
         },
         async describeTools(args) {
@@ -1065,9 +1185,46 @@ export function createMetaTools(registry, baseUrl, opts = {}) {
                         : {}),
                 };
             });
-            return jsonResult({
+            const envelope = {
                 results,
                 durationMs: Date.now() - batchStarted,
+            };
+            const text = serializeResultText(envelope);
+            const bytes = enc.encode(text);
+            if (bytes.length <= batchCap)
+                return jsonResult(envelope);
+            const notice = await stashResult(text, registry.resultsStorage(), bytes.length);
+            return jsonResult({
+                results: results.map((result) => {
+                    const common = {
+                        address: batchSummaryString(result.address),
+                        ok: !("error" in result),
+                        ...("durationMs" in result
+                            ? { durationMs: result.durationMs }
+                            : {}),
+                        ...("attempts" in result ? { attempts: result.attempts } : {}),
+                        ...("timing" in result ? { timing: result.timing } : {}),
+                    };
+                    if (!("error" in result))
+                        return common;
+                    const error = result.error ?? "Batch call failed";
+                    const details = result.errorDetails ??
+                        errorDetails("batch_call_failed", error);
+                    return {
+                        ...common,
+                        error: batchSummaryString(error),
+                        errorDetails: {
+                            code: batchSummaryString(details.code),
+                            message: batchSummaryString(details.message),
+                            retryable: details.retryable,
+                            ...(details.retryAfterMs !== undefined
+                                ? { retryAfterMs: details.retryAfterMs }
+                                : {}),
+                        },
+                    };
+                }),
+                durationMs: envelope.durationMs,
+                ...notice,
             });
         },
         async authorizeConnector(args) {
@@ -1125,7 +1282,7 @@ const DESCRIBE_DESC = `Inspect up to ${MAX_DESCRIBE_ADDRESSES} known tool addres
 const CALL_DESC = 'Use for one tool explicitly annotated readOnlyHint: true. For 2–10 independent read-only calls use batch_call; for dependent steps or data reduction use execute_code when available. Unannotated, write-capable, and destructive tools are refused and require call_destructive_tool. fields selects JSON dot-paths, resultMode "value" unwraps results, timeoutMs sets a deadline, safe maxRetries are annotation-gated, diagnostics adds timing, and large results page through get_result.';
 const CALL_DESTRUCTIVE_DESC = "Invoke any tool that is not explicitly annotated readOnlyHint: true, including unannotated, write-capable, or destructive tools. The MCP destructiveHint on this meta-tool lets the host request human approval before execution. Use only after reviewing the downstream tool schema and consequences.";
 const GET_RESULT_DESC = "Page a truncated result stashed by call_tool/batch_call. Input { id, offset?, maxBytes? } → { text, offset, nextOffset?, totalBytes } sliced by byte offset. maxBytes is a whole number of bytes >= 1 (omit for the deployment default) and offset a whole number of bytes >= 0; an offset inside a multi-byte character is moved back to that character's first byte and the offset served is returned. Unknown/expired id is an error.";
-const BATCH_DESC = "Use for 2–10 independent tools explicitly annotated readOnlyHint: true. Calls run in parallel with shared request-scoped clients; use execute_code when available instead for dependencies or in-sandbox reduction. Unannotated, write-capable, and destructive tools are refused. Batch timeout, safe retry, result mode, and diagnostics defaults may be overridden per call.";
+const BATCH_DESC = "Use for 2–10 independent tools explicitly annotated readOnlyHint: true. Calls run in parallel with shared request-scoped clients; use execute_code when available instead for dependencies or in-sandbox reduction. Unannotated, write-capable, and destructive tools are refused. Batch timeout, safe retry, result mode, and diagnostics defaults may be overridden per call. An oversized final envelope returns ordered outcome summaries plus a get_result page handle.";
 const AUTHORIZE_DESC = "Use after a connector reports auth_required. Starts downstream OAuth and returns an authorizationUrl for the operator to open. force=true wipes stored credentials first and restarts consent.";
 const SKILLS_DESC = 'List or fetch concise guidance for choosing among Connecta meta-tools. Call skills({ name: "usage" }) once when the routing workflow is unfamiliar; do not refetch it in the same task.';
 /**
@@ -1174,6 +1331,7 @@ export function registerMetaTools(server, registry, ctx) {
         defaultToolTimeoutMs: ctx.defaultToolTimeoutMs,
         probeTimeoutMs: ctx.probeTimeoutMs,
         activity: ctx.activity,
+        requestSignal: ctx.requestSignal,
         defer: ctx.defer,
     });
     server.registerTool("skills", {