@namzu/sdk 0.6.0 → 1.0.0

package/dist/registry/toolset/catalog.js

@@ -0,0 +1,217 @@
+import { zodToJsonSchema } from 'zod-to-json-schema';
+const DEFAULT_HOST_SOURCE = {
+    id: 'host-tools',
+    kind: 'host_tool',
+    name: 'Host tools',
+    description: 'Tools executed by the host runtime.',
+};
+const DEFAULT_HOST_TOOLSET = {
+    id: 'host-tools',
+    sourceId: DEFAULT_HOST_SOURCE.id,
+    name: 'Host tools',
+    defaultPolicy: {
+        enabled: true,
+        loading: 'eager',
+        permissionPolicy: 'default',
+    },
+};
+export class ToolCatalog {
+    sources = new Map();
+    toolsets = new Map();
+    tools = new Map();
+    registerSource(source) {
+        this.sources.set(source.id, source);
+    }
+    registerToolset(toolset) {
+        if (!this.sources.has(toolset.sourceId)) {
+            throw new Error(`Toolset "${toolset.id}" references unknown source "${toolset.sourceId}"`);
+        }
+        this.toolsets.set(toolset.id, toolset);
+    }
+    registerTool(tool) {
+        if (!this.sources.has(tool.sourceId)) {
+            throw new Error(`Tool "${tool.name}" references unknown source "${tool.sourceId}"`);
+        }
+        if (!this.toolsets.has(tool.toolsetId)) {
+            throw new Error(`Tool "${tool.name}" references unknown toolset "${tool.toolsetId}"`);
+        }
+        this.tools.set(tool.name, tool);
+    }
+    getSource(id) {
+        return this.sources.get(id);
+    }
+    getToolset(id) {
+        return this.toolsets.get(id);
+    }
+    getTool(name) {
+        return this.tools.get(name);
+    }
+    listSources() {
+        return [...this.sources.values()];
+    }
+    listToolsets() {
+        return [...this.toolsets.values()];
+    }
+    listTools() {
+        return [...this.tools.values()];
+    }
+    snapshot() {
+        return {
+            sources: this.listSources(),
+            toolsets: this.listToolsets(),
+            tools: this.listTools(),
+        };
+    }
+    getToolsByLoading(loading) {
+        const wanted = new Set(loading);
+        return this.listTools().filter((tool) => wanted.has(resolveToolLoading(tool.policy)));
+    }
+    searchTools(query, options = {}) {
+        const normalized = query.trim().toLowerCase();
+        const terms = normalized.split(/\s+/).filter(Boolean);
+        const loading = options.loading ? new Set(options.loading) : null;
+        const results = [];
+        for (const tool of this.listTools()) {
+            if (loading && !loading.has(resolveToolLoading(tool.policy)))
+                continue;
+            if (tool.policy.enabled === false)
+                continue;
+            const source = this.sources.get(tool.sourceId);
+            const toolset = this.toolsets.get(tool.toolsetId);
+            if (!source || !toolset)
+                continue;
+            const scored = scoreToolSearch({
+                terms,
+                tool,
+                source,
+                toolset,
+            });
+            if (scored.score <= 0)
+                continue;
+            results.push({
+                tool,
+                source,
+                toolset,
+                score: scored.score,
+                matched: scored.matched,
+            });
+        }
+        results.sort((a, b) => b.score - a.score || a.tool.name.localeCompare(b.tool.name));
+        return results.slice(0, options.limit ?? 5);
+    }
+    toLLMTools(options = {}) {
+        const loading = options.loading ?? ['eager'];
+        return this.getToolsByLoading(loading)
+            .filter((tool) => tool.policy.enabled !== false)
+            .map((tool) => tool.llmSchema ?? toolDefinitionToLLMTool(tool.definition))
+            .filter((tool) => Boolean(tool));
+    }
+}
+export function createToolCatalogFromRegistry(registry, options = {}) {
+    const source = options.source ?? DEFAULT_HOST_SOURCE;
+    const toolset = {
+        ...DEFAULT_HOST_TOOLSET,
+        ...options.toolset,
+        sourceId: options.toolset?.sourceId ?? source.id,
+    };
+    const catalog = new ToolCatalog();
+    catalog.registerSource(source);
+    catalog.registerToolset(toolset);
+    for (const definition of registry.getAll()) {
+        const availability = registry.getAvailability(definition.name);
+        catalog.registerTool(toolDefinitionToCatalogEntry(definition, {
+            availability,
+            sourceId: source.id,
+            toolsetId: toolset.id,
+            toolsetPolicy: toolset.defaultPolicy,
+        }));
+    }
+    return catalog;
+}
+export function toolDefinitionToCatalogEntry(definition, input) {
+    const loading = loadingFromAvailability(input.availability ?? 'active');
+    return {
+        name: definition.name,
+        description: definition.description,
+        sourceId: input.sourceId,
+        toolsetId: input.toolsetId,
+        definition,
+        permissions: definition.permissions,
+        category: definition.category,
+        policy: {
+            ...input.toolsetPolicy,
+            enabled: input.toolsetPolicy?.enabled === false ? false : loading !== 'suspended',
+            loading,
+        },
+    };
+}
+export function loadingFromAvailability(availability) {
+    switch (availability) {
+        case 'deferred':
+            return 'deferred';
+        case 'suspended':
+            return 'suspended';
+        default:
+            return 'eager';
+    }
+}
+function resolveToolLoading(policy) {
+    if (policy.enabled === false)
+        return 'disabled';
+    return policy.loading ?? 'eager';
+}
+function toolDefinitionToLLMTool(definition) {
+    if (!definition)
+        return null;
+    return {
+        type: 'function',
+        function: {
+            name: definition.name,
+            description: definition.description,
+            parameters: zodToJsonSchema(definition.inputSchema, {
+                target: 'jsonSchema7',
+                $refStrategy: 'none',
+            }),
+        },
+    };
+}
+function scoreToolSearch(input) {
+    const terms = input.terms.length > 0 ? input.terms : [''];
+    const matched = new Set();
+    let score = 0;
+    for (const term of terms) {
+        if (!term)
+            continue;
+        const toolName = input.tool.name.toLowerCase();
+        const description = input.tool.description.toLowerCase();
+        const sourceText = `${input.source.name} ${input.source.description ?? ''} ${input.source.kind}`.toLowerCase();
+        const toolsetText = `${input.toolset.name} ${input.toolset.description ?? ''}`.toLowerCase();
+        if (toolName === term) {
+            score += 12;
+            matched.add('name');
+        }
+        else if (toolName.includes(term)) {
+            score += 8;
+            matched.add('name');
+        }
+        if (description.includes(term)) {
+            score += 5;
+            matched.add('description');
+        }
+        if (sourceText.includes(term)) {
+            score += 3;
+            matched.add('source');
+        }
+        if (toolsetText.includes(term)) {
+            score += 2;
+            matched.add('toolset');
+        }
+    }
+    if (input.tool.policy.preferred && score > 0)
+        score += 1;
+    return {
+        score,
+        matched: [...matched],
+    };
+}
+//# sourceMappingURL=catalog.js.map

package/dist/registry/toolset/catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/registry/toolset/catalog.ts"],"names":[],"mappings":"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"}

package/dist/registry/toolset/catalog.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=catalog.test.d.ts.map

package/dist/registry/toolset/catalog.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog.test.d.ts","sourceRoot":"","sources":["../../../src/registry/toolset/catalog.test.ts"],"names":[],"mappings":""}

package/dist/registry/toolset/catalog.test.js

@@ -0,0 +1,85 @@
+import { describe, expect, it } from 'vitest';
+import { z } from 'zod';
+import { ToolRegistry } from '../tool/execute.js';
+import { ToolCatalog, createToolCatalogFromRegistry } from './catalog.js';
+function makeTool(name, description = `${name} tool`) {
+    return {
+        name,
+        description,
+        inputSchema: z.object({ query: z.string().optional() }),
+        async execute() {
+            return { success: true, output: `${name}-ran` };
+        },
+    };
+}
+describe('ToolCatalog', () => {
+    it('keeps sources, toolsets, and tools as separate records', () => {
+        const catalog = new ToolCatalog();
+        catalog.registerSource({
+            id: 'mcp:microsoft-learn',
+            kind: 'mcp_server',
+            name: 'Microsoft Learn',
+            mcpServer: {
+                name: 'microsoft-learn',
+                url: 'https://learn.microsoft.com/api/mcp',
+                transport: 'streamable_http',
+            },
+        });
+        catalog.registerToolset({
+            id: 'mcp-toolset:microsoft-learn',
+            sourceId: 'mcp:microsoft-learn',
+            name: 'Microsoft Learn toolset',
+            defaultPolicy: {
+                enabled: true,
+                loading: 'deferred',
+                preferred: true,
+                permissionPolicy: 'always_allow',
+            },
+        });
+        catalog.registerTool({
+            name: 'microsoft_docs_search',
+            description: 'Search Microsoft documentation',
+            sourceId: 'mcp:microsoft-learn',
+            toolsetId: 'mcp-toolset:microsoft-learn',
+            policy: { enabled: true, loading: 'deferred', preferred: true },
+        });
+        expect(catalog.listSources()).toHaveLength(1);
+        expect(catalog.listToolsets()).toHaveLength(1);
+        expect(catalog.getToolsByLoading(['deferred']).map((t) => t.name)).toEqual([
+            'microsoft_docs_search',
+        ]);
+    });
+    it('searches deferred tools by name, description, source, and toolset', () => {
+        const registry = new ToolRegistry();
+        registry.register(makeTool('github_search_issues', 'Search repository issues'), 'deferred');
+        registry.register(makeTool('slack_search_messages', 'Search team messages'), 'deferred');
+        registry.register(makeTool('bash', 'Run a shell command'));
+        const catalog = createToolCatalogFromRegistry(registry, {
+            source: {
+                id: 'host',
+                kind: 'host_tool',
+                name: 'Host runtime',
+                description: 'Local shell and collaboration tools',
+            },
+            toolset: {
+                id: 'default-host',
+                name: 'Default host tools',
+                defaultPolicy: { enabled: true, loading: 'eager' },
+            },
+        });
+        expect(catalog.searchTools('repository', { loading: ['deferred'] }).map((r) => r.tool.name)).toEqual(['github_search_issues']);
+        expect(catalog.toLLMTools().map((t) => t.function.name)).toEqual(['bash']);
+    });
+    it('preserves registry availability as catalog loading policy', () => {
+        const registry = new ToolRegistry();
+        registry.register(makeTool('read_file'));
+        registry.register(makeTool('web_search'), 'deferred');
+        registry.register(makeTool('write_file'), 'suspended');
+        const catalog = createToolCatalogFromRegistry(registry);
+        expect(catalog.getTool('read_file')?.policy.loading).toBe('eager');
+        expect(catalog.getTool('web_search')?.policy.loading).toBe('deferred');
+        expect(catalog.getTool('write_file')?.policy.loading).toBe('suspended');
+        expect(catalog.toLLMTools({ loading: ['suspended'] })).toEqual([]);
+    });
+});
+//# sourceMappingURL=catalog.test.js.map

package/dist/registry/toolset/catalog.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog.test.js","sourceRoot":"","sources":["../../../src/registry/toolset/catalog.test.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/__tests__/deferred-tools.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=deferred-tools.test.d.ts.map

package/dist/runtime/query/__tests__/deferred-tools.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deferred-tools.test.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/__tests__/deferred-tools.test.ts"],"names":[],"mappings":""}

package/dist/runtime/query/__tests__/deferred-tools.test.js

@@ -0,0 +1,147 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { z } from 'zod';
+import { ToolRegistry } from '../../../registry/tool/execute.js';
+import { SearchToolsTool } from '../../../tools/builtins/search-tools.js';
+import { createUserMessage } from '../../../types/message/index.js';
+import { drainQuery } from '../index.js';
+const ZERO_USAGE = {
+    promptTokens: 0,
+    completionTokens: 0,
+    totalTokens: 0,
+    cachedTokens: 0,
+    cacheWriteTokens: 0,
+};
+class CapturingProvider {
+    id = 'capturing';
+    name = 'Capturing Provider';
+    lastParams;
+    async *chatStream(params) {
+        this.lastParams = params;
+        yield {
+            id: 'msg_1',
+            delta: { content: 'done' },
+        };
+        yield {
+            id: 'msg_1',
+            delta: {},
+            finishReason: 'stop',
+            usage: ZERO_USAGE,
+        };
+    }
+}
+function registerDeferredDocumentTool(tools, name = 'generate_document') {
+    tools.register({
+        name,
+        description: 'Generate a project document by document id.',
+        inputSchema: z.object({
+            documentId: z.string(),
+        }),
+        execute: async () => ({ success: true, output: 'generated' }),
+    }, 'deferred');
+}
+describe('query deferred tool discovery', () => {
+    let workdirs = [];
+    afterEach(async () => {
+        await Promise.all(workdirs.map((dir) => rm(dir, { recursive: true, force: true })));
+        workdirs = [];
+    });
+    it('auto-exposes search_tools when deferred tools are registered', async () => {
+        const provider = new CapturingProvider();
+        const tools = new ToolRegistry();
+        registerDeferredDocumentTool(tools);
+        const workingDirectory = await mkdtemp(join(tmpdir(), 'namzu-deferred-tools-'));
+        workdirs.push(workingDirectory);
+        const run = await drainQuery({
+            provider,
+            tools,
+            runConfig: {
+                model: 'mock-model',
+                timeoutMs: 5_000,
+                tokenBudget: 100_000,
+                maxIterations: 1,
+                maxResponseTokens: 256,
+            },
+            agentId: 'agent_test',
+            agentName: 'Test Agent',
+            messages: [createUserMessage('what tools can you use?')],
+            workingDirectory,
+            sessionId: 'ses_deferred_tools',
+            threadId: 'thd_deferred_tools',
+            projectId: 'prj_deferred_tools',
+            tenantId: 'tnt_deferred_tools',
+        });
+        expect(run.status).toBe('completed');
+        expect(tools.has(SearchToolsTool.name)).toBe(true);
+        expect(tools.getAvailability(SearchToolsTool.name)).toBe('active');
+        expect(tools.getAvailability('generate_document')).toBe('deferred');
+        const toolNames = provider.lastParams?.tools?.map((tool) => tool.function.name).sort() ?? [];
+        expect(toolNames).toEqual([SearchToolsTool.name]);
+        const systemPrompt = (provider.lastParams?.messages ?? [])
+            .filter((message) => message.role === 'system')
+            .map((message) => message.content)
+            .join('\n');
+        expect(systemPrompt).toContain('Use search_tools to load these before use:');
+        expect(systemPrompt).toContain('- generate_document');
+        expect(systemPrompt).not.toContain('Deferred tools are discoverable but not executable until the runtime activates them');
+    });
+    it('keeps search_tools executable when allowedTools names a deferred tool', async () => {
+        const provider = new CapturingProvider();
+        const tools = new ToolRegistry();
+        registerDeferredDocumentTool(tools);
+        const workingDirectory = await mkdtemp(join(tmpdir(), 'namzu-deferred-tools-'));
+        workdirs.push(workingDirectory);
+        const run = await drainQuery({
+            provider,
+            tools,
+            allowedTools: ['generate_document'],
+            runConfig: {
+                model: 'mock-model',
+                timeoutMs: 5_000,
+                tokenBudget: 100_000,
+                maxIterations: 1,
+                maxResponseTokens: 256,
+            },
+            agentId: 'agent_test',
+            agentName: 'Test Agent',
+            messages: [createUserMessage('generate D-01')],
+            workingDirectory,
+            sessionId: 'ses_deferred_allowed_tools',
+            threadId: 'thd_deferred_allowed_tools',
+            projectId: 'prj_deferred_allowed_tools',
+            tenantId: 'tnt_deferred_allowed_tools',
+        });
+        expect(run.status).toBe('completed');
+        expect(tools.getAvailability('generate_document')).toBe('deferred');
+        const toolNames = provider.lastParams?.tools?.map((tool) => tool.function.name).sort() ?? [];
+        expect(toolNames).toEqual([SearchToolsTool.name]);
+        const systemPrompt = (provider.lastParams?.messages ?? [])
+            .filter((message) => message.role === 'system')
+            .map((message) => message.content)
+            .join('\n');
+        expect(systemPrompt).toContain('Use search_tools to load these before use:');
+        expect(systemPrompt).toContain('- generate_document');
+    });
+    it('does not let search_tools reveal or activate deferred tools outside allowedTools', async () => {
+        const tools = new ToolRegistry();
+        registerDeferredDocumentTool(tools);
+        registerDeferredDocumentTool(tools, 'dangerous_delete_document');
+        const result = await SearchToolsTool.execute({ query: 'delete' }, {
+            runId: 'run_deferred_allowed_tools',
+            workingDirectory: '/tmp',
+            abortSignal: new AbortController().signal,
+            env: {},
+            log: () => undefined,
+            toolRegistry: tools,
+            allowedTools: ['generate_document', SearchToolsTool.name],
+        });
+        expect(result.success).toBe(true);
+        expect(result.output).toContain('No deferred tools matching "delete"');
+        expect(result.output).not.toContain('dangerous_delete_document');
+        expect(tools.getAvailability('generate_document')).toBe('deferred');
+        expect(tools.getAvailability('dangerous_delete_document')).toBe('deferred');
+    });
+});
+//# sourceMappingURL=deferred-tools.test.js.map

package/dist/runtime/query/__tests__/deferred-tools.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deferred-tools.test.js","sourceRoot":"","sources":["../../../../src/runtime/query/__tests__/deferred-tools.test.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/__tests__/executor-concurrency.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=executor-concurrency.test.d.ts.map

package/dist/runtime/query/__tests__/executor-concurrency.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor-concurrency.test.d.ts","sourceRoot":"","sources":["../../../../src/runtime/query/__tests__/executor-concurrency.test.ts"],"names":[],"mappings":""}

package/dist/runtime/query/__tests__/executor-concurrency.test.js

@@ -0,0 +1,98 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ActivityStore } from '../../../store/activity/memory.js';
+import { ToolExecutor } from '../executor.js';
+const mockRunId = 'run_test';
+function makeLogger() {
+    const stub = { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() };
+    return { ...stub, child: vi.fn(() => ({ ...stub, child: vi.fn() })) };
+}
+const delay = (ms) => new Promise((r) => setTimeout(r, ms));
+/** Two tool calls in one assistant message (one batch). */
+function twoCallResponse(name, a, b) {
+    return {
+        message: {
+            role: 'assistant',
+            content: null,
+            toolCalls: [
+                { id: 'c1', type: 'function', function: { name, arguments: JSON.stringify(a) } },
+                { id: 'c2', type: 'function', function: { name, arguments: JSON.stringify(b) } },
+            ],
+        },
+        finishReason: 'tool_calls',
+        usage: { promptTokens: 0, completionTokens: 0, totalTokens: 0 },
+    };
+}
+describe('ToolExecutor — concurrencySafe batching', () => {
+    let activityStore;
+    let emitEvent;
+    beforeEach(() => {
+        activityStore = new ActivityStore(mockRunId, {
+            enabled: true,
+            trackToolCalls: true,
+            trackLlmTurns: true,
+        });
+        emitEvent = async () => { };
+    });
+    it('serializes concurrency-unsafe tools so read-modify-write does not race', async () => {
+        // Shared mutable state, mutated via read → await → write (like `edit`).
+        let file = 'A';
+        const execute = vi.fn(async (_name, input) => {
+            const current = file; // read
+            await delay(10); // window a parallel run would exploit
+            file = current + input.add; // write
+            return { success: true, output: 'ok' };
+        });
+        const tools = {
+            register: vi.fn(),
+            unregister: vi.fn(),
+            execute,
+            // edit/write/bash declare concurrencySafe:false → isConcurrencySafe()=>false
+            get: vi.fn(() => ({ isConcurrencySafe: () => false })),
+            has: vi.fn(() => true),
+            listNames: vi.fn(() => []),
+            getAvailability: vi.fn(),
+        };
+        const exec = new ToolExecutor({
+            tools,
+            runId: mockRunId,
+            workingDirectory: '/tmp',
+            permissionMode: 'auto',
+            env: {},
+            abortSignal: new AbortController().signal,
+        }, activityStore, emitEvent, makeLogger());
+        await exec.executeBatch(twoCallResponse('edit', { add: 'B' }, { add: 'C' }));
+        // Serialized: A→AB→ABC. A racing run would lose one append (e.g. 'AC').
+        expect(file).toBe('ABC');
+    });
+    it('runs concurrency-safe tools in parallel', async () => {
+        let active = 0;
+        let maxActive = 0;
+        const execute = vi.fn(async () => {
+            active++;
+            maxActive = Math.max(maxActive, active);
+            await delay(10);
+            active--;
+            return { success: true, output: 'ok' };
+        });
+        const tools = {
+            register: vi.fn(),
+            unregister: vi.fn(),
+            execute,
+            get: vi.fn(() => ({ isConcurrencySafe: () => true })),
+            has: vi.fn(() => true),
+            listNames: vi.fn(() => []),
+            getAvailability: vi.fn(),
+        };
+        const exec = new ToolExecutor({
+            tools,
+            runId: mockRunId,
+            workingDirectory: '/tmp',
+            permissionMode: 'auto',
+            env: {},
+            abortSignal: new AbortController().signal,
+        }, activityStore, emitEvent, makeLogger());
+        await exec.executeBatch(twoCallResponse('grep', { p: '1' }, { p: '2' }));
+        expect(maxActive).toBe(2); // both ran at once
+    });
+});
+//# sourceMappingURL=executor-concurrency.test.js.map

package/dist/runtime/query/__tests__/executor-concurrency.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor-concurrency.test.js","sourceRoot":"","sources":["../../../../src/runtime/query/__tests__/executor-concurrency.test.ts"],"names":[],"mappings":"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"}