@capybara-hq/kernel 0.1.0-rc.3 → 0.1.0-rc.5

package/dist/tools/extension-tools.controller.js

@@ -0,0 +1,37 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { Controller, Get, Header, Inject } from "@nestjs/common";
+import { CurrentOrg, OrgAction } from "../orgs/org.guard.js";
+import { OrgExtensionTools } from "./info.js";
+/**
+ * `GET /api/v1/orgs/:orgId/tools/extensions` (`agents.use`) → `{ extensions }`: the tools of the
+ * extensions enabled in the org, grouped by extension, for the agent form's Tools section (it adds
+ * or removes `{kind:"plugin",plugin,name}` references). Display only; nothing here is model-visible.
+ */
+let ExtensionToolsController = class ExtensionToolsController {
+    tools;
+    constructor(tools) {
+        this.tools = tools;
+    }
+    async extensions(org) {
+        return { extensions: await this.tools.list(org.orgId) };
+    }
+};
+__decorate([
+    Get("extensions"),
+    Header("cache-control", "private, no-store"),
+    OrgAction("agents.use"),
+    __param(0, CurrentOrg())
+], ExtensionToolsController.prototype, "extensions", null);
+ExtensionToolsController = __decorate([
+    Controller("api/v1/orgs/:orgId/tools"),
+    __param(0, Inject(OrgExtensionTools))
+], ExtensionToolsController);
+export { ExtensionToolsController };

package/dist/tools/info.d.ts

@@ -1,7 +1,8 @@
-import { type LocalizedName } from "@capybara-hq/plugin-sdk";
+import { type LocalizedName, type ToolAnnotations } from "@capybara-hq/plugin-sdk";
 import { ConversationAccess } from "../conversations/access.js";
 import type { KernelSchemaDb } from "../db/kernel-schema.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
+import { OrgToolSwitches } from "./org-tool-switches.js";
 import { ToolRegistry } from "./registry.js";
 /**
  * Tool presentation metadata for the conversation page (UI refresh B, design spec §6.16.9): the
@@ -84,3 +85,43 @@ export declare class ConversationToolInfo {
     access: Pick<ConversationAccess, "isAccessible">);
     get(orgId: string, conversationId: string, viewerAccountId: string, keys: readonly string[]): Promise<ToolInfo[]>;
 }
+/** One tool of {@link OrgExtensionTools}. Display only, for the agent form. */
+export interface ExtensionToolOffer {
+    /** The tool's registered name (the `name` of a `{kind:"plugin"}` reference). */
+    name: string;
+    /** The model-visible key, `plugin__<plugin>__<name>` (the `toolPolicies` key). */
+    key: string;
+    /** The declared display title (`ToolSpec.title`), or null. */
+    title: string | null;
+    /** The first non-empty line of the tool's description (English, model-facing text). */
+    description: string;
+    annotations: ToolAnnotations;
+    /** The tool's default policy: its `defaultPolicy`, else derived from the annotations. */
+    defaultPolicy: "allow" | "ask";
+    /**
+     * The org turned this tool off (layering spec A §7): still listed, so the form shows it as
+     * unavailable in the agents that selected it.
+     */
+    switchedOff: boolean;
+}
+/** One extension of {@link OrgExtensionTools} with its tools, in registration order. */
+export interface ExtensionToolsOffer {
+    plugin: string;
+    /** The plugin's catalog display name, else its name. */
+    displayName: LocalizedName;
+    tools: ExtensionToolOffer[];
+}
+/**
+ * `GET /orgs/:orgId/tools/extensions`: the tools an agent of this org can reference by
+ * `{kind:"plugin"}` and get at run time, grouped by extension: the extensions loaded on this
+ * replica and enabled in the org (`enabled.ts`, through the host), each with the tools it
+ * registered whose key is valid (`ToolRegistry.forAgent` reports the others unavailable); a tool
+ * the org turned off is listed with `switchedOff`.
+ */
+export declare class OrgExtensionTools {
+    private readonly db;
+    private readonly registry;
+    private readonly switches;
+    constructor(db: KernelDb, registry: Pick<ToolRegistry, "extensionToolSpecs" | "enabledExtensions">, switches: Pick<OrgToolSwitches, "offKeys">);
+    list(orgId: string): Promise<ExtensionToolsOffer[]>;
+}

package/dist/tools/info.js

@@ -16,7 +16,9 @@ import { UUID_RE } from "../ui/registry.js";
 import { BUILTIN_TOOL_KINDS, SANDBOX_TOOL_NAMES } from "./builtin-names.js";
 import { pluginDisplayNames } from "./display-names.js";
 import { isLegacyBuiltinKey, LEGACY_BUILTINS } from "./legacy-keys.js";
-import { ToolRegistry } from "./registry.js";
+import { toolKeyIssue } from "./naming.js";
+import { OrgToolSwitches } from "./org-tool-switches.js";
+import { policyFromAnnotations, ToolRegistry } from "./registry.js";
 export { BUILTIN_TOOL_KINDS } from "./builtin-names.js";
 /** At most this many keys per request, each at most {@link TOOL_INFO_KEY_MAX} characters. */
 export const TOOL_INFO_MAX_KEYS = 100;
@@ -160,3 +162,64 @@ ConversationToolInfo = __decorate([
     __param(2, Inject(ConversationAccess))
 ], ConversationToolInfo);
 export { ConversationToolInfo };
+/**
+ * `GET /orgs/:orgId/tools/extensions`: the tools an agent of this org can reference by
+ * `{kind:"plugin"}` and get at run time, grouped by extension: the extensions loaded on this
+ * replica and enabled in the org (`enabled.ts`, through the host), each with the tools it
+ * registered whose key is valid (`ToolRegistry.forAgent` reports the others unavailable); a tool
+ * the org turned off is listed with `switchedOff`.
+ */
+let OrgExtensionTools = class OrgExtensionTools {
+    db;
+    registry;
+    switches;
+    constructor(db, registry, switches) {
+        this.db = db;
+        this.registry = registry;
+        this.switches = switches;
+    }
+    async list(orgId) {
+        const [enabled, off] = await Promise.all([
+            this.registry.enabledExtensions(orgId),
+            this.switches.offKeys(orgId),
+        ]);
+        const groups = new Map();
+        for (const t of this.registry.extensionToolSpecs()) {
+            if (!enabled.has(t.plugin))
+                continue;
+            const key = extensionToolKey(t.plugin, t.spec.name);
+            if (toolKeyIssue(key) !== null)
+                continue;
+            const tools = groups.get(t.plugin) ?? [];
+            if (tools.some((x) => x.name === t.spec.name))
+                continue;
+            tools.push({
+                name: t.spec.name,
+                key,
+                title: display(t.spec).title,
+                description: firstLine(t.spec.description),
+                annotations: { ...(t.spec.annotations ?? {}) },
+                defaultPolicy: t.spec.defaultPolicy ?? policyFromAnnotations(t.spec.annotations),
+                switchedOff: off.has(key),
+            });
+            groups.set(t.plugin, tools);
+        }
+        const names = await pluginDisplayNames(this.db.db, [...groups.keys()]);
+        return [...groups].map(([plugin, tools]) => ({
+            plugin,
+            displayName: names.get(plugin) ?? { zh: plugin, en: plugin },
+            tools,
+        }));
+    }
+};
+OrgExtensionTools = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(ToolRegistry)),
+    __param(2, Inject(OrgToolSwitches))
+], OrgExtensionTools);
+export { OrgExtensionTools };
+const firstLine = (s) => (typeof s === "string" ? s : "")
+    .split("\n")
+    .map((l) => l.trim())
+    .find((l) => l !== "") ?? "";

package/dist/tools/oauth/flow-paths.d.ts

@@ -6,7 +6,7 @@ export declare const OAUTH_STATE_TTL_SECONDS = 600;
 /** 浏览器绑定 Cookie：回调必须来自发起连接的同一个浏览器。 */
 export declare const OAUTH_BINDING_COOKIE = "cap_oauth";
 /** 回调失败、或连接时没给回跳页面时回到的网页（next-intl 会补语言前缀）。 */
-export declare const DEFAULT_RETURN_PATH = "/settings/connections";
+export declare const DEFAULT_RETURN_PATH = "/account/connections";
 /** OAuth 连接器需要 `http.publicUrl`（回调地址）；未配置 → 这条校验错误。 */
 export declare const publicUrlRequired: () => ApiError;
 export declare function callbackUrl(publicUrl: string): string;

package/dist/tools/oauth/flow-paths.js

@@ -8,7 +8,7 @@ export const OAUTH_STATE_TTL_SECONDS = 600;
 /** 浏览器绑定 Cookie：回调必须来自发起连接的同一个浏览器。 */
 export const OAUTH_BINDING_COOKIE = "cap_oauth";
 /** 回调失败、或连接时没给回跳页面时回到的网页（next-intl 会补语言前缀）。 */
-export const DEFAULT_RETURN_PATH = "/settings/connections";
+export const DEFAULT_RETURN_PATH = "/account/connections";
 /** OAuth 连接器需要 `http.publicUrl`（回调地址）；未配置 → 这条校验错误。 */
 export const publicUrlRequired = () => new ApiError("validation_failed", "Request validation failed", [
     {

package/dist/tools/org-tool-switches.d.ts

@@ -0,0 +1,74 @@
+import { ExtensionHost } from "../extensions/host.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { TransactionHost } from "../infra/database/transaction-host.js";
+import { OrgLock } from "../orgs/org-lock.js";
+/** One tool of an extension with its switch in the org. */
+export interface OrgToolSwitch {
+    tool: string;
+    enabled: boolean;
+}
+/** An org agent whose current version selects the tool being switched off. */
+export interface AffectedAgent {
+    id: string;
+    name: string;
+}
+/**
+ * The result of {@link OrgToolSwitches.set}: the PCM §5 rule 8 preview of a switch-off (the org's
+ * agents that selected the tool and the hash to confirm it with), or the switch applied.
+ */
+export type OrgToolSwitchResult = {
+    applied: false;
+    affectedAgents: AffectedAgent[];
+    confirm: string;
+} | {
+    applied: true;
+};
+/** Model-visible (English): why a turned-off extension tool is not offered. */
+export declare const toolTurnedOffReason: (key: string) => string;
+/**
+ * Per-org switches of single extension tools (layering spec A §7, table `org_tool_switches`): an
+ * org admin turns off one tool an extension registers (`ctx.tools.register`); it is then not
+ * offered to any agent of the org (`ToolRegistry.forAgent`) and refused if called
+ * (`ToolPipeline`). No row means on. A row of a tool the extension stops registering is kept and
+ * applies again if the tool comes back. Builtin and connector tools are out of scope. Read from PG
+ * on every use, no in-process state.
+ */
+export declare class OrgToolSwitches {
+    private readonly kdb;
+    readonly txHost: TransactionHost;
+    private readonly host;
+    /** The org row lock: re-checks `org.extensions.manage` under the lock. */
+    private readonly orgLock;
+    constructor(kdb: KernelDb, txHost: TransactionHost, host: Pick<ExtensionHost, "tools">, 
+    /** The org row lock: re-checks `org.extensions.manage` under the lock. */
+    orgLock: Pick<OrgLock, "lockAndAuthorize">);
+    private get db();
+    /** The tool names `plugin` registers on this replica, in registration order. */
+    private registered;
+    /**
+     * The tools of an extension the org sees: running here and visible under plugin scope, else 404
+     * `extension.not_found` (an invisible one is answered like an unknown one).
+     */
+    private toolsFor;
+    /** The stored switches of the org (all extensions, or one), `false` ones only matter. */
+    private offRows;
+    /** Every tool the extension registers on this replica with its switch (default on). */
+    list(orgId: string, plugin: string): Promise<OrgToolSwitch[]>;
+    /** The model-visible keys (`plugin__<extension>__<tool>`) of the tools turned off in the org. */
+    offKeys(orgId: string): Promise<Set<string>>;
+    /** Whether the org turned off this tool. */
+    isToolOff(orgId: string, plugin: string, tool: string): Promise<boolean>;
+    /**
+     * Switches one tool in the org. On applies at once. Off, while the tool is on: without
+     * `confirm` the preview (the org's agents whose current version selects the tool) and its hash,
+     * with the current hash the switch is written (a changed preview -> 409 `plugin.switch_stale`).
+     * A tool the extension does not register -> 404 `extension.tool_not_found`. A change writes the
+     * audit row `extension.tool_switched`.
+     */
+    set(orgId: string, plugin: string, tool: string, enabled: boolean, actor: {
+        accountId: string;
+        tokenId?: string | undefined;
+    }, confirm?: string): Promise<OrgToolSwitchResult>;
+    /** The org's live agents whose current version selects `{kind:"plugin", plugin, name: tool}`. */
+    private agentsSelecting;
+}

package/dist/tools/org-tool-switches.js

@@ -0,0 +1,184 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { createHash } from "node:crypto";
+import { extensionToolKey } from "@capybara-hq/plugin-sdk";
+import { Inject, Injectable } from "@nestjs/common";
+import { sql } from "kysely";
+import { ApiError } from "../errors.js";
+import { ExtensionHost } from "../extensions/host.js";
+import { extensionVisibleTo } from "../extensions/org-config.js";
+import { audit } from "../identity/audit.js";
+import { KernelDb } from "../infra/database/kernel-db.js";
+import { TransactionHost } from "../infra/database/transaction-host.js";
+import { Transactional } from "../infra/database/transactional.decorator.js";
+import { OrgLock } from "../orgs/org-lock.js";
+/** Model-visible (English): why a turned-off extension tool is not offered. */
+export const toolTurnedOffReason = (key) => `Tool ${key} is turned off in this organization`;
+/** The confirm hash of a switch-off preview. */
+function switchOffHash(orgId, plugin, tool, agents) {
+    return createHash("sha256")
+        .update(JSON.stringify({ orgId, plugin, tool, agents: agents.map((a) => a.id) }))
+        .digest("hex");
+}
+/**
+ * Per-org switches of single extension tools (layering spec A §7, table `org_tool_switches`): an
+ * org admin turns off one tool an extension registers (`ctx.tools.register`); it is then not
+ * offered to any agent of the org (`ToolRegistry.forAgent`) and refused if called
+ * (`ToolPipeline`). No row means on. A row of a tool the extension stops registering is kept and
+ * applies again if the tool comes back. Builtin and connector tools are out of scope. Read from PG
+ * on every use, no in-process state.
+ */
+let OrgToolSwitches = class OrgToolSwitches {
+    kdb;
+    txHost;
+    host;
+    orgLock;
+    constructor(kdb, txHost, host, 
+    /** The org row lock: re-checks `org.extensions.manage` under the lock. */
+    orgLock) {
+        this.kdb = kdb;
+        this.txHost = txHost;
+        this.host = host;
+        this.orgLock = orgLock;
+    }
+    get db() {
+        return this.kdb.db;
+    }
+    /** The tool names `plugin` registers on this replica, in registration order. */
+    registered(plugin) {
+        return [
+            ...new Set(this.host
+                .tools()
+                .filter((t) => t.plugin === plugin)
+                .map((t) => t.spec.name)),
+        ];
+    }
+    /**
+     * The tools of an extension the org sees: running here and visible under plugin scope, else 404
+     * `extension.not_found` (an invisible one is answered like an unknown one).
+     */
+    async toolsFor(orgId, plugin) {
+        const tools = this.registered(plugin);
+        if (tools.length === 0 || !(await extensionVisibleTo(this.db, orgId, plugin))) {
+            throw new ApiError("extension.not_found", `Extension ${plugin} is not installed`);
+        }
+        return tools;
+    }
+    /** The stored switches of the org (all extensions, or one), `false` ones only matter. */
+    async offRows(orgId, plugin) {
+        let q = this.db
+            .selectFrom("org_tool_switches")
+            .select(["plugin", "tool"])
+            .where("org_id", "=", orgId)
+            .where("enabled", "=", false);
+        if (plugin !== undefined)
+            q = q.where("plugin", "=", plugin);
+        return q.execute();
+    }
+    /** Every tool the extension registers on this replica with its switch (default on). */
+    async list(orgId, plugin) {
+        const tools = await this.toolsFor(orgId, plugin);
+        const off = new Set((await this.offRows(orgId, plugin)).map((r) => r.tool));
+        return tools.map((tool) => ({ tool, enabled: !off.has(tool) }));
+    }
+    /** The model-visible keys (`plugin__<extension>__<tool>`) of the tools turned off in the org. */
+    async offKeys(orgId) {
+        return new Set((await this.offRows(orgId)).map((r) => extensionToolKey(r.plugin, r.tool)));
+    }
+    /** Whether the org turned off this tool. */
+    async isToolOff(orgId, plugin, tool) {
+        const row = await this.db
+            .selectFrom("org_tool_switches")
+            .select("enabled")
+            .where("org_id", "=", orgId)
+            .where("plugin", "=", plugin)
+            .where("tool", "=", tool)
+            .executeTakeFirst();
+        return row?.enabled === false;
+    }
+    /**
+     * Switches one tool in the org. On applies at once. Off, while the tool is on: without
+     * `confirm` the preview (the org's agents whose current version selects the tool) and its hash,
+     * with the current hash the switch is written (a changed preview -> 409 `plugin.switch_stale`).
+     * A tool the extension does not register -> 404 `extension.tool_not_found`. A change writes the
+     * audit row `extension.tool_switched`.
+     */
+    async set(orgId, plugin, tool, enabled, actor, confirm) {
+        await this.orgLock.lockAndAuthorize(orgId, actor.accountId, "org.extensions.manage");
+        const tools = await this.toolsFor(orgId, plugin);
+        if (!tools.includes(tool)) {
+            throw new ApiError("extension.tool_not_found", `Extension ${plugin} does not register a tool named ${tool}`);
+        }
+        const from = !(await this.isToolOff(orgId, plugin, tool));
+        if (from === enabled)
+            return { applied: true };
+        if (!enabled) {
+            const affectedAgents = await this.agentsSelecting(orgId, plugin, tool);
+            const hash = switchOffHash(orgId, plugin, tool, affectedAgents);
+            if (confirm === undefined)
+                return { applied: false, affectedAgents, confirm: hash };
+            if (confirm !== hash) {
+                throw new ApiError("plugin.switch_stale", "What switching this tool off affects has changed; review it and confirm again");
+            }
+        }
+        await this.db
+            .insertInto("org_tool_switches")
+            .values({ org_id: orgId, plugin, tool, enabled, updated_by: actor.accountId })
+            .onConflict((oc) => oc.columns(["org_id", "plugin", "tool"]).doUpdateSet({
+            enabled,
+            updated_by: actor.accountId,
+            updated_at: sql `now()`,
+        }))
+            .execute();
+        await audit(this.db, {
+            actorAccountId: actor.accountId,
+            ...(actor.tokenId !== undefined && { actorTokenId: actor.tokenId }),
+            orgId,
+            action: "extension.tool_switched",
+            target: extensionToolKey(plugin, tool),
+            detail: { plugin, tool, from, to: enabled },
+        });
+        return { applied: true };
+    }
+    /** The org's live agents whose current version selects `{kind:"plugin", plugin, name: tool}`. */
+    async agentsSelecting(orgId, plugin, tool) {
+        const rows = await this.db
+            .selectFrom("agents as a")
+            .innerJoin("agent_versions as v", (j) => j.onRef("v.agent_id", "=", "a.id").onRef("v.version", "=", "a.current_version"))
+            .select(["a.id", "v.definition"])
+            .where("a.org_id", "=", orgId)
+            .where("a.deleted_at", "is", null)
+            .orderBy("a.id")
+            .execute();
+        const out = [];
+        for (const r of rows) {
+            const def = r.definition;
+            const refs = Array.isArray(def?.tools) ? def.tools : [];
+            const selects = refs.some((x) => {
+                const ref = x;
+                return ref?.kind === "plugin" && ref.plugin === plugin && ref.name === tool;
+            });
+            if (selects)
+                out.push({ id: r.id, name: typeof def?.name === "string" ? def.name : r.id });
+        }
+        return out;
+    }
+};
+__decorate([
+    Transactional()
+], OrgToolSwitches.prototype, "set", null);
+OrgToolSwitches = __decorate([
+    Injectable(),
+    __param(0, Inject(KernelDb)),
+    __param(1, Inject(TransactionHost)),
+    __param(2, Inject(ExtensionHost)),
+    __param(3, Inject(OrgLock))
+], OrgToolSwitches);
+export { OrgToolSwitches };

package/dist/tools/pipeline.d.ts

@@ -1,7 +1,8 @@
 import { type FormAnswer, type InputForm, type Logger } from "@capybara-hq/plugin-sdk";
-import { type AgentDefinition } from "../agents/definition.js";
+import type { AgentDefinition } from "../agents/definition.js";
 import { EventLog } from "../conversations/event-log.js";
 import type { KernelSchemaDb } from "../db/kernel-schema.js";
+import { EffectiveConfigs } from "../extensions/effective-config.js";
 import { ExtensionHost } from "../extensions/host.js";
 import { KernelConfigService } from "../infra/config/kernel-config.service.js";
 import { KernelDb } from "../infra/database/kernel-db.js";
@@ -9,16 +10,17 @@ import { TransactionHost } from "../infra/database/transaction-host.js";
 import type { OrgRole } from "../orgs/roles.js";
 import { type ConversationKindForHooks, type HookRunner } from "../runtime/hook-calls.js";
 import { type SubagentParent, type WaitingFor } from "../runtime/loop.js";
-import type { DispatchOutcome } from "../runtime/subagents/dispatch.js";
+import type { DispatchArgs, DispatchOutcome } from "../runtime/subagents/dispatch.js";
+import { SubagentMessages } from "../runtime/subagents/messages.js";
 import { SubagentsService } from "../runtime/subagents/subagents.service.js";
 import { ApprovalsService } from "./approvals.service.js";
 import { Breaker } from "./breaker.js";
-import { type AgentToolInputT } from "./builtins/agent.js";
 import { Credentials } from "./credentials.js";
 import { ToolDrift } from "./drift.js";
+import { OrgToolSwitches } from "./org-tool-switches.js";
 import { ToolOutputs } from "./outputs.js";
 import { QuestionsService } from "./questions.service.js";
-import { type ResolvedTool, ToolRegistry } from "./registry.js";
+import { type CallPolicy, type ResolvedTool, ToolRegistry } from "./registry.js";
 /** 审批被拒绝。 */
 export declare const APPROVAL_DENIED_TEXT = "The user denied this tool call.";
 /**
@@ -85,16 +87,26 @@ export interface PolicyContext {
     conversationId: string;
     runId: string;
     /**
-     * A sub-agent's call: its parent conversation, where "approve for this conversation" grants are
-     * looked up (sub-agents spec §9).
+     * A sub-agent's call: its parent conversation, whose agent's current policies apply on top
+     * (sub-agents spec §5.5).
      */
     parentConversationId?: string;
+    /**
+     * A sub-agent's call: the root conversation of its tree, where "approve for this conversation"
+     * grants are stored and looked up (agent map spec §7), so every agent of the tree uses them.
+     */
+    rootConversationId?: string;
     /**
      * False when the sub-agent runs its parent conversation's agent (a template or general-purpose
      * child): the parent agent's policies were already read as its own, so no second read. Unset:
      * read and compare.
      */
     parentAgentDiffers?: boolean;
+    /**
+     * The call's per-call policy ({@link ResolvedTool.callPolicy} of the validated input), or
+     * null / unset: policies, grants and approvals use the tool key.
+     */
+    callPolicy?: CallPolicy | null;
 }
 /** 管线第 3 阶段：策略判定。 */
 export type DecidePolicy = (tool: ResolvedTool, agentDef: AgentDefinition, ctx: PolicyContext) => Promise<PolicyDecision>;
@@ -131,6 +143,13 @@ interface PipelineDeps {
      * `RecordedToolPipeline`, which never runs hooks. Also needs `conversationKind: "chat"` (P-18).
      */
     readonly pluginHooks: HookRunner | undefined;
+    /**
+     * The effective deployment config of an extension for an org (layering spec A §6): a plugin
+     * tool's handler gets it as `ToolCallContext.config`, and is not called when it is not valid.
+     */
+    readonly effective: Pick<EffectiveConfigs, "get">;
+    /** The org's switches of single extension tools: a turned-off one is not called (spec A §7). */
+    readonly switches: Pick<OrgToolSwitches, "isToolOff">;
     /**
      * Ids of an extension's `inline` ui contributions (read live, no alias): a plugin tool's
      * `ToolResult.card` must name one of them, otherwise it is dropped with a warning.
@@ -146,12 +165,13 @@ interface PipelineDeps {
      * it, `Agent` calls reach the builtin's guard, which refuses them.
      */
     readonly subagents: {
-        dispatch(a: {
-            ctx: ToolStepContext;
-            callId: string;
-            input: AgentToolInputT;
-        }): Promise<DispatchOutcome>;
+        dispatch(a: DispatchArgs): Promise<DispatchOutcome>;
     } | undefined;
+    /**
+     * `SendMessage` and `SubagentHandback` (agent map spec §4.2, §4.3; `SubagentMessages`). Without
+     * it, their calls reach the builtins' guards, which refuse them.
+     */
+    readonly messages: Pick<SubagentMessages, "toChild" | "toParent"> | undefined;
 }
 /** The sub-agent dispatch the pipeline calls (`SubagentsService.dispatch`). */
 export type SubagentDispatch = NonNullable<PipelineDeps["subagents"]>["dispatch"];
@@ -174,8 +194,8 @@ export interface ToolStepContext {
     /** Hooks fire only for `chat` conversations. */
     conversationKind?: ConversationKindForHooks;
     /**
-     * Set when the run is a sub-agent's: its builtin tools use the parent conversation's sandbox
-     * (spec §10.1) and it cannot dispatch sub-agents.
+     * Set when the run is a sub-agent's: its builtin tools use the root conversation's sandbox
+     * (spec §10.1, agent map spec §6), and it dispatches sub-agents only below `subagents.maxDepth`.
      */
     parent?: SubagentParent;
 }
@@ -230,9 +250,11 @@ export declare class ToolPipeline {
     private readonly deps;
     constructor(kdb: KernelDb, eventLog: EventLog, 
     /** The `Agent` tool's sub-agent dispatch; absent (tests): `Agent` calls are refused. */
-    subagents: Pick<SubagentsService, "dispatch"> | undefined, registry: Pick<ToolRegistry, "forAgent" | "findConnector" | "handler">, credentials: Pick<Credentials, "injection" | "onUnauthorized">, breaker: Pick<Breaker, "check" | "failure" | "success">, outputs: Pick<ToolOutputs, "save" | "load">, approvals: Pick<ApprovalsService, "request" | "forCall">, questions: Pick<QuestionsService, "ask" | "forCall">, config: Pick<KernelConfigService, "get">, log: Logger, 
+    subagents: Pick<SubagentsService, "dispatch"> | undefined, 
+    /** The message tools between agents; absent (tests): their calls are refused. */
+    messages: Pick<SubagentMessages, "toChild" | "toParent"> | undefined, registry: Pick<ToolRegistry, "forAgent" | "findConnector" | "handler">, credentials: Pick<Credentials, "injection" | "onUnauthorized">, breaker: Pick<Breaker, "check" | "failure" | "success">, outputs: Pick<ToolOutputs, "save" | "load">, approvals: Pick<ApprovalsService, "request" | "forCall">, questions: Pick<QuestionsService, "ask" | "forCall">, config: Pick<KernelConfigService, "get">, log: Logger, 
     /** Plugin hooks and inline ui contributions; absent (tests): no hooks, cards dropped. */
-    host: Pick<ExtensionHost, "hooks" | "current"> | undefined, drift: Pick<ToolDrift, "onToolsChanged"> | undefined, txHost: TransactionHost, hooks?: ToolPipelineHooks);
+    host: Pick<ExtensionHost, "hooks" | "current"> | undefined, drift: Pick<ToolDrift, "onToolsChanged"> | undefined, effective: Pick<EffectiveConfigs, "get">, switches: Pick<OrgToolSwitches, "isToolOff">, txHost: TransactionHost, hooks?: ToolPipelineHooks);
     /**
      * tools 节点：按顺序处理本步 assistant 消息里的全部 `tool_call`，每个调用都以一条 `tool_result` 结束
      * （之后才回到 prepare 构建下一次请求，保持「已记录调用、未记录结果之间不构建请求」的不变式）。
@@ -242,32 +264,14 @@ export declare class ToolPipeline {
      */
     runStep(ctx: ToolStepContext): Promise<ToolStepOutcome>;
     /**
-     * An `Agent` call that was dispatched (spec §7.1 "already dispatched"): when its child run is
-     * terminal, writes the parent's `subagent_finished` (if the child's finisher did not) and the
-     * call's `tool_result` from the child's log, and returns true; else false (still open).
-     *
-     * The call ran like any tool, so the result is audited `tool.called` (duration = the child's;
-     * the authorization is known only when an approval let it run: a policy or remembered grant at
-     * dispatch time is not recorded, so nothing is guessed) and fires `tool.postExecute` with the
-     * result, from the replica that writes it (spec §11).
-     */
-    private finishAgentCall;
-    /** {@link stopOpenAgentCalls} in a transaction of its own (a stop seen by the tools node). */
-    private stopOpenAgentCallsNow;
-    /**
-     * Writes, in the caller's transaction (`mandatory`), the `tool_result` of every open `Agent` call
-     * of a run that is being stopped
-     * (sub-agents spec §12: a person stopped it while it waited on sub-agents, or its deadline or a
-     * stop hit its tools node after a dispatch). A call whose child already ended gets the child's
-     * result (and the missing `subagent_finished`); one whose child is still active gets
-     * {@link AGENT_STOPPED_WITH_RUN_TEXT}. The caller stops those children after its commit.
-     *
-     * Like every `Agent` result (see {@link finishAgentCall}), each is audited `tool.called` in it
-     * (duration: the child's, or the time since the dispatch) and fires `tool.postExecute`, through
-     * `fire()`, which the caller runs after its commit. Returns the steps and calls written (the
-     * caller must not write a "not executed" result for them) and the highest seq written.
+     * Writes, in the caller's transaction (`mandatory`), what a run that is being stopped (a person,
+     * its deadline, a failure, the wait sweep) still owes its log: the report of its fork invocation
+     * (phase D, `pairStoppedForks`; a still active fork child is stopped by the caller after its
+     * commit). An `Agent` call has its result from its dispatch (agent map spec §4.1), so there is
+     * nothing to write for it. Returns the fork's call id (the caller must not write a "not executed"
+     * result for it), the highest seq written, and `fire`, a no-op kept for the callers' hook phase.
      */
-    stopOpenAgentCalls(runId: string, agent?: AgentDefinition): Promise<{
+    stopOpenAgentCalls(runId: string): Promise<{
         steps: number[];
         callIds: Set<string>;
         toSeq: number | null;
@@ -280,6 +284,8 @@ export declare class ToolPipeline {
      */
     private processCall;
     private runCall;
+    /** Appends a sub-agent's connect card to its root conversation ({@link rootSurfaceOf}). */
+    private surfaceConnectInRoot;
     /**
      * Every tool key the request that issued this step's calls offered (`request.tools` plus the
      * `catalog` keys), in any mode; null when its model_call is not found. Used to tell a call to an