@namzu/sdk 46.0.0 → 48.1.0

package/dist/runtime/query/index.d.ts

@@ -6,6 +6,7 @@ import type { SessionPaths } from '../../session/paths.js';
 import type { SessionTokenBudget, SessionTokenBudgetStore } from '../../store/budget/index.js';
 import type { SessionCheckpointStore } from '../../store/checkpoint/index.js';
 import type { SessionLease, SessionLog } from '../../store/session-log/index.js';
+import { type Toolset } from '../../toolsets/types.js';
 import type { AdvisoryConfig } from '../../types/advisory/index.js';
 import type { AgentRuntimeContext, RuntimeToolOverrides } from '../../types/agent/base.js';
 import type { AgentContextLevel } from '../../types/agent/factory.js';
@@ -29,7 +30,7 @@ import type { PromoteMemory } from '../../types/session/memory-promotion.js';
 import type { Skill } from '../../types/skills/index.js';
 import type { StructuredOutputConfig } from '../../types/structured-output/index.js';
 import type { TaskStore } from '../../types/task/index.js';
-import type { ToolRegistryContract } from '../../types/tool/index.js';
+import type { ToolTierConfig } from '../../types/tool/index.js';
 import type { RepairToolCall } from '../../types/tool/repair.js';
 import type { BackoffPolicy } from '../../utils/backoff.js';
 import type { ModelPricing } from '../../utils/cost.js';
@@ -216,19 +217,20 @@ export interface QueryParams {
      */
     maxToolOutputChars?: number;
     /**
-     * Screens to run against every tool result, where the registry was not
-     * built with its own.
-     *
-     * This is the turn's half of a boundary whose only other door is the
-     * registry constructor — and a registry is usually the HOST's, assembled
-     * before the turn exists, so a turn-config option is the only way a turn
-     * screens a registry it did not build. A registry built WITH
-     * `resultGuardrails` states its own policy and wins, `[]` included.
+     * Screens to run against every tool result. The turn builds its manager
+     * from `toolsets` and gives it this policy.
      *
      * Absent installs {@link DEFAULT_TOOL_RESULT_GUARDRAILS}; an empty array
      * installs none, which is how a caller turns the default off.
      */
     toolResultGuardrails?: readonly import('../../types/guardrail/index.js').ToolResultGuardrailSpec[];
+    /**
+     * Tier labels/guidance for the `ToolManager` this turn builds. Absent
+     * means no tier legend and no `[label]` prefix on any tool's description
+     * — the same as before this existed. A tier is still a static
+     * `defineTool` field; this only configures how the manager renders it.
+     */
+    tierConfig?: ToolTierConfig;
     /**
      * Smaller preview for text that exceeded maxToolOutputChars, after its full
      * host output and integrity manifest have been saved. Unset/0 keeps the old
@@ -345,7 +347,18 @@ export interface QueryParams {
      * `guardrail_triggered` event.
      */
     outputGuardrails?: readonly OutputGuardrailSpec[];
-    tools: ToolRegistryContract;
+    /**
+     * Every tool this turn may see comes from one of these (`toolsets/types.ts`).
+     *
+     * `query()` never mutates what is passed here: its own generated tools
+     * (task tools, `search_tools`, the structured-output tool, advisory
+     * tools) are combined with these into the `ToolManager` it builds for
+     * itself, once, at the top of the turn — see `buildRuntimeToolset`
+     * below. A toolset here that contributes a name `query()` also generates
+     * is refused at construction (`ToolsetConflictError`, naming both
+     * sources), the same mechanism a plain toolset collision uses.
+     */
+    toolsets: readonly Toolset[];
     turnConfig: TurnConfig;
     allowedTools?: string[];
     agentId: string;

package/dist/runtime/query/index.d.ts.map

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

package/dist/runtime/query/index.js

@@ -17,8 +17,12 @@ import { GENAI, NAMZU, agentTurnSpanName, parentContext, serializeSpan, } from '
 import { getTracer } from '../../telemetry/runtime-accessors.js';
 import { buildAdvisoryTools } from '../../tools/advisory/index.js';
 import { SearchToolsTool } from '../../tools/builtins/search-tools.js';
-import { STRUCTURED_OUTPUT_TOOL_NAME, createStructuredOutputTool, } from '../../tools/builtins/structuredOutput.js';
+import { createStructuredOutputTool } from '../../tools/builtins/structuredOutput.js';
 import { buildTaskTools } from '../../tools/task/index.js';
+import { ToolManager } from '../../toolsets/manager.js';
+import { toolset } from '../../toolsets/toolset.js';
+import { toolsetIsReady } from '../../toolsets/types.js';
+import { deferred } from '../../toolsets/wrappers.js';
 import { isTerminalStatus } from '../../types/common/index.js';
 import { NamzuError } from '../../types/errors/index.js';
 import { autoApproveHandler, } from '../../types/hitl/index.js';
@@ -127,6 +131,7 @@ export async function* query(params) {
     // provider lacks, a sandbox mode it does not offer); the lease the
     // prelude took is given back on the way out.
     let unsubscribeChildSessions;
+    let disposeToolManager;
     try {
         const unsubscribeTaskStore = params.taskStore
             ? eventTranslator.wireTaskStore(params.taskStore, ctx.sessionId)
@@ -146,6 +151,61 @@ export async function* query(params) {
                 });
             });
         });
+        // ─── Advisors: constructed early because their agent-tool forms (if
+        // any) join the runtime toolset below, before the ToolManager exists.
+        // `setCallContextProvider` — which needs `workingStateManager`,
+        // `effectiveAllowedTools` and `iterationOrchestrator`, none of which
+        // exist yet — is configured later, in its historical spot; a closure
+        // reading those is fine to define before they do, as long as nothing
+        // CALLS it before they exist, and nothing does. ───
+        let advisoryCtx;
+        let advisoryToolDefs = [];
+        if (params.advisory && params.advisory.advisors.length > 0) {
+            // Advisors are model calls owned by this turn even when they use a
+            // different provider. Sending the raw definitions into the registry
+            // lets a triggered or model-requested consultation bypass both the
+            // finite stream-silence bound and Stop. Bind every advisor provider at
+            // the query boundary, where the effective timeout and run signal are
+            // already known; standalone AdvisoryExecutor callers retain their
+            // explicitly chosen provider/cancellation policy.
+            const boundedAdvisors = params.advisory.advisors.map((advisor) => ({
+                ...advisor,
+                provider: withTokenBudget(withStreamIdleTimeout(advisor.provider, {
+                    idleTimeoutMs: streamIdleTimeoutMs,
+                    log: ctx.log,
+                }), budget),
+            }));
+            const advisorRegistry = new AdvisorRegistry(boundedAdvisors, params.advisory.defaultAdvisorId);
+            // A budget the runtime cannot measure is refused here rather than
+            // silently ignored for the length of the turn.
+            assertBudgetEnforceable(params.advisory);
+            const advisoryExecutor = new AdvisoryExecutor(ctx.log, params.advisory.budget, ctx.abortController.signal);
+            const triggerEvaluator = new TriggerEvaluator(params.advisory.triggers ?? [], params.advisory.budget);
+            advisoryCtx = new AdvisoryContext(advisorRegistry, advisoryExecutor, triggerEvaluator, params.advisory.budget);
+            if (params.advisory.enableAgentTool) {
+                advisoryToolDefs = buildAdvisoryTools({ advisoryCtx });
+            }
+        }
+        // ─── query()'s own tools: never mutate the caller's toolsets. Task
+        // tools, `search_tools`, the structured-output tool and any advisory
+        // tools are gathered here and combined into one `runtime` toolset
+        // (plan.md v3 §2), which the `ToolManager` below resolves alongside
+        // `params.toolsets`. A name a caller's own toolset already contributes
+        // is refused at construction — `ToolsetConflictError`, naming both
+        // sources — the same mechanism any two colliding toolsets hit; this
+        // generalises `SupervisorAgent`'s old hand-written coordinator-name
+        // refusal, which is gone (its coordinator tools are just another
+        // toolset in `params.toolsets` now). ───
+        const runtimeToolOverrides = params.runtimeToolOverrides;
+        const runtimeActiveTools = [];
+        const runtimeDeferredTools = [];
+        const addRuntimeTool = (tool, defaultAvailability) => {
+            const override = runtimeToolOverrides?.[tool.name];
+            if (override === 'disabled')
+                return;
+            const availability = override ?? defaultAvailability;
+            (availability === 'active' ? runtimeActiveTools : runtimeDeferredTools).push(tool);
+        };
         if (params.taskStore) {
             const taskTools = buildTaskTools(params.taskStore, {
                 sessionId: ctx.sessionId,
@@ -157,39 +217,73 @@ export async function* query(params) {
                     ? await recordedTurnStart(ctx.recorder.log, ctx.turnId)
                     : undefined) ?? ctx.recorder.getTurn().startedAt,
             });
-            const overrides = params.runtimeToolOverrides;
-            for (const tool of taskTools) {
-                const override = overrides?.[tool.name];
-                if (override === 'disabled')
-                    continue;
-                params.tools.register(tool, override ?? 'deferred');
-            }
+            for (const tool of taskTools)
+                addRuntimeTool(tool, 'deferred');
         }
-        if (!params.tools.has(SearchToolsTool.name)) {
-            const hasDeferred = params.tools
-                .listNames()
-                .some((n) => params.tools.getAvailability(n) === 'deferred');
-            if (hasDeferred) {
-                params.tools.register(SearchToolsTool);
-            }
+        // `search_tools` is added only when something could actually be
+        // deferred — one of the runtime tools above, or a caller toolset that
+        // declared itself `deferred(...)`. Nothing deferred means nothing for
+        // a search to load, so it is never added at all. And only when the
+        // caller does not already provide a tool under that name: a caller
+        // that mounts its OWN discovery tool (a connector named `search_tools`,
+        // deliberately) owns that name, and adding a second contributor here
+        // would be a `ToolsetConflictError` naming both sources for a name
+        // query() itself introduced, not the caller's honest collision.
+        const callerHasDeferredToolset = params.toolsets.some((ts) => (ts.availability ?? 'active') === 'deferred' && ts.tools().length > 0);
+        const callerSearchToolset = params.toolsets.find((ts) => ts.tools().some((tool) => tool.name === SearchToolsTool.name));
+        const callerHasSearchTools = callerSearchToolset !== undefined;
+        if ((runtimeDeferredTools.length > 0 || callerHasDeferredToolset) &&
+            callerSearchToolset &&
+            (callerSearchToolset.availability === 'deferred' || !toolsetIsReady(callerSearchToolset))) {
+            throw new Error('A caller-provided search_tools must be active and ready when deferred tools are present.');
+        }
+        if ((runtimeDeferredTools.length > 0 || callerHasDeferredToolset) &&
+            !callerHasSearchTools &&
+            ['deferred', 'suspended'].includes(runtimeToolOverrides?.[SearchToolsTool.name] ?? '')) {
+            throw new Error('runtimeToolOverrides.search_tools must be active or disabled when deferred tools are present.');
         }
-        // Registered HERE, before the first turn, not when the model is nearly
+        if ((runtimeDeferredTools.length > 0 || callerHasDeferredToolset) && !callerHasSearchTools) {
+            addRuntimeTool(SearchToolsTool, 'active');
+        }
+        // Added HERE, before the first turn, not when the model is nearly
         // done. Tools render at prefix position 0, so injecting one late would
         // invalidate the whole prompt cache for the rest of the turn — the same
         // reason the forced-final turn keeps its tools array and uses
         // `toolChoice: 'none'` instead of dropping it.
-        if (params.structuredOutput &&
-            params.structuredOutput.mode !== 'native' &&
-            !params.tools.has(STRUCTURED_OUTPUT_TOOL_NAME)) {
-            params.tools.register(createStructuredOutputTool(params.structuredOutput.schema));
+        if (params.structuredOutput && params.structuredOutput.mode !== 'native') {
+            addRuntimeTool(createStructuredOutputTool(params.structuredOutput.schema), 'active');
         }
+        for (const tool of advisoryToolDefs)
+            addRuntimeTool(tool, 'active');
+        // Two SEPARATE entries, not `combineToolsets`'d into one: `Toolset.availability`
+        // is a single value for the whole toolset, and `ToolManager` derives each
+        // name's default availability from whichever ARRAY ENTRY served it — a
+        // merged toolset has no one availability to report, so every tool
+        // inside it (both halves) would read back as the untyped default,
+        // `'active'`, silently dropping every override this turn just computed.
+        const toolManager = new ToolManager({
+            toolsets: [
+                ...params.toolsets,
+                toolset('runtime:active', runtimeActiveTools),
+                deferred(toolset('runtime:deferred', runtimeDeferredTools)),
+            ],
+            ...(params.toolResultGuardrails !== undefined
+                ? { resultGuardrails: params.toolResultGuardrails }
+                : {}),
+            ...(params.tierConfig !== undefined ? { tierConfig: params.tierConfig } : {}),
+            // Read fresh on every `availability()` call, not captured once: see
+            // `ToolManager.availability` — derived from the turn's own
+            // post-compaction history, which grows as the turn proceeds.
+            messages: () => ctx.recorder.messages,
+        });
+        disposeToolManager = () => toolManager.dispose();
         // ─── Provider capability negotiation (before tooling bootstrap) ────────
         // Compare what the request asks for with what the DRIVER declared it
         // does. Undeclared capabilities resolve permissively (today's behavior
         // for third-party providers); declared gaps degrade loudly instead of
         // silently.
         const capabilities = resolveProviderCapabilities(params.provider);
-        const registeredToolCount = params.tools.listNames().length;
+        const registeredToolCount = toolManager.listNames().length;
         const stripToolSurfaces = !capabilities.supportsTools && registeredToolCount > 0;
         // Counted separately because they are separate wire shapes: a driver can
         // map images and drop documents, and a vision warning would send the
@@ -266,7 +360,7 @@ export async function* query(params) {
         // shows the model fewer tools and lets it call any of them by name.
         const allowedBeforeDenial = stripToolSurfaces
             ? []
-            : withDeferredDiscoveryTool(params.tools, params.allowedTools);
+            : withDeferredDiscoveryTool(toolManager, params.allowedTools);
         const denied = new Set(params.deniedTools ?? []);
         const effectiveAllowedTools = denied.size === 0
             ? allowedBeforeDenial
@@ -275,7 +369,7 @@ export async function* query(params) {
                 // here — otherwise the subtraction would be from an empty list
                 // and would deny nothing, which is the shape a delegated child
                 // arrives in.
-                [...(allowedBeforeDenial ?? params.tools.listNames())].filter((name) => !denied.has(name));
+                [...(allowedBeforeDenial ?? toolManager.listNames())].filter((name) => !denied.has(name));
         // The two halves of a durable pause, owned by the TURN when the host
         // does not own them.
         //
@@ -338,7 +432,7 @@ export async function* query(params) {
         const skillGrants = new SkillGrantSet();
         const toolExecutor = ToolingBootstrap.init({
             skillGrants,
-            tools: params.tools,
+            tools: toolManager,
             sessionId: ctx.sessionId,
             turnId: ctx.turnId,
             workingDirectory: ctx.cwd,
@@ -454,7 +548,7 @@ export async function* query(params) {
             persona: params.persona,
             skills: params.skills,
             basePrompt: params.basePrompt,
-            tools: params.tools,
+            tools: toolManager,
             allowedTools: effectiveAllowedTools,
             runtimeContext: params.runtimeContext,
             contributions: promptContributions,
@@ -498,29 +592,12 @@ export async function* query(params) {
             // reason and nothing else carries it this far.
             signal: ctx.abortController.signal,
         });
-        let advisoryCtx;
-        if (params.advisory && params.advisory.advisors.length > 0) {
-            // Advisors are model calls owned by this turn even when they use a
-            // different provider. Sending the raw definitions into the registry
-            // lets a triggered or model-requested consultation bypass both the
-            // finite stream-silence bound and Stop. Bind every advisor provider at
-            // the query boundary, where the effective timeout and run signal are
-            // already known; standalone AdvisoryExecutor callers retain their
-            // explicitly chosen provider/cancellation policy.
-            const boundedAdvisors = params.advisory.advisors.map((advisor) => ({
-                ...advisor,
-                provider: withTokenBudget(withStreamIdleTimeout(advisor.provider, {
-                    idleTimeoutMs: streamIdleTimeoutMs,
-                    log: ctx.log,
-                }), budget),
-            }));
-            const advisorRegistry = new AdvisorRegistry(boundedAdvisors, params.advisory.defaultAdvisorId);
-            // A budget the runtime cannot measure is refused here rather than
-            // silently ignored for the length of the turn.
-            assertBudgetEnforceable(params.advisory);
-            const advisoryExecutor = new AdvisoryExecutor(ctx.log, params.advisory.budget, ctx.abortController.signal);
-            const triggerEvaluator = new TriggerEvaluator(params.advisory.triggers ?? [], params.advisory.budget);
-            advisoryCtx = new AdvisoryContext(advisorRegistry, advisoryExecutor, triggerEvaluator, params.advisory.budget);
+        // `advisoryCtx` itself was already built above, before the
+        // `ToolManager`, so its agent-tool form (if any) could join the
+        // `runtime` toolset. What's left is the callback that needs state this
+        // early construction cannot see yet: `workingStateManager`,
+        // `effectiveAllowedTools`, `iterationOrchestrator`.
+        if (advisoryCtx && params.advisory) {
             // What the turn looks like when the MODEL consults an advisor, as
             // opposed to when a trigger does. The trigger path has always passed
             // this; the tool path passed an empty context, so an advisor the model
@@ -531,7 +608,8 @@ export async function* query(params) {
             // `AdvisorDefinition` and consulted by nothing, so a host who turned
             // the catalogue off still paid for it in every advisory prompt.
             const advisoryConfig = params.advisory;
-            advisoryCtx.setCallContextProvider(() => {
+            const boundAdvisoryCtx = advisoryCtx;
+            boundAdvisoryCtx.setCallContextProvider(() => {
                 const summary = workingStateManager && advisoryConfig.advisors.some((a) => a.useCompactedContext)
                     ? serializeWorkingState(workingStateManager.getState())
                     : undefined;
@@ -540,21 +618,11 @@ export async function* query(params) {
                     turn: iterationOrchestrator.getAdvisoryTurnContext(),
                     ...(summary !== undefined ? { workingStateSummary: summary } : {}),
                     ...(advisoryConfig.includeToolCatalog
-                        ? { toolCatalog: params.tools.toLLMTools(effectiveAllowedTools) }
+                        ? { toolCatalog: toolManager.toLLMTools(effectiveAllowedTools) }
                         : {}),
                     iteration: ctx.recorder.currentIteration,
                 };
             });
-            if (params.advisory.enableAgentTool) {
-                const advisoryTools = buildAdvisoryTools({ advisoryCtx });
-                const overrides = params.runtimeToolOverrides;
-                for (const tool of advisoryTools) {
-                    const override = overrides?.[tool.name];
-                    if (override === 'disabled')
-                        continue;
-                    params.tools.register(tool, override ?? 'active');
-                }
-            }
         }
         const iterationOrchestrator = new IterationOrchestrator({
             captureSessionEvidence,
@@ -576,7 +644,7 @@ export async function* query(params) {
             ...(params.parkRecordDelayMs !== undefined
                 ? { parkRecordDelayMs: params.parkRecordDelayMs }
                 : {}),
-            tools: params.tools,
+            tools: toolManager,
             allowedTools: effectiveAllowedTools,
             recorder: ctx.recorder,
             toolExecutor,
@@ -797,7 +865,7 @@ export async function* query(params) {
                     persona: params.persona,
                     skills: params.skills,
                     basePrompt: contextLevel === 'full' ? params.basePrompt : undefined,
-                    tools: params.tools,
+                    tools: toolManager,
                     allowedTools: effectiveAllowedTools,
                     runtimeContext: params.runtimeContext,
                     contributions: promptContributions,
@@ -1150,7 +1218,11 @@ export async function* query(params) {
                     yield* eventTranslator.drainPending();
                 }
                 if (params.pluginManager) {
-                    const hookResults = await params.pluginManager.executeHooks('turn_start', { sessionId: ctx.sessionId, turnId: ctx.turnId, signal: ctx.abortController.signal }, eventTranslator.emitEvent);
+                    const hookResults = await params.pluginManager.executeHooks('turn_start', {
+                        sessionId: ctx.sessionId,
+                        turnId: ctx.turnId,
+                        signal: ctx.abortController.signal,
+                    }, eventTranslator.emitEvent);
                     applyLifecycleHookResults('turn_start', hookResults);
                     yield* eventTranslator.drainPending();
                 }
@@ -1415,10 +1487,15 @@ export async function* query(params) {
         }
     }
     finally {
-        unsubscribeChildSessions?.();
-        // The lease `open()` took in the prelude; a caller-supplied lease is the
-        // caller's to give back.
-        await ctx.recorder.release();
+        try {
+            disposeToolManager?.();
+        }
+        finally {
+            unsubscribeChildSessions?.();
+            // The lease `open()` took in the prelude; a caller-supplied lease is the
+            // caller's to give back.
+            await ctx.recorder.release();
+        }
     }
 }
 /**
@@ -1445,7 +1522,9 @@ async function settleAbandonedTurn(recorder, eventTranslator, log) {
         if (recorder.isClosed || recorder.isPaused || !recorder.isActive)
             return;
         await recorder.flush();
-        const parked = await findPendingCheckpoint(recorder.log, { turnId: recorder.turnId });
+        const parked = await findPendingCheckpoint(recorder.log, {
+            turnId: recorder.turnId,
+        });
         if (parked) {
             recorder.setStopReason('paused');
             await eventTranslator.emitEvent({
@@ -1548,12 +1627,12 @@ function withDeferredDiscoveryTool(tools, allowedTools) {
         return undefined;
     if (allowedTools.includes(SearchToolsTool.name))
         return allowedTools;
-    const allowedHasDeferred = allowedTools.some((name) => tools.has(name) && tools.getAvailability(name) === 'deferred');
+    const allowedHasDeferred = allowedTools.some((name) => tools.has(name) && tools.availability(name) === 'deferred');
     if (!allowedHasDeferred)
         return allowedTools;
     if (!tools.has(SearchToolsTool.name))
         return allowedTools;
-    if (tools.getAvailability(SearchToolsTool.name) !== 'active')
+    if (tools.availability(SearchToolsTool.name) !== 'active')
         return allowedTools;
     return [...allowedTools, SearchToolsTool.name];
 }