@zhin.js/agent 0.3.1 → 1.0.2

package/lib/orchestrator/remote-task-executor.js

@@ -1,20 +1,53 @@
-/**
- * Remote task execution via MCP agent.delegate_task (Agent Mesh v1).
- */
 import { getAgentDispatcher } from './agent-dispatcher.js';
 import { getRemoteAgentRegistry } from './remote-agent-registry.js';
 import { getOrchestrationService } from './orchestration-service.js';
-function extractMcpText(result) {
-    if (typeof result === 'string')
-        return result;
-    const content = result?.content;
-    if (Array.isArray(content)) {
-        return content
-            .filter((c) => c.type === 'text' && c.text)
-            .map((c) => c.text)
-            .join('\n');
+import { buildSendMessageRequest } from '../a2a/delegation-message.js';
+import { extractTaskResultText, isTerminalA2aState, mapA2aTaskState, } from '../a2a/task-state.js';
+function isA2aTask(value) {
+    return !!value && typeof value === 'object' && 'id' in value && 'status' in value;
+}
+function extractRemoteTaskId(result) {
+    if (isA2aTask(result))
+        return result.id;
+    if (result && typeof result === 'object' && 'taskId' in result) {
+        const tid = result.taskId;
+        if (tid)
+            return tid;
+    }
+    if (result && typeof result === 'object' && 'id' in result) {
+        return String(result.id);
+    }
+    return undefined;
+}
+async function applyStreamToKernel(taskId, stream, orch) {
+    let remoteTaskId = taskId;
+    let terminal = false;
+    let resultText;
+    for await (const event of stream) {
+        if (!event || typeof event !== 'object')
+            continue;
+        const payload = 'result' in event ? event.result : event;
+        if (isA2aTask(payload)) {
+            remoteTaskId = payload.id;
+            const state = payload.status?.state;
+            await orch.taskProgress(taskId, `a2a stream: ${state ?? 'update'}`);
+            if (isTerminalA2aState(state)) {
+                terminal = true;
+                resultText = extractTaskResultText(payload);
+                const status = mapA2aTaskState(state);
+                if (status === 'completed') {
+                    await orch.completeTask(taskId, (resultText || 'remote task completed').slice(0, 4000));
+                }
+                else if (status === 'cancelled') {
+                    await orch.cancelTask(taskId, resultText || 'remote task cancelled');
+                }
+                else if (status === 'failed') {
+                    await orch.failTask(taskId, resultText || 'remote task failed');
+                }
+            }
+        }
     }
-    return JSON.stringify(result);
+    return { remoteTaskId, terminal, resultText };
 }
 export async function executeRemoteOrchestrationTask(taskId) {
     const dispatcher = getAgentDispatcher();
@@ -23,7 +56,7 @@ export async function executeRemoteOrchestrationTask(taskId) {
     if (!task) {
         return { ok: false, message: `任务 ${taskId} 不存在` };
     }
-    if (task.executorKind !== 'remote' || !task.remoteAgentId) {
+    if (task.executorKind !== 'remote_mesh' || !task.remoteAgentId) {
         return { ok: false, message: `任务 ${taskId} 不是远程执行任务` };
     }
     const registry = getRemoteAgentRegistry();
@@ -31,62 +64,89 @@ export async function executeRemoteOrchestrationTask(taskId) {
     if (!agent) {
         return { ok: false, message: `远程 Agent ${task.remoteAgentId} 未注册` };
     }
-    const promise = (async () => {
-        try {
-            const conn = await registry.getConnection(task.remoteAgentId);
-            const result = await conn.callTool('agent.delegate_task', {
-                title: task.name,
-                description: task.goal || task.description,
-                acceptance_criteria: task.context?.acceptance_criteria ?? '',
-                artifacts: task.context?.artifacts ?? [],
-            });
-            const text = extractMcpText(result);
+    const payload = {
+        title: task.name,
+        description: task.goal || task.description,
+        acceptance_criteria: String(task.context?.acceptance_criteria ?? ''),
+        artifacts: task.context?.artifacts ?? [],
+        role: task.role,
+    };
+    const sendParams = buildSendMessageRequest(payload);
+    try {
+        const client = await registry.getA2aClient(task.remoteAgentId);
+        if (registry.supportsStreaming(task.remoteAgentId)) {
+            const stream = client.sendMessageStream(sendParams);
+            const first = await stream.next();
             let remoteTaskId = taskId;
-            try {
-                const parsed = JSON.parse(text);
-                remoteTaskId = parsed.remote_task_id ?? parsed.task_id ?? taskId;
-            }
-            catch {
-                const match = text.match(/remote_task_id["\s:]+([a-zA-Z0-9-]+)/);
-                if (match)
-                    remoteTaskId = match[1];
+            if (!first.done && isA2aTask(first.value)) {
+                remoteTaskId = first.value.id;
+                if (orch) {
+                    await orch.markTaskWaitingResult(taskId, {
+                        remoteTaskId,
+                        progress: `a2a delegation started (stream): ${task.remoteAgentId}:${remoteTaskId}`,
+                    });
+                }
             }
+            void applyStreamToKernel(taskId, (async function* () {
+                if (!first.done)
+                    yield first.value;
+                yield* stream;
+            })(), orch).catch(async (err) => {
+                const error = err instanceof Error ? err.message : String(err);
+                if (orch)
+                    await orch.safeFailTask(taskId, `a2a stream failed: ${error}`);
+            });
+            return {
+                ok: true,
+                message: `远程任务已通过 A2A SSE 委托给 ${task.remoteAgentId}（task ${taskId}）`,
+            };
+        }
+        const result = await client.sendMessage(sendParams);
+        const remoteTaskId = extractRemoteTaskId(result) ?? taskId;
+        if (isA2aTask(result) && isTerminalA2aState(result.status?.state)) {
+            const resultText = extractTaskResultText(result);
+            const status = mapA2aTaskState(result.status?.state);
             if (orch) {
-                await orch.repositoryHandle.updateTaskStatus(taskId, 'running', {
-                    remote_task_id: remoteTaskId,
-                    started_at: Date.now(),
-                });
+                if (status === 'completed') {
+                    await orch.completeTask(taskId, (resultText || 'remote task completed').slice(0, 4000));
+                }
+                else if (status === 'cancelled') {
+                    await orch.cancelTask(taskId, resultText || 'cancelled');
+                }
+                else {
+                    await orch.failTask(taskId, resultText || 'failed');
+                }
             }
-            dispatcher.markRunning(taskId, Promise.resolve({
-                taskId,
-                role: task.role,
-                success: true,
-                summary: `delegated to ${task.remoteAgentId}:${remoteTaskId}`,
-                duration: 0,
-            }));
+            return { ok: true, message: `远程任务已完成: ${task.remoteAgentId}` };
         }
-        catch (err) {
+        if (orch) {
+            await orch.markTaskWaitingResult(taskId, {
+                remoteTaskId,
+                progress: `a2a delegation started: ${task.remoteAgentId}:${remoteTaskId}`,
+            });
+        }
+        return {
+            ok: true,
+            message: `远程任务已委托给 ${task.remoteAgentId}（task ${taskId}），将通过轮询同步状态。`,
+        };
+    }
+    catch (err) {
+        const error = err instanceof Error ? err.message : String(err);
+        if (orch) {
+            await orch.safeFailTask(taskId, `a2a delegate failed: ${error}`);
+        }
+        else {
             dispatcher.recordResult({
                 taskId,
                 role: task.role,
                 success: false,
-                summary: 'remote delegate failed',
-                error: err instanceof Error ? err.message : String(err),
+                summary: 'a2a delegate failed',
+                error,
                 duration: 0,
             });
         }
-    })();
-    dispatcher.markRunning(taskId, promise.then(() => ({
-        taskId,
-        role: task.role,
-        success: true,
-        summary: 'remote delegation started',
-        duration: 0,
-    })));
-    return {
-        ok: true,
-        message: `远程任务已委托给 ${task.remoteAgentId}（task ${taskId}），将通过轮询同步状态。`,
-    };
+        return { ok: false, message: `远程委托失败: ${error}` };
+    }
 }
 export async function pollRemoteTaskStatus(taskId) {
     const dispatcher = getAgentDispatcher();
@@ -95,48 +155,69 @@ export async function pollRemoteTaskStatus(taskId) {
     if (!task?.remoteAgentId || !task.remoteTaskId) {
         return { done: false, status: 'unknown' };
     }
-    const conn = await getRemoteAgentRegistry().getConnection(task.remoteAgentId);
-    const statusResult = await conn.callTool('agent.query_status', { task_id: task.remoteTaskId });
-    const statusText = extractMcpText(statusResult);
-    let status = 'running';
     try {
-        const parsed = JSON.parse(statusText);
-        status = parsed.status ?? status;
-    }
-    catch {
-        if (/completed|done|success/i.test(statusText))
-            status = 'completed';
-        if (/failed|error/i.test(statusText))
-            status = 'failed';
-        if (/pending/i.test(statusText))
-            status = 'pending';
-    }
-    if (status === 'completed') {
-        const resultRaw = await conn.callTool('agent.get_result', { task_id: task.remoteTaskId });
-        const resultText = extractMcpText(resultRaw);
-        dispatcher.recordResult({
-            taskId,
-            role: task.role,
-            success: true,
-            summary: resultText.slice(0, 4000),
-            duration: 0,
-        });
-        return { done: true, status, result: resultText };
-    }
-    if (status === 'failed' || status === 'cancelled') {
-        dispatcher.recordResult({
-            taskId,
-            role: task.role,
-            success: false,
-            summary: statusText,
-            error: statusText,
-            duration: 0,
-        });
-        return { done: true, status, result: statusText };
+        const client = await getRemoteAgentRegistry().getA2aClient(task.remoteAgentId);
+        const remoteTask = await client.getTask({ id: task.remoteTaskId, tenant: '' });
+        const status = mapA2aTaskState(remoteTask.status?.state);
+        const resultText = extractTaskResultText(remoteTask);
+        if (status === 'completed') {
+            if (orch) {
+                await orch.completeTask(taskId, (resultText || 'remote completed').slice(0, 4000));
+            }
+            else {
+                dispatcher.recordResult({
+                    taskId,
+                    role: task.role,
+                    success: true,
+                    summary: resultText.slice(0, 4000),
+                    duration: 0,
+                });
+            }
+            return { done: true, status, result: resultText };
+        }
+        if (status === 'cancelled') {
+            if (orch) {
+                await orch.cancelTask(taskId, resultText || 'remote task cancelled');
+            }
+            else {
+                dispatcher.recordResult({
+                    taskId,
+                    role: task.role,
+                    success: false,
+                    summary: resultText,
+                    error: resultText,
+                    duration: 0,
+                });
+            }
+            return { done: true, status, result: resultText };
+        }
+        if (status === 'failed') {
+            if (orch) {
+                await orch.failTask(taskId, resultText || 'remote task failed');
+            }
+            else {
+                dispatcher.recordResult({
+                    taskId,
+                    role: task.role,
+                    success: false,
+                    summary: resultText,
+                    error: resultText,
+                    duration: 0,
+                });
+            }
+            return { done: true, status, result: resultText };
+        }
+        if (orch) {
+            await orch.taskProgress(taskId, `a2a status: ${status}`);
+        }
+        return { done: false, status };
     }
-    if (orch) {
-        await orch.repositoryHandle.updateTaskStatus(taskId, 'running');
+    catch (err) {
+        const error = err instanceof Error ? err.message : String(err);
+        if (orch) {
+            await orch.taskProgress(taskId, `a2a poll error: ${error}`);
+        }
+        return { done: false, status: 'error' };
     }
-    return { done: false, status };
 }
 //# sourceMappingURL=remote-task-executor.js.map

package/lib/orchestrator/remote-task-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-task-executor.js","sourceRoot":"","sources":["../../src/orchestrator/remote-task-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote-task-executor.js","sourceRoot":"","sources":["../../src/orchestrator/remote-task-executor.ts"],"names":[],"mappings":"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"}

package/lib/orchestrator/remote-task-poller.js

@@ -1,5 +1,5 @@
 /**
- * RemoteTaskPoller — 轮询远程 MCP 任务状态（Agent Mesh v1）。
+ * RemoteTaskPoller — 轮询远程 A2A 任务状态（Get Task fallback）。
  */
 import { Logger } from '@zhin.js/logger';
 import { getOrchestrationService } from './orchestration-service.js';

package/lib/orchestrator/resolve-subagent-tools.d.ts

@@ -1,9 +1,10 @@
 /**
- * 子 Agent 工具集：TF-IDF 载入 + 角色限制 + 编排黑名单。
+ * 子 Agent 工具集：角色限制 + 编排黑名单 + AgentMeta disallowedTools。
  */
 import type { AgentTool } from '@zhin.js/ai';
-import type { ZhinAgentConfig } from '../zhin-agent/config.js';
+import type { ZhinAgentConfig } from '../config/index.js';
 import type { AgentDispatcher, AgentRole } from './agent-dispatcher.js';
+import type { AgentMeta } from '../discovery/agents.js';
 /** 仅主编排使用的工具，子 Agent 不可直接调用 */
 export declare const SUBAGENT_BLOCKED_TOOL_NAMES: Set<string>;
 export interface ResolveSubagentToolsParams {
@@ -12,9 +13,12 @@ export interface ResolveSubagentToolsParams {
     role: AgentRole;
     config: Required<ZhinAgentConfig>;
     agentDispatcher: AgentDispatcher | null;
+    agentMeta?: AgentMeta;
+    requestedTools?: string[];
+    parentSessionLoaded?: string[];
 }
 /**
- * 解析子 Agent 本轮可用工具（始终 toolSearch：worker 基础 + TF-IDF 匹配 deferred 目录）。
+ * 解析子 Agent 本轮可用工具（角色 ACL + disallowedTools 黑名单过滤）。
  */
 export declare function resolveSubagentAgentTools(params: ResolveSubagentToolsParams): AgentTool[];
 //# sourceMappingURL=resolve-subagent-tools.d.ts.map

package/lib/orchestrator/resolve-subagent-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-subagent-tools.d.ts","sourceRoot":"","sources":["../../src/orchestrator/resolve-subagent-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAExE,+BAA+B;AAC/B,eAAO,MAAM,2BAA2B,aAKtC,CAAC;AAQH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC;AAiBD;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,0BAA0B,GAAG,SAAS,EAAE,CAwBzF"}
+{"version":3,"file":"resolve-subagent-tools.d.ts","sourceRoot":"","sources":["../../src/orchestrator/resolve-subagent-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,+BAA+B;AAC/B,eAAO,MAAM,2BAA2B,aAItC,CAAC;AAOH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IAClC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AA+CD;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,0BAA0B,GAAG,SAAS,EAAE,CAMzF"}

package/lib/orchestrator/resolve-subagent-tools.js

@@ -1,16 +1,12 @@
-import { selectDeferredToolsForWorker } from '../deferred-worker-tool-load.js';
-import { filterToolsForToolSearchCatalog } from '../zhin-agent/tool-catalog.js';
-import { TOOL_SEARCH_EXCLUDED_TOOLS } from '../zhin-agent/config.js';
 /** 仅主编排使用的工具，子 Agent 不可直接调用 */
 export const SUBAGENT_BLOCKED_TOOL_NAMES = new Set([
-    ...TOOL_SEARCH_EXCLUDED_TOOLS,
-    'tool_search',
-    'run_deferred_task',
+    'discover',
+    'install_skill',
     'spawn_task',
 ]);
 const BLOCKED = SUBAGENT_BLOCKED_TOOL_NAMES;
-/** 文生图任务：即使 TF-IDF 未命中也优先载入 generate_image（须在 allTools 中已注册） */
-const IMAGE_GENERATION_TASK_RE = /generate_image|文生图|生图|画图|画一|画张|绘制|text-to-image|\bdraw\b/i;
+/** 子 Agent 可用来按需加载 schema 的元工具 */
+const SUBAGENT_DEFER_META_TOOLS = ['load_tool', 'load_skill'];
 function stripBlocked(tools) {
     return tools.filter(t => !BLOCKED.has(t.name));
 }
@@ -20,33 +16,42 @@ function applyRoleFilter(pool, role, agentDispatcher) {
     }
     return pool;
 }
+function applyDisallowedTools(pool, meta) {
+    if (!meta?.disallowedTools?.length)
+        return pool;
+    const blocked = new Set(meta.disallowedTools);
+    return pool.filter(t => !blocked.has(t.name));
+}
+function applySpawnDeclaredTools(allTools, pool, requestedTools, parentSessionLoaded) {
+    if (!requestedTools?.length)
+        return pool;
+    const stripped = stripBlocked(allTools);
+    const byNameAll = new Map(stripped.map(t => [t.name, t]));
+    const byNamePool = new Map(pool.map(t => [t.name, t]));
+    const parentLoaded = new Set(parentSessionLoaded ?? []);
+    const picked = [];
+    for (const metaName of SUBAGENT_DEFER_META_TOOLS) {
+        const tool = byNameAll.get(metaName);
+        if (tool)
+            picked.push(tool);
+    }
+    for (const name of requestedTools) {
+        if (!parentLoaded.has(name))
+            continue;
+        const tool = byNamePool.get(name);
+        if (tool)
+            picked.push(tool);
+    }
+    return picked;
+}
 /**
- * 解析子 Agent 本轮可用工具（始终 toolSearch：worker 基础 + TF-IDF 匹配 deferred 目录）。
+ * 解析子 Agent 本轮可用工具（角色 ACL + disallowedTools 黑名单过滤）。
  */
 export function resolveSubagentAgentTools(params) {
     let pool = stripBlocked(params.allTools);
     pool = applyRoleFilter(pool, params.role, params.agentDispatcher);
-    const catalog = filterToolsForToolSearchCatalog(pool);
-    const max = params.config.deferredToolMaxResults;
-    const query = params.task.trim() || 'task';
-    const loaded = selectDeferredToolsForWorker(query, query, catalog, max);
-    const byName = new Map(pool.map(t => [t.name, t]));
-    const out = [];
-    const seen = new Set();
-    const add = (tool) => {
-        if (!tool || seen.has(tool.name) || BLOCKED.has(tool.name))
-            return;
-        out.push(tool);
-        seen.add(tool.name);
-    };
-    for (const name of params.config.workerBaseTools) {
-        add(byName.get(name));
-    }
-    for (const tool of loaded)
-        add(tool);
-    if (IMAGE_GENERATION_TASK_RE.test(query)) {
-        add(byName.get('generate_image'));
-    }
-    return out;
+    pool = applyDisallowedTools(pool, params.agentMeta);
+    pool = applySpawnDeclaredTools(params.allTools, pool, params.requestedTools, params.parentSessionLoaded);
+    return pool;
 }
 //# sourceMappingURL=resolve-subagent-tools.js.map

package/lib/orchestrator/resolve-subagent-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-subagent-tools.js","sourceRoot":"","sources":["../../src/orchestrator/resolve-subagent-tools.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAGrE,+BAA+B;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,GAAG,CAAS;IACzD,GAAG,0BAA0B;IAC7B,aAAa;IACb,mBAAmB;IACnB,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,2BAA2B,CAAC;AAE5C,gEAAgE;AAChE,MAAM,wBAAwB,GAC5B,2DAA2D,CAAC;AAU9D,SAAS,YAAY,CAAC,KAAkB;IACtC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,eAAe,CACtB,IAAiB,EACjB,IAAe,EACf,eAAuC;IAEvC,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,eAAe,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAkC;IAC1E,IAAI,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;IACjD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC;IAC3C,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAG,CAAC,IAA2B,EAAE,EAAE;QAC1C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO;QACnE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QACjD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACxB,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,MAAM;QAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"resolve-subagent-tools.js","sourceRoot":"","sources":["../../src/orchestrator/resolve-subagent-tools.ts"],"names":[],"mappings":"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"}

package/lib/orchestrator/skill-registry.d.ts

@@ -5,11 +5,21 @@
  */
 import { ResourceRegistry } from './resource-registry.js';
 import type { ResourceScope, Skill, Tool } from './types.js';
+export interface SkillSearchScoredResult {
+    skill: Skill;
+    score: number;
+}
 export declare class SkillRegistry extends ResourceRegistry<Skill> {
     private readonly byName;
     add(skill: Skill, scope?: ResourceScope, source?: string): () => void;
     remove(name: string, scope?: ResourceScope): boolean;
     getByName(name: string): Skill | undefined;
+    searchScored(query: string, options?: {
+        maxResults?: number;
+        platform?: string;
+        agentId?: string;
+        minScore?: number;
+    }): SkillSearchScoredResult[];
     search(query: string, options?: {
         maxResults?: number;
         platform?: string;
@@ -18,6 +28,5 @@ export declare class SkillRegistry extends ResourceRegistry<Skill> {
     collectAllTools(agentId?: string): Tool[];
     getAlwaysSkills(agentId?: string): Skill[];
     dispose(): void;
-    private scoreSkill;
 }
 //# sourceMappingURL=skill-registry.d.ts.map

package/lib/orchestrator/skill-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-registry.d.ts","sourceRoot":"","sources":["../../src/orchestrator/skill-registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE7D,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,KAAK,CAAC;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IAE1C,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;IAKrE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa,GAAG,OAAO;IAK7D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS;IAI1C,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,KAAK,EAAE;IAkBtG,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE;IAOzC,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE;IAKjC,OAAO,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;CA2BnB"}
+{"version":3,"file":"skill-registry.d.ts","sourceRoot":"","sources":["../../src/orchestrator/skill-registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,KAAK,CAAC;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IAE1C,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;IAKrE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa,GAAG,OAAO;IAK7D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS;IAI1C,YAAY,CACV,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GACxF,uBAAuB,EAAE;IAmC5B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,KAAK,EAAE;IAItG,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE;IAOzC,eAAe,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,EAAE;IAKjC,OAAO,IAAI,IAAI;CAIzB"}

package/lib/orchestrator/skill-registry.js

@@ -3,6 +3,7 @@
  *
  * Absorbs: core/built/skill.ts (SkillFeature, search scoring)
  */
+import { buildDocumentFrequency, collectSkillWeightedTerms, collectTermSet, createIdfFn, scoreWeightedTfidfOverlap, } from '@zhin.js/ai';
 import { ResourceRegistry } from './resource-registry.js';
 export class SkillRegistry extends ResourceRegistry {
     byName = new Map();
@@ -17,21 +18,39 @@ export class SkillRegistry extends ResourceRegistry {
     getByName(name) {
         return this.byName.get(name);
     }
-    search(query, options) {
+    searchScored(query, options) {
         const maxResults = options?.maxResults ?? 5;
+        const minScore = options?.minScore ?? 0.1;
         const platform = options?.platform;
         const pool = options?.agentId ? this.getForAgent(options.agentId) : this.getAll();
-        const scored = pool
-            .filter(skill => {
+        const filtered = pool.filter(skill => {
             if (platform && skill.platforms?.length)
                 return skill.platforms.includes(platform);
             return true;
-        })
-            .map(skill => ({ skill, score: this.scoreSkill(skill, query) }))
-            .filter(({ score }) => score > 0)
+        });
+        if (filtered.length === 0)
+            return [];
+        const weightedBySkill = new Map();
+        const corpusSets = [];
+        for (const skill of filtered) {
+            const weighted = collectSkillWeightedTerms(skill);
+            weightedBySkill.set(skill, weighted);
+            corpusSets.push(collectTermSet(weighted));
+        }
+        const df = buildDocumentFrequency(corpusSets);
+        const idf = createIdfFn(filtered.length, df);
+        const scored = filtered
+            .map(skill => ({
+            skill,
+            score: scoreWeightedTfidfOverlap(query, weightedBySkill.get(skill), idf),
+        }))
+            .filter(({ score }) => score >= minScore)
             .sort((a, b) => b.score - a.score)
             .slice(0, maxResults);
-        return scored.map(({ skill }) => skill);
+        return scored;
+    }
+    search(query, options) {
+        return this.searchScored(query, options).map(({ skill }) => skill);
     }
     collectAllTools(agentId) {
         const pool = agentId ? this.getForAgent(agentId) : this.getAll();
@@ -48,35 +67,5 @@ export class SkillRegistry extends ResourceRegistry {
         this.byName.clear();
         super.dispose();
     }
-    scoreSkill(skill, query) {
-        const lq = query.toLowerCase();
-        let score = 0;
-        if (skill.keywords) {
-            for (const kw of skill.keywords) {
-                if (lq.includes(kw.toLowerCase()))
-                    score += 1.0;
-            }
-        }
-        if (skill.tags) {
-            for (const tag of skill.tags) {
-                if (lq.includes(tag.toLowerCase()))
-                    score += 0.5;
-            }
-        }
-        if (lq.includes(skill.name.toLowerCase()))
-            score += 0.3;
-        const ld = skill.description.toLowerCase();
-        if (ld.includes(lq))
-            score += 0.2;
-        if (lq.includes(ld))
-            score += 0.15;
-        for (const tool of skill.tools) {
-            if (lq.includes(tool.name.toLowerCase()))
-                score += 0.4;
-            if (tool.description && lq.includes(tool.description.toLowerCase().slice(0, 10)))
-                score += 0.1;
-        }
-        return score;
-    }
 }
 //# sourceMappingURL=skill-registry.js.map