@zackbart/connecta 0.38.0 → 0.40.0

package/dist/invocation.js

@@ -1,3 +1,4 @@
+import { routePhrases } from "./agent-routes.js";
 import { authCall, registerAuthMethod } from "./auth/native.js";
 import { withAuthorizationHandoffEffect } from "./authorization-handoff.js";
 import { hasControlCharacters } from "./tool-name.js";
@@ -9,13 +10,13 @@ import { downstreamValue } from "./mcp-result.js";
 import { carryFailureFacts, classifiedFailure, failureRecord, logFailure, recordedToolName, } from "./operator-record.js";
 import { splitAddress } from "./registry.js";
 import { causeError, runEdge, withDeadlineEffect } from "./runtime/run.js";
-import { validateCatalogToolInput } from "./validate.js";
+import { schemaExample, validateCatalogToolInput } from "./validate.js";
 import { sentSecretsFor, sentSecretsForRequest } from "./sent-secrets.js";
 import { recoveryRecord, recordRecoveryFacts } from "./call-recovery.js";
 import { callFromContext, contextView, viewServices, Credentials } from "./runtime/call.js";
 import { chargeCallBudget } from "./runtime/call-admission.js";
 import { callEntry } from "./runtime/call-entry.js";
-import { forgetProviderFailure, isKnownProviderFailure, isSettledWrite, keyProtectsCall, knownCallFailure, onlyAuxiliaryRequests, knownProviderFailure, openLogicalCall, } from "./provider-call.js";
+import { forgetProviderFailure, isKnownProviderFailure, isSettledWrite, keyProtectsCall, knownCallFailure, refusalRequest, onlyAuxiliaryRequests, knownProviderFailure, openLogicalCall, } from "./provider-call.js";
 import { classifyWriteOutcome, settleWrite, settleWriteResult } from "./write-outcome.js";
 import { classificationDigest, recordAuthFailure, recordCallEntry, replayClassificationDigest, resolveInvocationAuthEffect, } from "./invocation-auth.js";
 import { downstreamContinuation, recordDownstreamArgumentEcho, isDownstreamInputResult, assertDownstreamOutputSafe, } from "./downstream-input-context.js";
@@ -141,6 +142,7 @@ export class InvocationFailure extends Error {
     }
 }
 keepErrorName(InvocationFailure, "InvocationFailure");
+const withoutExample = ({ example: _example, ...stated }) => stated;
 /**
  * Shared downstream invocation engine. Address/catalog resolution is delegated
  * to the request-local CatalogService; every remaining call semantic lives
@@ -286,10 +288,13 @@ export class InvocationService {
                 }
                 if (mayHaveWritten &&
                     (error.code === "auth_required" || error.code === "downstream_oauth_required") &&
-                    !logicalCall?.sent.some((request) => request.dispatched)) {
+                    !logicalCall?.sent.some((request) => request.dispatched) &&
+                    !(answered && refusalRequest(error)?.dispatched === false)) {
                     // An empty resource ledger cannot settle this auth failure. Keep
                     // actual resource-refusal provenance, but withdraw an empty ledger's
                     // known mark before composing advice and counting program writes.
+                    // A boundary-owned physical pre-dispatch refusal is positive proof;
+                    // its private provenance cannot be supplied by error fields.
                     answered = false;
                     forgetProviderFailure(error);
                 }
@@ -406,6 +411,14 @@ export class InvocationService {
                             return error;
                         return {
                             ...error,
+                            // An example comes only from the published schema, never a connector's copy of the
+                            // call, unless the connector states why there is none.
+                            validation: {
+                                ...withoutExample(error.validation),
+                                ...(error.validation.exampleUnavailable === undefined && resolved?.definition.inputSchema
+                                    ? schemaExample(resolved.definition.inputSchema)
+                                    : {}),
+                            },
                             connector: target.connector.id,
                             operation: `${target.connector.id}.${target.toolName}`,
                             nextAction: this.catalog.searchRecovery({
@@ -552,7 +565,7 @@ export class InvocationService {
                     return framingError("read_only_endpoint", `Tool "${canonicalAddress}" is a write, and ${connectorReadOnly ? `connector "${target.connector.id}"` : "this endpoint"} is read-only. Nothing here can send it.`);
                 }
                 if (refusal === "destructive_tool_requires_approval") {
-                    return framingError("destructive_tool_requires_approval", `Tool "${canonicalAddress}" is a write. Invoke it through call_destructive_tool so the MCP host can request approval.`);
+                    return framingError("destructive_tool_requires_approval", `Tool "${canonicalAddress}" is a write. ${routePhrases(context).writeNeedsApproval}`);
                 }
                 // Remote MCP tools advertise their input schema in the catalog. Validate
                 // against that same request-local definition before admission or provider
@@ -580,7 +593,12 @@ export class InvocationService {
                     return yield* Effect.fail(callSignal.reason);
                 attempts = 1;
                 const call = (permit) => Effect.gen({ self: this }, function* () {
-                    const operationContext = this.registry.contextFor(target.connector.id, this.catalog.baseUrl, this.catalog.requestScope, defined({ signal: callSignal, timeoutMs: context.timeoutMs, defer: this.catalog.defer }));
+                    const operationContext = this.registry.contextFor(target.connector.id, this.catalog.baseUrl, this.catalog.requestScope, defined({
+                        signal: callSignal,
+                        timeoutMs: context.timeoutMs,
+                        defer: this.catalog.defer,
+                        routes: context.routes,
+                    }));
                     const lease = callFromContext(operationContext, write ? "write" : "read", {
                         admitted: true,
                         // An invocation deadline aborts when its call finishes. A
@@ -604,11 +622,11 @@ export class InvocationService {
                     yield* Effect.gen(function* () {
                         if (target.connector.credential) {
                             if (!connectorContext.credential) {
-                                throw new ConnectorCallError("auth_required", "Operator-managed credential storage is not configured. Call " +
-                                    `authorize_connector({ connector: "${target.connector.id}" }).`);
+                                throw new ConnectorCallError("auth_required", "Operator-managed credential storage is not configured. " +
+                                    routePhrases(connectorContext).authorizeCall(target.connector.id));
                             }
                             if (!(yield* Context.get(lease.services, Credentials).values)) {
-                                throw new ConnectorCallError("auth_required", `Connector "${target.connector.id}" has no stored credential. Call authorize_connector.`);
+                                throw new ConnectorCallError("auth_required", `Connector "${target.connector.id}" has no stored credential. ${routePhrases(connectorContext).authorizeCall()}`);
                             }
                         }
                         yield* resolveInvocationAuthEffect(connector, callTool, connectorContext);

package/dist/membership.d.ts

@@ -22,6 +22,7 @@ export interface ResolvedPool {
     readOnly: boolean;
     /** Exactly the pool's `tools`; nothing intersects or widens it. */
     access: ConnectorAccess;
+    /** Non-empty and homogeneous: all people or all agents. */
     members: readonly Member[];
     /** Trimmed `owner`: the Workspace address agents in this pool act as. */
     owner?: string;
@@ -40,11 +41,8 @@ export interface MemberContext {
 }
 /** The namespaces bare ids may resolve in, read from the resolved providers. */
 export declare function memberContext(auth: readonly InboundAuth[], agents: readonly string[]): MemberContext;
-/**
- * Resolve one list of references, throwing on any that is malformed,
- * ambiguous, unknown, or repeated (INV-11).
- */
-export declare function resolveMembers(value: unknown, path: string, context: MemberContext): Member[];
+/** Resolve a pool's members, which are all people or all agents (INV-11). */
+export declare function resolvePoolMembers(value: unknown, path: string, context: MemberContext): Member[];
 /**
  * `maintainers`: people only. Required whenever an inbound provider can admit
  * a person, which is any provider but the built-in agent-token adapter. With
@@ -53,5 +51,15 @@ export declare function resolveMembers(value: unknown, path: string, context: Me
 export declare function resolveMaintainers(value: unknown, admitsPeople: boolean, context: MemberContext): readonly IdentityReference[];
 /** Whether an admitted identity is this member. An agent never matches a person. */
 export declare function isMember(member: Member, identity: Readonly<AuthenticatedIdentity>): boolean;
+/**
+ * Non-maintainer people listed in several pools, in declaration order. Plain
+ * `/mcp` routes a person by their single pool, so it refuses each of these.
+ * An open deployment admits no people, so it has none.
+ */
+export declare function peopleInSeveralPools(pools: ReadonlyMap<string, ResolvedPool>, maintainers: readonly IdentityReference[]): Array<{
+    namespace: string;
+    id: string;
+    pools: string[];
+}>;
 /** Whether an admitted identity is a listed maintainer. */
 export declare function isMaintainer(maintainers: readonly IdentityReference[], identity: Readonly<AuthenticatedIdentity>): boolean;

package/dist/membership.js

@@ -65,7 +65,7 @@ const memberKey = (member) => member.kind === "agent" ? `agent\0${member.name}`
  * Resolve one list of references, throwing on any that is malformed,
  * ambiguous, unknown, or repeated (INV-11).
  */
-export function resolveMembers(value, path, context) {
+function resolveMembers(value, path, context) {
     if (!Array.isArray(value)) {
         throw new ConfigError(`${path} must be an array of principal ids, { namespace, id }, or "agent:<name>".`);
     }
@@ -79,6 +79,14 @@ export function resolveMembers(value, path, context) {
         return Object.freeze(member);
     });
 }
+/** Resolve a pool's members, which are all people or all agents (INV-11). */
+export function resolvePoolMembers(value, path, context) {
+    const members = resolveMembers(value, path, context);
+    if (!members.every((member) => member.kind === members[0].kind)) {
+        throw new ConfigError(`${path} mixes people and agents; list only one kind.`);
+    }
+    return members;
+}
 /**
  * `maintainers`: people only. Required whenever an inbound provider can admit
  * a person, which is any provider but the built-in agent-token adapter. With
@@ -88,7 +96,7 @@ export function resolveMaintainers(value, admitsPeople, context) {
     const path = "ConnectaConfig.maintainers";
     if (value === undefined || (Array.isArray(value) && value.length === 0)) {
         if (admitsPeople) {
-            throw new ConfigError(`${path} is required with inbound auth: list the people who may use plain /mcp, administer shared ` +
+            throw new ConfigError(`${path} is required with inbound auth: list the people who receive the whole catalog at plain /mcp, administer shared ` +
                 "credentials, manage agent tokens, and read activity.");
         }
         return Object.freeze([]);
@@ -115,6 +123,30 @@ export function isMember(member, identity) {
         principal.namespace === member.namespace &&
         principal.id === member.id);
 }
+/**
+ * Non-maintainer people listed in several pools, in declaration order. Plain
+ * `/mcp` routes a person by their single pool, so it refuses each of these.
+ * An open deployment admits no people, so it has none.
+ */
+export function peopleInSeveralPools(pools, maintainers) {
+    if (maintainers.length === 0)
+        return [];
+    const people = new Map();
+    for (const [name, pool] of pools) {
+        for (const member of pool.members) {
+            if (member.kind !== "human")
+                continue;
+            if (maintainers.some((m) => m.namespace === member.namespace && m.id === member.id))
+                continue;
+            const key = JSON.stringify([member.namespace, member.id]);
+            const person = people.get(key) ?? { namespace: member.namespace, id: member.id, pools: [] };
+            if (!person.pools.includes(name))
+                person.pools.push(name);
+            people.set(key, person);
+        }
+    }
+    return [...people.values()].filter((person) => person.pools.length > 1);
+}
 /** Whether an admitted identity is a listed maintainer. */
 export function isMaintainer(maintainers, identity) {
     return maintainers.some((maintainer) => isMember({ kind: "human", ...maintainer }, identity));

package/dist/meta-tools.js

@@ -1,3 +1,4 @@
+import { META_ROUTES } from "./agent-routes.js";
 import { toolError } from "./tool-error.js";
 import { upwardStep } from "./upward.js";
 import { authCall, authInvoke, authFlow, authMethod, authStorage, registerAuth } from "./auth/native.js";
@@ -178,7 +179,7 @@ function isWellFormedText(text) {
  * reported the decoy near the top instead. A write never gets this: repeating
  * it is the one thing its notice forbids.
  */
-const READ_REDUCE_FIRST = "To find something specific, repeat this read inside execute_code with connecta.call and filter or search the result there, returning only what matters";
+const readReduceFirst = (routes) => `To find something specific, repeat this read inside ${routes.program} with connecta.call and filter or search the result there, returning only what matters`;
 function pagingHint(results, totalBytes, preview) {
     if (results.pagingTool === "read_result") {
         const shown = preview.kind === "prefix"
@@ -190,13 +191,13 @@ function pagingHint(results, totalBytes, preview) {
     }
     if (!results.write) {
         if (results.binding.program)
-            return "filter/map/slice data inside execute_code and return only what you need; page this completed return with connecta.result using nextAction.";
+            return `filter/map/slice data inside ${results.routes.program} and return only what you need; page this completed return with connecta.result using nextAction.`;
         const [shown, full] = preview.kind === "prefix"
             ? [`Bytes 0-${preview.bytes} of ${totalBytes} follow.`, "to read it in full, page the rest"]
             : preview.kind === "text-of-envelope"
                 ? ["Its text follows.", `to read the full ${totalBytes}-byte content array as JSON, page it`]
                 : [`The result is ${totalBytes} bytes.`, "to read it in full, page it"];
-        return `${shown} ${READ_REDUCE_FIRST}; ${full} with connecta.result using nextAction.`;
+        return `${shown} ${readReduceFirst(results.routes)}; ${full} with connecta.result using nextAction.`;
     }
     const body = preview.kind === "prefix"
         ? `Bytes 0-${preview.bytes} of ${totalBytes} follow; page the rest with connecta.result using nextAction.`
@@ -263,7 +264,7 @@ const stashResult = function (bytes, results, preview, rawText) {
                     ? `Paging is unavailable. ${WRITE_ALREADY_RAN}`
                     : results.pagingTool
                         ? "Paging is unavailable."
-                        : "Paging is unavailable. Use execute_code to reduce read-only results before returning them.",
+                        : `Paging is unavailable. Use ${results.routes.program} to reduce read-only results before returning them.`,
             };
         }
         return {
@@ -302,6 +303,8 @@ const pageProgramResultNative = /* @__PURE__ */ registerAuth(pageProgramResult,
         const bytes = enc.encode(text);
         const write = resolved.definition.classification !== "read";
         const notice = yield* upwardStep(stashResult(bytes, {
+            // Program-call pages name only execute_code, listed wherever programs run.
+            routes: META_ROUTES,
             binding: {
                 identity: registry.resultIdentity(),
                 baseUrl,
@@ -341,6 +344,8 @@ const guardProgramReturnNative = /* @__PURE__ */ registerAuth(guardProgramReturn
         const cap = Math.min(registry.maxResultBytes, ...dependencies.map((dependency) => resolveMaxResultBytes(registry.getConnector(dependency.connector)?.maxResultBytes, registry.maxResultBytes)));
         const results = {
             secrets,
+            // A program return names only execute_code, which every surface running programs lists.
+            routes: META_ROUTES,
             binding: {
                 identity: registry.resultIdentity(),
                 baseUrl,
@@ -541,12 +546,13 @@ function metaToolsForRequest(registry, baseUrl, opts = {}) {
     // identity lets remote connectors reuse one downstream client inside that
     // request without leaking request-bound I/O into the next one.
     const requestScope = opts.requestScope ?? {};
+    const routes = opts.routes ?? META_ROUTES;
     if (opts.canManageAuth || opts.oauthConnectUrl || opts.credentialHandoffUrl || opts.oauthConnectUnavailable) {
         bindAuthorizationHandoffs(requestScope, authMethod((connector) => authCall(authorizationHandoff, [
             registry,
             baseUrl,
             requestScope,
-            opts,
+            { ...opts, routes },
             { connector },
         ])));
     }
@@ -567,6 +573,7 @@ function metaToolsForRequest(registry, baseUrl, opts = {}) {
         requestSignal: opts.requestSignal,
         // searchRoute keeps its top-level default. In-program callers use a
         // separate CatalogService configured for connecta.search.
+        routes,
     });
     const invocation = new InvocationService(registry, catalog, opts.activity);
     /** MCP adapter: shared invocation semantics plus MCP-only result shaping. */
@@ -584,6 +591,7 @@ function metaToolsForRequest(registry, baseUrl, opts = {}) {
                     activitySource: opts.activitySource,
                     sentSecrets,
                     readOnly: opts.readOnly,
+                    routes,
                     ...(timeoutMs !== undefined ? { timeoutMs } : {}),
                     ...(opts.requestSignal !== undefined ? { requestSignal: opts.requestSignal } : {}),
                     unwrapResult: call.resultMode === "value",
@@ -612,6 +620,7 @@ function metaToolsForRequest(registry, baseUrl, opts = {}) {
                         const cap = resolveMaxResultBytes(resolved.connector.maxResultBytes, globalCap);
                         const results = {
                             secrets,
+                            routes,
                             binding: {
                                 identity: registry.resultIdentity(),
                                 baseUrl,
@@ -836,6 +845,7 @@ function metaToolsForRequest(registry, baseUrl, opts = {}) {
                 binding.identity.subject !== identity.subject ||
                 binding.identity.principal !== identity.principal ||
                 binding.identity.endpoint !== identity.endpoint ||
+                binding.identity.pool !== identity.pool ||
                 binding.identity.origin !== identity.origin ||
                 (binding.program === undefined
                     ? typeof binding.connector !== "string" || typeof binding.tool !== "string"
@@ -990,11 +1000,15 @@ function metaToolsForRequest(registry, baseUrl, opts = {}) {
         })),
     };
 }
-const SEARCH_DESC = (readOnly) => `${readOnly ? "Use top-level search for catalog inspection; this read-only endpoint omits write tools." : "Use top-level search for catalog inspection or write work before call_destructive_tool."} Unknown-address read-only work belongs in one execute_code program that searches, calls, and returns the answer. Use 2–4 action/object terms and includeSchemas="compact"; the default limit is ${DEFAULT_SEARCH_LIMIT}. Set connector when known. safety="readOnly" selects reads; "approvalRequired" selects the fail-closed write complement. The host owns confirmation; these filters grant no authority. Empty query browses. Returns { catalogErrors, tools, total, offset, limit, hasMore }; read catalogErrors and absence before selecting a tool. Compact schemas have schemaFormat="text".`;
-const CALL_DESC = (readOnly) => `Call one known-address tool explicitly annotated readOnlyHint: true. Use execute_code for unknown-address, multiple, dependent, or reduced read-only work. ${readOnly ? "This endpoint is read-only and refuses every write." : "Unannotated or write-capable tools fail closed to call_destructive_tool."} A truncated result carries a connecta.result action.`;
+// Each description states only its own tool's scope; the full routing rule
+// lives once in the server instructions. A client that drops instructions
+// still routes correctly from these scopes plus execute_code's terse lead.
+// Only the meta surface lists these tools, so they use its names.
+const SEARCH_DESC = (readOnly) => `${readOnly ? "Catalog inspection; this read-only endpoint omits write tools." : `Catalog inspection, or finding a write before ${META_ROUTES.write}.`} For read work, search inside one ${META_ROUTES.program} program that also calls and returns the answer. Use 2–4 action/object terms and includeSchemas="compact"; the default limit is ${DEFAULT_SEARCH_LIMIT}. Set connector when known. safety="readOnly" selects reads; "approvalRequired" selects the fail-closed write complement; neither grants authority. Empty query browses. Read catalogErrors and absence before selecting a tool. Compact schemas have schemaFormat="text".`;
+const CALL_DESC = (readOnly) => `Call one known-address read: a tool explicitly annotated readOnlyHint: true. Other read work: ${META_ROUTES.program}. ${readOnly ? "This endpoint is read-only and refuses every write." : `Unannotated or write-capable tools fail closed to ${META_ROUTES.write}.`} A truncated result carries a connecta.result action.`;
 const CALL_DESTRUCTIVE_DESC = "Call any tool not explicitly annotated readOnlyHint: true. Include a short reason for the human reviewer after checking the schema and consequences. The reason grants no authority and is not sent downstream.";
 /** A read-only endpoint keeps the six-tool surface, so this tool says why it never writes here. */
-const CALL_DESTRUCTIVE_READ_ONLY_DESC = "This endpoint is read-only: search and describe omit write tools, and every write call here is refused. Reads still run; prefer call_tool or execute_code for them.";
+const CALL_DESTRUCTIVE_READ_ONLY_DESC = `This endpoint is read-only: search and describe omit write tools, and every write call here is refused. Reads still run; prefer ${META_ROUTES.read} or ${META_ROUTES.program} for them.`;
 const AUTHORIZE_DESC = "Use after auth_required. Returns an OAuth or operator-credential handoff, or required deployment configuration. A configured credential reports presence only: if a call just failed with an authentication or operator-configuration error, give the retained handoff to the operator; otherwise proceed with the call. force=true requests an OAuth restart when the verified user opens the /connect URL; this tool never accepts credentials.";
 const SKILLS_DESC = "List or fetch on-demand guidance. Fetch usage only when the always-loaded instructions are insufficient or a program needs repair.";
 /**
@@ -1084,6 +1098,7 @@ const AUTHORIZE_INPUT = advertisedSchema(z.object({
 export function registerMetaTools(server, registry, ctx) {
     const mt = createMetaTools(registry, ctx.baseUrl, {
         maxProgramResultChars: ctx.maxProgramResultChars,
+        routes: ctx.routes,
         ...(ctx.native && !ctx.native.executeCode ? { pagingTool: "read_result" } : {}),
         ...(ctx.native ? { activitySource: "native" } : {}),
         downstreamInput: Boolean(ctx.authElicitation),
@@ -1115,6 +1130,37 @@ export function registerMetaTools(server, registry, ctx) {
         bindRequest(request);
         return yield* upwardStep(authInvoke(mt, "skills", [args]));
     })));
+    server.registerTool("authorize_connector", {
+        description: ctx.native
+            ? AUTHORIZE_DESC +
+                " Use when a connector’s tools are missing. Granted: " +
+                registry
+                    .listConnectors()
+                    .map((connector) => connector.id)
+                    .join(", ") +
+                "."
+            : AUTHORIZE_DESC,
+        inputSchema: AUTHORIZE_INPUT,
+        outputSchema: AUTHORIZE_OUTPUT,
+        // Starts (or with force, resets) a downstream OAuth flow — it changes
+        // stored connector auth state, so it is deliberately not read-only.
+        annotations: {
+            readOnlyHint: false,
+            destructiveHint: false,
+            openWorldHint: true,
+        },
+    }, authMethod((args, request) => authFlow(function* () {
+        bindRequest(request);
+        const run = authMethod(() => authInvoke(mt, "authorizeConnector", [args]));
+        return yield* upwardStep(ctx.authElicitation
+            ? authInvoke(ctx.authElicitation, "run", [
+                "authorize_connector",
+                args,
+                request,
+                run,
+            ])
+            : authCall(run, []));
+    })));
     if (ctx.native) {
         if (!ctx.native.executeCode) {
             server.registerTool("read_result", { description: READ_RESULT_DESC, inputSchema: READ_RESULT_INPUT, annotations: READ_ONLY_LOCAL }, authMethod((args, request) => authFlow(function* () {
@@ -1186,28 +1232,5 @@ export function registerMetaTools(server, registry, ctx) {
             ])
             : authInvoke(mt, "callDestructiveTool", [call]));
     })));
-    server.registerTool("authorize_connector", {
-        description: AUTHORIZE_DESC,
-        inputSchema: AUTHORIZE_INPUT,
-        outputSchema: AUTHORIZE_OUTPUT,
-        // Starts (or with force, resets) a downstream OAuth flow — it changes
-        // stored connector auth state, so it is deliberately not read-only.
-        annotations: {
-            readOnlyHint: false,
-            destructiveHint: false,
-            openWorldHint: true,
-        },
-    }, authMethod((args, request) => authFlow(function* () {
-        bindRequest(request);
-        const run = authMethod(() => authInvoke(mt, "authorizeConnector", [args]));
-        return yield* upwardStep(ctx.authElicitation
-            ? authInvoke(ctx.authElicitation, "run", [
-                "authorize_connector",
-                args,
-                request,
-                run,
-            ])
-            : authCall(run, []));
-    })));
     return undefined;
 }

package/dist/native-recovery.js

@@ -1,5 +1,5 @@
 /** Adapt only Connecta error envelopes; successful downstream payloads stay untouched. */
-export function nativeRecovery(result, executeCode, wireName) {
+export function nativeRecovery(result, wireName) {
     const response = result;
     const body = response?.structuredContent;
     if (!response?.isError || !body || typeof body.error !== "object" || !body.error)
@@ -28,22 +28,10 @@ export function nativeRecovery(result, executeCode, wireName) {
             }
             : { host: "search", purpose: action.purpose };
     }
-    // These are Connecta-authored recovery fields, never arbitrary downstream data.
-    const rewrite = (text) => text.replace(/authorize_connector|search_tools|call_(?:destructive_)?tool|execute_code/g, (tool) => tool === "authorize_connector"
-        ? "the returned authorization handoff"
-        : tool.startsWith("call_")
-            ? "the original native tool"
-            : tool === "execute_code" && executeCode
-                ? tool
-                : "your host's tool search");
-    for (const key of ["message", "instructions", "retry"])
-        if (typeof error[key] === "string")
-            error[key] = rewrite(error[key]);
+    // Recovery text already uses the native wording: native pools build it with
+    // native route names. Only the address in retry text becomes the wire name.
     if (wireName && typeof error.operation === "string" && typeof error.retry === "string")
-        error.retry = error.retry.replaceAll(rewrite(error.operation), wireName);
-    if (!executeCode && typeof error.instructions === "string") {
-        error.instructions = error.instructions.replace(/; connecta\.search[\s\S]*$/, ". Retry the original native call after recovery.");
-    }
+        error.retry = error.retry.replaceAll(error.operation, wireName);
     return {
         ...response,
         structuredContent: { ...body, error },

package/dist/native-tools.js

@@ -1,4 +1,5 @@
 import { bytesToHex } from "./bytes.js";
+import { routeNames } from "./agent-routes.js";
 import { duringViewEffect } from "./runtime/call.js";
 import { RequestScope, requestOwner } from "./runtime/request-scope.js";
 import { Effect } from "effect";
@@ -28,7 +29,7 @@ const SEPARATOR = "__";
 const PLAIN_TOOL = /^[A-Za-z0-9-](?:[A-Za-z0-9-]|_(?!_))*$/;
 const NATIVE_NAME = new RegExp(`^[A-Za-z][A-Za-z0-9_-]{0,${NATIVE_NAME_MAX - 1}}$`);
 /** Connecta's own tools on a native endpoint. Their names never contain `__`. */
-const NATIVE_OWN_TOOLS = ["execute_code", "skills", "read_result"];
+const NATIVE_OWN_TOOLS = ["execute_code", "skills", "read_result", "authorize_connector"];
 const enc = new TextEncoder();
 function shortHash(text) {
     return runEdge(shortHashNative(text));
@@ -149,6 +150,8 @@ export class NativeSurface {
             // Listing omits a read-only endpoint's writes, as search does.
             readOnly: options.readOnly,
             defer: options.defer,
+            // Declared schema descriptions read as this pool serves them.
+            routes: routeNames(options.executeCode ? "native-code" : "native"),
         });
     }
     /**
@@ -183,7 +186,7 @@ export class NativeSurface {
             ...(entry ? { _meta: { "dev.connecta/address": `${entry.connector.id}.${entry.tool.name}` } } : {}),
         }, authMethod((args, request) => Effect.gen({ self: this }, function* () {
             const result = yield* authInvoke(this, "call", [name, args ?? {}, request]);
-            return nativeRecovery(result, this.options.executeCode, name);
+            return nativeRecovery(result, name);
         })));
     }
     /**

package/dist/oauth-sealing.js

@@ -46,3 +46,13 @@ export async function deriveRequestStateKey(raw) {
         info: new TextEncoder().encode("auth-elicitation"),
     }, material, 256));
 }
+/** A non-extractable HMAC key for secret-bearing stored cache keys; nothing is stored. */
+export async function deriveStorageDigestKey(raw) {
+    const material = await crypto.subtle.importKey("raw", new Uint8Array(raw), "HKDF", false, ["deriveKey"]);
+    return crypto.subtle.deriveKey({
+        name: "HKDF",
+        hash: "SHA-256",
+        salt: new TextEncoder().encode("connecta:storage-digest:v1"),
+        info: new TextEncoder().encode("cache-keys"),
+    }, material, { name: "HMAC", hash: "SHA-256", length: 256 }, false, ["sign"]);
+}