@namzu/sdk 45.1.0 → 48.0.0

package/src/registry/tool/execute.ts

@@ -1,73 +1,17 @@
-import { SpanStatusCode, context as otelContext, trace } from '@opentelemetry/api'
-import { assertStrictSchema } from '../../provider/strict-schema.js'
-import { GENAI, NAMZU, toolSpanName } from '../../telemetry/attributes.js'
-import { recordToolCall } from '../../telemetry/metrics.js'
-import { getTracer } from '../../telemetry/runtime-accessors.js'
-import { isTrustedReadOnly } from '../../tools/trusted-read-only.js'
-import type { ToolResultGuardrailSpec } from '../../types/guardrail/index.js'
-import { PLAN_MODE_REFUSAL } from '../../types/permission/index.js'
-import type {
-	LLMToolSchema,
-	PreparedToolExecution,
-	ToolAvailability,
-	ToolContext,
-	ToolDefinition,
-	ToolExecutionResult,
-	ToolPreparationResult,
-	ToolRegistryConfig,
-	ToolTierConfig,
-} from '../../types/tool/index.js'
-import { toErrorMessage } from '../../utils/error.js'
-import { cloneJsonValue as clonePreparedInput } from '../../utils/json-snapshot.js'
-import { ManagedRegistry } from '../ManagedRegistry.js'
-import { renderToolSchema, toolWireSchema } from './schema.js'
-import { ToolResultHalted, screenToolResult } from './screen.js'
+import { RegistryCollisionError } from '../collision.js'
 
-export type { ToolExecutionResult }
-
-/** Options for an independent registry membership and availability snapshot. */
-export interface ToolRegistryForkOptions {
-	/**
-	 * Defer currently active tools outside this exact list. Omission preserves
-	 * every availability; an empty list defers every active tool. Listed tools
-	 * that are already deferred or suspended keep that state. Names must be
-	 * unique, valid registered names; a misspelling is refused.
-	 */
-	readonly deferExcept?: readonly string[]
-}
-
-// Tokens too generic to identify a tool by name — ignored when matching a
-// batched `search_tools` query so they can't activate the whole catalog
-// (every bridged tool name shares the `clawtool` prefix, for instance).
-// Generic CRUD verbs are stopped too: a query like "list deals" must rank
-// by "deals", not token-match every `list_*` tool in the deferred catalog.
-const SEARCH_STOP_TOKENS = new Set([
-	'clawtool',
-	'tool',
-	'tools',
-	'mcp',
-	'the',
-	'and',
-	'for',
-	'use',
-	'list',
-	'read',
-	'create',
-	'update',
-	'get',
-	'find',
-	'delete',
-	'search',
-])
-
-// Weighted-scoring weights mirroring ToolCatalog.searchTools (the richer,
-// otherwise-unused catalog scorer): exact name 12, name substring 8,
-// description 5 — extended here with argument-name indexing (3), following
-// argument names are searched too, not only the tool's own name.
-const SEARCH_WEIGHT_NAME_EXACT = 12
-const SEARCH_WEIGHT_NAME_PARTIAL = 8
-const SEARCH_WEIGHT_DESCRIPTION = 5
-const SEARCH_WEIGHT_ARGUMENT = 3
+/**
+ * Tool naming and a handful of small, stateless rendering helpers this file
+ * used to share with `ToolRegistry`.
+ *
+ * `ToolRegistry` itself — registration, availability, the execution
+ * pipeline — is gone (plan.md v3 §2): a runtime-owned `ToolManager`
+ * (`toolsets/manager.ts`) resolves toolsets instead, and carries its own
+ * copy of the pipeline this file used to define. What's left here is what
+ * had no toolset/manager analogue to move to: a tool name has to be valid
+ * regardless of which mechanism resolves it, and `describeWithOutput`/
+ * `toolDiscoveryHint` are pure string formatting `ToolManager` still calls.
+ */
 
 /**
  * What a tool name may be, everywhere it comes from.
@@ -113,11 +57,13 @@ export function assertToolName(name: string): void {
  * shadowing-by-name the only way to say "I do not want this tool", which is
  * precisely what now throws.
  */
-export class ToolNameCollisionError extends Error {
+export class ToolNameCollisionError extends RegistryCollisionError {
 	readonly toolName: string
 
 	constructor(toolName: string, context: string) {
 		super(
+			'ToolRegistry',
+			toolName,
 			`Tool name "${toolName}" is already registered by this host, and ${context} will not replace it. Rename the host tool, or decline the one being mounted with runtimeToolOverrides: { "${toolName}": "disabled" }.`,
 		)
 		this.name = 'ToolNameCollisionError'
@@ -147,682 +93,6 @@ export function describeWithOutput(
 	return `${description}\n\nReturns (JSON Schema): ${JSON.stringify(outputSchema)}`
 }
 
-export class ToolRegistry extends ManagedRegistry<ToolDefinition> {
-	private availability: Map<string, ToolAvailability> = new Map()
-	private tierConfig?: ToolTierConfig
-	private resultGuardrails?: readonly ToolResultGuardrailSpec[]
-	private readonly preparations = new WeakMap<
-		PreparedToolExecution,
-		{ readonly tool: ToolDefinition; readonly input: unknown }
-	>()
-
-	constructor(config?: ToolRegistryConfig) {
-		super({
-			componentName: 'ToolRegistry',
-			idField: 'name',
-			logger: config?.logger,
-		})
-		this.tierConfig = config?.tierConfig
-		this.resultGuardrails = config?.resultGuardrails
-	}
-
-	/**
-	 * Snapshot membership and availability for another turn without changing this
-	 * registry. Discovery, registration and suspension then affect only the fork.
-	 * Definitions, handlers and configuration remain shared; this is not a deep
-	 * clone or an authorization boundary. Prepared executions belong only to the
-	 * registry that prepared them and do not transfer to the fork.
-	 */
-	fork(options: ToolRegistryForkOptions = {}): ToolRegistry {
-		let retained: Set<string> | undefined
-		if (options.deferExcept !== undefined) {
-			if (!Array.isArray(options.deferExcept))
-				throw new TypeError('ToolRegistry.fork deferExcept must be an array of tool names.')
-			retained = new Set()
-			for (const name of options.deferExcept) {
-				if (typeof name !== 'string' || !TOOL_NAME_PATTERN.test(name))
-					throw new TypeError('ToolRegistry.fork deferExcept must contain valid tool names.')
-				if (retained.has(name))
-					throw new TypeError(`ToolRegistry.fork deferExcept contains duplicate tool "${name}".`)
-				this.getOrThrow(name)
-				retained.add(name)
-			}
-		}
-
-		const fork = new ToolRegistry({
-			logger: this.log,
-			tierConfig: this.tierConfig,
-			resultGuardrails: this.resultGuardrails,
-		})
-		fork.items = new Map(this.items)
-		fork.availability = new Map(this.availability)
-		if (retained) {
-			for (const name of fork.listNames()) {
-				if (fork.getAvailability(name) === 'active' && !retained.has(name))
-					fork.availability.set(name, 'deferred')
-			}
-		}
-		return fork
-	}
-
-	override register(id: string, tool: ToolDefinition): void
-	override register(tool: ToolDefinition, initialState?: ToolAvailability): void
-	override register(tools: ToolDefinition[], initialState?: ToolAvailability): void
-	override register(
-		idOrToolOrTools: string | ToolDefinition | ToolDefinition[],
-		maybeTool?: ToolDefinition | ToolAvailability,
-	): void {
-		if (Array.isArray(idOrToolOrTools)) {
-			const state = (typeof maybeTool === 'string' ? maybeTool : 'active') as ToolAvailability
-			for (const tool of idOrToolOrTools) {
-				this.registerOne(tool.name, tool, state)
-			}
-			return
-		}
-
-		if (typeof idOrToolOrTools === 'string') {
-			if (!maybeTool || typeof maybeTool === 'string') {
-				throw new Error('register(id, tool) requires a ToolDefinition argument')
-			}
-			this.registerOne(idOrToolOrTools, maybeTool, 'active')
-			return
-		}
-
-		const tool = idOrToolOrTools
-		const state: ToolAvailability = typeof maybeTool === 'string' ? maybeTool : 'active'
-
-		this.registerOne(tool.name, tool, state)
-	}
-
-	private registerOne(id: string, tool: ToolDefinition, state: ToolAvailability): void {
-		assertToolName(id)
-		// A model-facing schema is what the constraint is applied TO, so
-		// asking for enforcement without one is a request that cannot be
-		// honoured. Refusing at registration puts the error where the author
-		// can fix it rather than at the first request.
-		if (tool.enforceModelInput && !tool.modelInputSchema) {
-			throw new Error(
-				`Tool "${id}" enables enforceModelInput but does not define modelInputSchema. Constrained input generation requires an explicit provider-safe model schema.`,
-			)
-		}
-		// …and the schema has to be one a constrained decoder can actually be
-		// given. The check above asks whether a model schema EXISTS; this asks
-		// whether it can carry the guarantee the tool just requested.
-		//
-		// Both belong here for the reason the comment above already states.
-		// Strict validation runs against a SUBSET of JSON Schema, and a keyword
-		// outside it is not degraded — the request is rejected whole, so one
-		// unexpressible field takes down every other tool in the call. The
-		// first version of this check lived in a provider driver, which meant
-		// it fired per request, in one driver, long after the author had moved
-		// on. A tool that asks for a guarantee its own schema cannot carry is
-		// wrong at the moment it is declared, whichever model it later meets.
-		if (tool.enforceModelInput) {
-			assertStrictSchema(id, tool.modelInputSchema)
-		}
-		if (tool.tier && this.tierConfig) {
-			const validIds = this.tierConfig.tiers.map((t) => t.id)
-			if (!validIds.includes(tool.tier)) {
-				throw new Error(
-					`Tool "${id}" has tier "${tool.tier}" which is not defined. Valid tiers: ${validIds.join(', ')}`,
-				)
-			}
-		}
-		super.register(id, tool)
-		this.availability.set(id, state)
-	}
-
-	override unregister(id: string): boolean {
-		this.availability.delete(id)
-		return super.unregister(id)
-	}
-
-	override clear(): void {
-		this.availability.clear()
-		super.clear()
-	}
-
-	activate(names: string[]): void {
-		for (const name of names) {
-			this.getOrThrow(name)
-			this.availability.set(name, 'active')
-			this.log.debug('Tool activated', { 'namzu.tool.name': name })
-		}
-	}
-
-	defer(names: string[]): void {
-		for (const name of names) {
-			this.getOrThrow(name)
-			this.availability.set(name, 'deferred')
-			this.log.debug('Tool deferred', { 'namzu.tool.name': name })
-		}
-	}
-
-	suspendAll(): void {
-		for (const name of this.listIds()) {
-			if (this.getAvailability(name) === 'active') {
-				this.availability.set(name, 'suspended')
-			}
-		}
-		this.log.info('All active tools suspended')
-	}
-
-	hasSuspended(): boolean {
-		for (const state of this.availability.values()) {
-			if (state === 'suspended') return true
-		}
-		return false
-	}
-
-	getAvailability(name: string): ToolAvailability {
-		return this.availability.get(name) ?? 'active'
-	}
-
-	/**
-	 * Ranked lexical search over DEFERRED tools, score-descending (ties broken
-	 * by name) so callers can cap activation at a top-k. Each meaningful query
-	 * term (≥3 chars, not a stop token) is scored against the tool name
-	 * (exact/substring), description, and argument names; only tools with a
-	 * positive score are returned. Description matching is safe here precisely
-	 * because the result is RANKED — the `search_tools` builtin activates only
-	 * the top slice, so a shared word can no longer drag in the whole catalog.
-	 *
-	 * PARKED (phase 5 of the tool-loading plan): an embedding-backed semantic
-	 * upgrade was evaluated and deliberately NOT built — at ≤~35 deferred
-	 * in-house tools with distinct names, weighted lexical scoring sits inside
-	 * the literature's safe zone, and a weak retriever underperforms no
-	 * retriever at all. Revisit only when (a) the deferred catalog grows past
-	 * ~75-100 tools (realistic driver: connector-MCP growth), or (b) telemetry
-	 * shows a search_tools miss-rate above ~10%. Sticky activation is also
-	 * deliberate: activating inserts the schema into the tools array at its
-	 * registry position (a one-time prompt-cache prefix bust); re-defer/TTL
-	 * would churn that prefix repeatedly and is rejected.
-	 */
-	searchDeferred(query: string): ToolDefinition[] {
-		return this.searchByAvailability(query, ['deferred'])
-	}
-
-	/** Active matches use the same ranking, also recognizing exact short or generic names. */
-	searchActive(query: string): ToolDefinition[] {
-		return this.searchByAvailability(query, ['active'])
-	}
-
-	private searchByAvailability(query: string, states: ToolAvailability[]): ToolDefinition[] {
-		const q = query.toLowerCase().trim()
-		if (q.length === 0) return []
-		const terms = q.split(/\s+/).filter((tok) => tok.length >= 3 && !SEARCH_STOP_TOKENS.has(tok))
-
-		const scored: Array<{ tool: ToolDefinition; score: number }> = []
-		for (const tool of this.getByAvailability(states)) {
-			const name = tool.name.toLowerCase()
-			const description = tool.description.toLowerCase()
-			const argumentNames = listArgumentNames(tool)
-			let score = terms.length === 0 && name === q ? SEARCH_WEIGHT_NAME_EXACT : 0
-			for (const term of terms) {
-				if (name === term) {
-					score += SEARCH_WEIGHT_NAME_EXACT
-				} else if (name.includes(term)) {
-					score += SEARCH_WEIGHT_NAME_PARTIAL
-				}
-				if (description.includes(term)) {
-					score += SEARCH_WEIGHT_DESCRIPTION
-				}
-				if (argumentNames.some((arg) => arg.includes(term))) {
-					score += SEARCH_WEIGHT_ARGUMENT
-				}
-			}
-			if (score > 0) {
-				scored.push({ tool, score })
-			}
-		}
-
-		scored.sort((a, b) => b.score - a.score || a.tool.name.localeCompare(b.tool.name))
-		return scored.map((entry) => entry.tool)
-	}
-
-	assignTiers(mapping: Record<string, string>): void {
-		for (const [toolName, tierId] of Object.entries(mapping)) {
-			const tool = this.getOrThrow(toolName)
-			if (this.tierConfig) {
-				const validIds = this.tierConfig.tiers.map((t) => t.id)
-				if (!validIds.includes(tierId)) {
-					throw new Error(
-						`Tier "${tierId}" for tool "${toolName}" is not defined. Valid tiers: ${validIds.join(', ')}`,
-					)
-				}
-			}
-			tool.tier = tierId
-		}
-	}
-
-	toTierGuidance(): string | null {
-		if (!this.tierConfig?.guidanceTemplate) return null
-		return this.tierConfig.guidanceTemplate(this.tierConfig.tiers)
-	}
-
-	listNames(): string[] {
-		return this.listIds()
-	}
-
-	toPromptSection(toolNames?: string[]): string {
-		const active = this.getByAvailability(['active'], toolNames)
-		const deferred = this.getByAvailability(['deferred'], toolNames)
-
-		const parts: string[] = []
-		const contractNote = `<tool_runtime_contract>
-Executable tool names, descriptions, and JSON input schemas are attached through the runtime tools parameter. Treat that runtime schema as authoritative; this prompt section is a discoverability summary only.
-</tool_runtime_contract>`
-
-		if (active.length > 0) {
-			// Name-only: every active tool's full description + JSON schema
-			// already rides the runtime tools parameter on each request —
-			// repeating descriptions here double-bills the same tokens.
-			const entries = active.map((t) => `- ${t.name}`).join('\n')
-			parts.push(`<available_tools>\n${entries}\n</available_tools>`)
-		}
-
-		if (deferred.length > 0) {
-			// Name + one-line hint: deferred schemas stay off the wire, so the
-			// hint is the model's only signal of what a deferred tool does. A
-			// bare name list caused a real discovery failure in production
-			// (the agent never found read_document behind search_tools).
-			const entries = deferred
-				.map((t) => {
-					const hint = toolDiscoveryHint(t.description)
-					return hint.length > 0 ? `- ${t.name}: ${hint}` : `- ${t.name}`
-				})
-				.join('\n')
-			const deferredIntro =
-				this.has('search_tools') &&
-				this.getAvailability('search_tools') === 'active' &&
-				(!toolNames || toolNames.includes('search_tools'))
-					? 'Use search_tools to load these before use:'
-					: 'Deferred tools are discoverable but not executable until the runtime activates them:'
-			parts.push(`<deferred_tools>\n${deferredIntro}\n${entries}\n</deferred_tools>`)
-		}
-
-		if (parts.length === 0) return ''
-		return [contractNote, ...parts].join('\n\n')
-	}
-
-	toLLMTools(toolNames?: string[]): LLMToolSchema[] {
-		const toolsToConvert = this.getByAvailability(['active', 'suspended'], toolNames)
-
-		return toolsToConvert.map((tool) => {
-			let description = tool.description
-			if (this.tierConfig?.labelInDescription && tool.tier) {
-				const tierDef = this.tierConfig.tiers.find((t) => t.id === tool.tier)
-				if (tierDef) {
-					description = `[${tierDef.label}] ${description}`
-				}
-			}
-			return {
-				type: 'function' as const,
-				function: {
-					name: tool.name,
-					description: describeWithOutput(description, tool.outputSchema),
-					parameters: toolWireSchema(tool),
-				},
-			}
-		})
-	}
-
-	getCallableTools(toolNames?: string[]): ToolDefinition[] {
-		return this.getByAvailability(['active'], toolNames)
-	}
-
-	prepareExecution(toolName: string, rawInput: unknown): ToolPreparationResult {
-		const tool = this.getOrThrow(toolName)
-		const parseResult = tool.inputSchema.safeParse(rawInput)
-		if (!parseResult.success) {
-			return {
-				success: false,
-				result: this.validationFailure(tool, rawInput, parseResult.error),
-			}
-		}
-
-		let retainedInput: unknown
-		let reviewInput: unknown
-		try {
-			retainedInput = clonePreparedInput(parseResult.data, false)
-			reviewInput = clonePreparedInput(retainedInput, true)
-		} catch (err) {
-			const message = `Tool "${toolName}" produced an input that cannot be safely prepared for review and execution: ${toErrorMessage(err)}`
-			this.log.error('Prepared tool input could not be detached for review and execution', {
-				'namzu.tool.name': toolName,
-				'exception.message': toErrorMessage(err),
-			})
-			return {
-				success: false,
-				result: { success: false, output: '', error: message },
-			}
-		}
-
-		const prepared = Object.freeze({ toolName, input: reviewInput })
-		this.preparations.set(prepared, { tool, input: retainedInput })
-		return { success: true, prepared }
-	}
-
-	async executePrepared(
-		prepared: PreparedToolExecution,
-		context: ToolContext,
-	): Promise<ToolExecutionResult> {
-		const retained = this.preparations.get(prepared)
-		if (!retained) {
-			return {
-				success: false,
-				output: '',
-				error: `Tool "${prepared.toolName}" preparation is not owned by this registry or is no longer valid.`,
-			}
-		}
-		if (this.get(prepared.toolName) !== retained.tool) {
-			return {
-				success: false,
-				output: '',
-				error: `Tool "${prepared.toolName}" changed after its input was reviewed; prepare the call again.`,
-			}
-		}
-		return this.executeRetained(prepared.toolName, retained.tool, retained.input, context)
-	}
-
-	async execute(
-		toolName: string,
-		rawInput: unknown,
-		context: ToolContext,
-	): Promise<ToolExecutionResult> {
-		let preparation: ToolPreparationResult
-		try {
-			preparation = this.prepareExecution(toolName, rawInput)
-		} catch (err) {
-			return this.rejectPreparationWithClosedSpan(toolName, context, err)
-		}
-		if (!preparation.success) return preparation.result
-		return this.executePrepared(preparation.prepared, context)
-	}
-
-	private rejectPreparationWithClosedSpan(
-		toolName: string,
-		context: ToolContext,
-		err: unknown,
-	): Promise<never> {
-		const tracer = getTracer()
-		const parentCtx = context.parentSpan
-			? trace.setSpan(otelContext.active(), context.parentSpan)
-			: otelContext.active()
-		return tracer.startActiveSpan(toolSpanName(toolName), {}, parentCtx, async (span) => {
-			try {
-				span.setAttributes({
-					[GENAI.TOOL_NAME]: toolName,
-					[GENAI.TOOL_TYPE]: 'function',
-					...(context.toolUseId !== undefined ? { [GENAI.TOOL_CALL_ID]: context.toolUseId } : {}),
-					...toolSpanIdentity(context),
-					[NAMZU.TOOL_SUCCESS]: false,
-					[NAMZU.TOOL_ERROR]: toErrorMessage(err),
-				})
-				span.setStatus({ code: SpanStatusCode.ERROR, message: toErrorMessage(err) })
-				throw err
-			} finally {
-				span.end()
-			}
-		})
-	}
-
-	private async executeRetained(
-		toolName: string,
-		tool: ToolDefinition,
-		finalInput: unknown,
-		context: ToolContext,
-	): Promise<ToolExecutionResult> {
-		const tracer = getTracer()
-
-		// Explicit parent, not the ambient context. Every span-owning body
-		// upstream is an async generator, and a generator resumes on its
-		// consumer's async context — so by the time a tool executes, whatever
-		// `startActiveSpan` established upstream is long gone and this span
-		// would emit as a root. `context.parentSpan` is threaded through
-		// `ToolContext`, which already reaches here.
-		const parentCtx = context.parentSpan
-			? trace.setSpan(otelContext.active(), context.parentSpan)
-			: otelContext.active()
-
-		return tracer.startActiveSpan(toolSpanName(toolName), {}, parentCtx, async (span) => {
-			try {
-				// The call id joins this span to the assistant block that asked
-				// for it. Without it a trace shows that `Bash` ran four times
-				// this turn and cannot say which span answers which
-				// `tool_use` — and the id was already in hand here, threaded
-				// through `ToolContext` for the tools that reply
-				// asynchronously.
-				//
-				// Conditional because `toolUseId` is optional: a host calling
-				// a tool directly, outside a turn, has no call to correlate to,
-				// and an attribute set to `undefined` is worse than an absent
-				// one — it reaches the exporter as a key with no value.
-				span.setAttributes({
-					[GENAI.TOOL_NAME]: toolName,
-					[GENAI.TOOL_TYPE]: 'function',
-					...(context.toolUseId !== undefined ? { [GENAI.TOOL_CALL_ID]: context.toolUseId } : {}),
-					...toolSpanIdentity(context),
-				})
-
-				const availability = this.getAvailability(toolName)
-				if (availability !== 'active') {
-					const msg = `Tool "${toolName}" is ${availability} and cannot be executed`
-					this.log.warn(msg)
-					span.setAttributes({
-						[NAMZU.TOOL_SUCCESS]: false,
-						[NAMZU.TOOL_ERROR]: msg,
-					})
-					span.setStatus({ code: SpanStatusCode.ERROR, message: msg })
-					return {
-						success: false,
-						output: '',
-						error: msg,
-					}
-				}
-
-				// A turn that was narrowed may only call what it was narrowed to.
-				//
-				// This used to be enforced nowhere. `allowedTools` decided which
-				// schemas went into the request and was then carried into this
-				// context and read by nothing, so the restriction was a statement
-				// about the menu rather than about the kitchen: a model that named
-				// a withheld tool — from earlier context, from a gateway holding
-				// its own tool list, from a replayed cache prefix — had it run.
-				// The type says "restrict which tools the model may call"; this is
-				// the line that makes that true.
-				//
-				// Absent means unrestricted. An EMPTY list does not: it is a turn
-				// that may call nothing, and treating it as "no restriction" is
-				// the fail-open reading this codebase has already been bitten by
-				// once, in the delegate roster.
-				const allowed = context.allowedTools
-				if (allowed !== undefined && !allowed.includes(toolName)) {
-					const msg = `Tool "${toolName}" is not available on this step. Available: ${allowed.length > 0 ? allowed.join(', ') : '(none)'}`
-					this.log.warn('Blocked a tool outside the step allow-list', {
-						[GENAI.TOOL_NAME]: toolName,
-						'namzu.registry.allowed': allowed.length,
-					})
-					span.setAttributes({
-						[NAMZU.TOOL_SUCCESS]: false,
-						[NAMZU.TOOL_ERROR]: msg,
-					})
-					span.setStatus({ code: SpanStatusCode.ERROR, message: msg })
-					return {
-						success: false,
-						output: '',
-						error: msg,
-						permissionDenied: true,
-					}
-				}
-
-				const mode = context.permissionContext?.mode ?? 'auto'
-				if (mode === 'plan') {
-					const isReadOnly = isTrustedReadOnly(tool, finalInput)
-					if (!isReadOnly) {
-						// The same words the review-time policy uses, so the model gets one
-						// instruction whichever door refused it.
-						const msg = `plan mode: non-read-only tool "${toolName}" blocked. ${PLAN_MODE_REFUSAL}`
-						span.setAttributes({
-							[NAMZU.TOOL_SUCCESS]: false,
-							[NAMZU.TOOL_ERROR]: msg,
-						})
-						span.setStatus({ code: SpanStatusCode.ERROR, message: msg })
-						return {
-							success: false,
-							output: '',
-							error: msg,
-							permissionDenied: true,
-							permissionMessage: msg,
-						}
-					}
-				}
-
-				try {
-					this.log.debug('Executing tool', { 'namzu.tool.name': toolName })
-					const startedAt = Date.now()
-					const runResultGuardrails = context.toolResultGuardrails
-					const produced = await tool.execute(finalInput, context)
-					// Screened here, which is the only place a result can be
-					// examined before anything acts on it: the executor applies
-					// the output budget to what this returns, and compaction
-					// summarises later still. `provenance` is carried in so a
-					// screen can tell a connected server's words from a
-					// first-party tool's — a connector's result is framed with
-					// the server's name, and a screen reading only the value
-					// cannot use that.
-					const result = await screenToolResult(
-						// Explicit configuration wins, at whichever boundary it
-						// was made. A registry built WITH `resultGuardrails`
-						// has stated its policy — including `[]`, which means
-						// none — and a turn must not overrule it. A registry
-						// built without one declared none, so the turn's apply;
-						// that is the ordinary case, since a host assembles a
-						// registry and hands it to a turn it does not own.
-						this.resultGuardrails ?? runResultGuardrails,
-						produced,
-						{
-							toolName,
-							input: finalInput,
-							...(tool.provenance ? { provenance: tool.provenance } : {}),
-						},
-						this.log,
-					)
-					const durationMs = Date.now() - startedAt
-					this.log.debug('Tool completed', {
-						'namzu.tool.name': toolName,
-						'namzu.registry.success': result.success,
-					})
-
-					span.setAttribute(NAMZU.TOOL_SUCCESS, result.success)
-					recordToolCall(
-						toolName,
-						result.success,
-						result.success ? undefined : result.error,
-						durationMs,
-					)
-					if (!result.success && result.error) {
-						span.setAttribute(NAMZU.TOOL_ERROR, result.error)
-						span.setStatus({
-							code: SpanStatusCode.ERROR,
-							message: result.error,
-						})
-					} else {
-						span.setStatus({ code: SpanStatusCode.OK })
-					}
-
-					return result
-				} catch (err) {
-					// A terminal refusal must not be converted into a failed
-					// tool call. Everything below turns an exception into a
-					// result the model reads and works around, which is what
-					// `refuse` is for — doing it to a `halt` would silently
-					// demote the one verdict that says the turn must not
-					// continue.
-					if (err instanceof ToolResultHalted) {
-						span.setAttributes({
-							[NAMZU.TOOL_SUCCESS]: false,
-							[NAMZU.TOOL_ERROR]: err.message,
-						})
-						span.setStatus({
-							code: SpanStatusCode.ERROR,
-							message: err.message,
-						})
-						throw err
-					}
-					const errorMessage = toErrorMessage(err)
-					this.log.error('Tool execution error', {
-						'namzu.tool.name': toolName,
-						'exception.message': errorMessage,
-					})
-
-					span.setAttributes({
-						[NAMZU.TOOL_SUCCESS]: false,
-						[NAMZU.TOOL_ERROR]: errorMessage,
-					})
-					span.setStatus({
-						code: SpanStatusCode.ERROR,
-						message: errorMessage,
-					})
-					span.recordException(err instanceof Error ? err : new Error(errorMessage))
-
-					return {
-						success: false,
-						output: '',
-						error: `Tool "${toolName}" execution failed: ${errorMessage}`,
-					}
-				}
-			} finally {
-				// The only place this span ends. It used to be ended at three
-				// early returns and in a finally that opened below them, so
-				// anything throwing before that try — `getOrThrow` on a name the
-				// registry does not hold, for one — left the span open and the
-				// tool's trace unclosed.
-				span.end()
-			}
-		})
-	}
-
-	private validationFailure(
-		tool: ToolDefinition,
-		rawInput: unknown,
-		error: {
-			readonly issues: readonly {
-				readonly path: readonly PropertyKey[]
-				readonly message: string
-			}[]
-		},
-	): ToolExecutionResult {
-		const errorMessage = error.issues
-			.map((issue) => `${issue.path.join('.')}: ${issue.message}`)
-			.join('; ')
-		const isEmptyInput =
-			rawInput === null ||
-			rawInput === undefined ||
-			(typeof rawInput === 'object' &&
-				!Array.isArray(rawInput) &&
-				Object.keys(rawInput as Record<string, unknown>).length === 0)
-		const requiredHint = describeRequiredInput(tool.inputSchema)
-		const recoveryHint = tool.validationErrorHint?.trim()
-			? ` ${tool.validationErrorHint.trim()}`
-			: ''
-		const enrichedMessage = isEmptyInput
-			? `Tool "${tool.name}" was called with no arguments. ${requiredHint}${recoveryHint} Retry the call with the required parameters populated.`
-			: `Validation failed for "${tool.name}": ${errorMessage}. ${requiredHint}${recoveryHint}`
-		this.log.error('Tool input validation failed', {
-			'namzu.tool.name': tool.name,
-			'namzu.registry.errors': errorMessage,
-			'namzu.registry.empty': isEmptyInput,
-		})
-		return { success: false, output: '', error: enrichedMessage }
-	}
-
-	private getByAvailability(states: ToolAvailability[], filter?: string[]): ToolDefinition[] {
-		const candidates = filter ? filter.map((n) => this.getOrThrow(n)) : this.getAll()
-		return candidates.filter((t) => states.includes(this.getAvailability(t.name)))
-	}
-}
-
 /**
  * One-line discoverability hint for a deferred tool: the first sentence of
  * its description, capped at ~100 chars. Used for the `<deferred_tools>`
@@ -837,96 +107,3 @@ export function toolDiscoveryHint(description: string, maxLength = 100): string
 	if (sentence.length <= maxLength) return sentence
 	return `${sentence.slice(0, maxLength - 1).trimEnd()}…`
 }
-
-/**
- * Lower-cased argument (property) names of a tool's input schema, used by
- * `searchDeferred` ranking. Walks the JSON-Schema rendering (already a
- * registration dependency) instead of Zod internals; opaque schemas simply
- * contribute no argument matches.
- */
-function listArgumentNames(tool: ToolDefinition): string[] {
-	try {
-		// The model-facing schema when there is one: that is what the model
-		// was shown, so it is what a search over "which tool takes this
-		// argument" has to match against.
-		const json = tool.modelInputSchema ?? renderToolSchema(tool.inputSchema)
-		return [...collectSchemaPropertyNames(json)].map((key) => key.toLowerCase())
-	} catch {
-		return []
-	}
-}
-
-/**
- * Every property name a schema can accept, including the ones that only
- * appear inside a branch.
- *
- * A conditional schema puts its real arguments under `anyOf`/`oneOf`, so
- * reading the top-level `properties` alone finds nothing and the tool is
- * unfindable by the very argument it takes. `seen` guards a schema that
- * refers back to itself.
- */
-function collectSchemaPropertyNames(
-	schema: unknown,
-	names: Set<string> = new Set(),
-	seen: Set<object> = new Set(),
-): Set<string> {
-	if (!schema || typeof schema !== 'object' || Array.isArray(schema)) return names
-	if (seen.has(schema)) return names
-	seen.add(schema)
-
-	const record = schema as Record<string, unknown>
-	const properties = record.properties
-	if (properties && typeof properties === 'object' && !Array.isArray(properties)) {
-		for (const name of Object.keys(properties)) names.add(name)
-	}
-	for (const keyword of ['anyOf', 'oneOf', 'allOf'] as const) {
-		const branches = record[keyword]
-		if (!Array.isArray(branches)) continue
-		for (const branch of branches) collectSchemaPropertyNames(branch, names, seen)
-	}
-	return names
-}
-
-/**
- * Build a one-sentence "Required: <field>: <type>, <field>: <type>"
- * hint from a Zod schema, used to enrich tool-input validation
- * errors so the model can self-correct without round-tripping the
- * full JSON schema again. Walks the schema's JSON-Schema rendering
- * (already a dependency for tool registration) so we don't have to
- * branch over Zod's internal type tree.
- *
- * Returns a fallback string for opaque/non-object schemas — the
- * caller still ships the raw Zod issues separately, so the hint
- * here is bonus context, not the only signal.
- */
-function describeRequiredInput(schema: { _def?: unknown }): string {
-	try {
-		const json = renderToolSchema(schema as never) as {
-			properties?: Record<string, { type?: string; description?: string }>
-			required?: string[]
-		}
-		const required = json.required ?? []
-		if (required.length === 0) return 'No required parameters known.'
-		const props = json.properties ?? {}
-		const lines = required.map((name) => {
-			const def = props[name] ?? {}
-			const type = def.type ?? 'value'
-			const desc = def.description ? ` — ${def.description}` : ''
-			return `${name}: ${type}${desc}`
-		})
-		return `Required: ${lines.join(', ')}.`
-	} catch {
-		return 'Could not introspect required parameters.'
-	}
-}
-
-/**
- * The session and turn a tool span belongs to. A host calling a tool
- * directly may pass a context without them, so each is set only when present.
- */
-function toolSpanIdentity(context: ToolContext): Record<string, string> {
-	return {
-		...(context.sessionId ? { [GENAI.CONVERSATION_ID]: context.sessionId } : {}),
-		...(context.turnId ? { [NAMZU.TURN_ID]: context.turnId } : {}),
-	}
-}