@zhin.js/agent 1.1.23 → 1.1.26

package/lib/session/session-io.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-io.d.ts","sourceRoot":"","sources":["../../src/session/session-io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,KAAK,uBAAuB,EAAE,KAAK,YAAY,EAA8C,KAAK,iBAAiB,EAAgC,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChR,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,OAAO,EAAkH,MAAM,eAAe,CAAC;AAEpL,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,iBAAiB,GAAG,uBAAuB,CAAC;IAC/D,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AA+BD,0DAA0D;AAC1D,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,OAAO,GAAG,iBAAiB,GAAG,SAAS,CAWzF;AAED,4CAA4C;AAC5C,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,iBAAiB,CAAA;CAAE,CAIhD;AAED,8CAA8C;AAC9C,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACpC,MAAM,CAKR;AAED,kEAAkE;AAClE,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAAC,UAAU,EAAE,WAAW,CAAA;CAAE,CAezE;AAED,8CAA8C;AAC9C,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,MAAM,GACjB,MAAM,CAKR;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,GACjB,uBAAuB,CAEzB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC,CAIzB;AAED;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAIpD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAElB"}
+{"version":3,"file":"session-io.d.ts","sourceRoot":"","sources":["../../src/session/session-io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,iBAAiB,EAAE,KAAK,uBAAuB,EAAE,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAA8C,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AACzN,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,OAAO,EAAkH,MAAM,eAAe,CAAC;AACpL,MAAM,WAAW,aAAa;IAC5B,iBAAiB,EAAE,sBAAsB,CAAC;IAC1C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AA2BD,wCAAwC;AACxC,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,OAAO,GAAG,iBAAiB,CAS7E;AAED,6BAA6B;AAC7B,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,OAAO,EACpB,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,CAG/C;AAED,oDAAoD;AACpD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,WAAW,CAAA;CAAE,CAM9C;AAED,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,GACjB,uBAAuB,CAEzB;AAED,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,MAAM,EACjB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC,YAAY,EAAE,CAAC,CAIzB;AAED;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAIpD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,aAAa,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAElB"}

package/lib/session/session-io.js

@@ -1,16 +1,12 @@
 import { createUserMessage, renderUserMessageForLlm } from '@zhin.js/ai';
 import { formatSenderRolesForLabel, senderRolesFromMessage, stripUserSpoofedSenderPrefix } from '@zhin.js/core';
-import { CURRENT_MESSAGE_MARKER } from '../config/index.js';
-function sanitizeSenderAttr(value) {
-    const trimmed = value.trim().replace(/[\]\s]+/g, '_');
-    return trimmed.length > 0 ? trimmed.slice(0, 64) : 'unknown';
-}
 function resolveSenderDisplayName(message) {
     if (!message?.$sender)
         return 'unknown';
     const sender = message.$sender;
     const raw = sender.nickname || sender.name || sender.id;
-    return raw != null ? sanitizeSenderAttr(String(raw)) : 'unknown';
+    const displayName = raw == null ? '' : String(raw).trim();
+    return displayName || 'unknown';
 }
 function mapPlatformRoleForLabel(role) {
     if (!role || role === 'member')
@@ -31,56 +27,27 @@ function resolveSenderRoleLabels(commMessage) {
         labels.push(platform);
     return labels.length > 0 ? labels : ['user'];
 }
-/** 群/频道 user 消息的 sender 元数据（写入 `agent_messages.extra`） */
-export function buildUserMessageExtra(commMessage) {
+/** 将 IM 参与者投影为 AgentMessage 的唯一身份权威。 */
+export function buildUserMessageActor(commMessage) {
     const scope = commMessage.$channel?.type || 'private';
-    if (scope !== 'group' && scope !== 'channel')
-        return undefined;
     const roleLabels = resolveSenderRoleLabels(commMessage);
-    const sender = {
-        id: sanitizeSenderAttr(String(commMessage.$sender.id || 'unknown')),
-        name: resolveSenderDisplayName(commMessage),
+    return {
+        subjectId: String(commMessage.$sender.id || 'unknown'),
+        displayName: resolveSenderDisplayName(commMessage),
         roles: roleLabels.length > 0 ? roleLabels : ['user'],
-        scope,
+        scope: scope === 'group' || scope === 'channel' ? scope : 'private',
     };
-    return { sender };
 }
-/** 剥离伪造前缀后的用户正文 + 可选 extra（入库 payload 用） */
+/** 剥离伪造前缀后的用户正文并建立 actor。 */
 export function prepareUserContentForSession(commMessage, rawContent) {
     const content = stripUserSpoofedSenderPrefix(rawContent);
-    const extra = buildUserMessageExtra(commMessage);
-    return { content, extra };
-}
-/** 引用块 + 当前正文分层（仅 LLM 侧；入库 payload 仍为干净正文） */
-export function layerInboundUserTurnBody(body, opts) {
-    const parts = [];
-    if (opts?.quoteBlock?.trim())
-        parts.push(opts.quoteBlock.trim());
-    if (parts.length === 0)
-        return body;
-    return `${parts.join('\n\n')}\n\n${CURRENT_MESSAGE_MARKER}\n${body}`;
+    return { content, actor: buildUserMessageActor(commMessage) };
 }
-/** 本轮 user 消息：干净正文 + extra + LLM 渲染（引用/sender 仅 extra + 加载时拼接） */
+/** 本轮 user 消息：canonical 正文与 actor；标签只在 LLM 边界渲染。 */
 export function resolveTurnUserMessage(commMessage, rawContent) {
-    const { content, extra: senderExtra } = prepareUserContentForSession(commMessage, rawContent);
-    const extra = {
-        ...senderExtra,
-    };
-    const hasExtra = !!(extra.sender || extra.quote);
-    const layered = layerInboundUserTurnBody(content);
-    const inlinedContext = layered !== content;
-    const llmMessage = renderUserMessageForLlm(createUserMessage(layered), inlinedContext
-        ? (senderExtra?.sender ? { sender: senderExtra.sender } : undefined)
-        : (hasExtra ? extra : undefined));
-    return { content, extra: hasExtra ? extra : undefined, llmMessage };
-}
-/** @deprecated 使用 `resolveTurnUserMessage` */
-export function formatUserContentForSession(commMessage, rawContent) {
-    const { llmMessage } = resolveTurnUserMessage(commMessage, rawContent);
-    if (llmMessage.role !== 'user')
-        return rawContent;
-    const block = llmMessage.content.find((b) => b.type === 'text');
-    return block?.type === 'text' ? block.text : rawContent;
+    const { content, actor } = prepareUserContentForSession(commMessage, rawContent);
+    const llmMessage = renderUserMessageForLlm(createUserMessage(content, undefined, Date.now(), actor));
+    return { content, llmMessage };
 }
 export function buildAgentSessionCreateInput(sessionKey) {
     return { session_key: sessionKey };

package/lib/session/session-io.js.map

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

package/lib/session/turn-ingress-session.d.ts

@@ -1,4 +1,4 @@
-import { type AgentMessageExtra, type AgentSessionStore, type CreateAgentSessionInput, type MemoryAgentSessionStore, type UserMessage } from '@zhin.js/ai';
+import { type AgentMessageExtra, type AgentSessionRepository, type CreateAgentSessionInput, type UserMessage } from '@zhin.js/ai';
 import type { TurnIngress } from '../turn/turn-ingress.js';
 export interface ResolvedIngressUserMessage {
     readonly content: string;
@@ -8,12 +8,9 @@ export interface ResolvedIngressUserMessage {
 export declare function resolveIngressUserMessage(turn: TurnIngress): ResolvedIngressUserMessage;
 export declare function buildTurnSessionCreateInput(turn: TurnIngress): CreateAgentSessionInput;
 export declare function beginIngressTurnSession(deps: {
-    agentSessionStore: AgentSessionStore | MemoryAgentSessionStore;
+    agentSessionStore: AgentSessionRepository;
 }, turn: TurnIngress): Promise<{
     sessionKey: string;
     sessionId: string;
 }>;
-export declare function layerIngressUserBody(body: string, options?: {
-    quoteBlock?: string | null;
-}): string;
 //# sourceMappingURL=turn-ingress-session.d.ts.map

package/lib/session/turn-ingress-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-ingress-session.d.ts","sourceRoot":"","sources":["../../src/session/turn-ingress-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EAEtB,KAAK,iBAAiB,EACtB,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAC5B,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;CAClC;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,GAChB,0BAA0B,CAgC5B;AAcD,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,GAChB,uBAAuB,CAEzB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE;IAAE,iBAAiB,EAAE,iBAAiB,GAAG,uBAAuB,CAAA;CAAE,EACxE,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAKpD;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACvC,MAAM,CAMR"}
+{"version":3,"file":"turn-ingress-session.d.ts","sourceRoot":"","sources":["../../src/session/turn-ingress-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;CAClC;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,GAChB,0BAA0B,CAwB5B;AAcD,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,GAChB,uBAAuB,CAEzB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE;IAAE,iBAAiB,EAAE,sBAAsB,CAAA;CAAE,EACnD,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAKpD"}

package/lib/session/turn-ingress-session.js

@@ -1,18 +1,12 @@
 import { createUserMessage, renderUserMessageForLlm, } from '@zhin.js/ai';
-import { CURRENT_MESSAGE_MARKER } from '../config/index.js';
+import { stripUserSpoofedSenderPrefix } from '@zhin.js/core';
 export function resolveIngressUserMessage(turn) {
-    const content = stripSpoofedSenderPrefix(turn.input.text);
-    const sender = buildSenderExtra(turn);
+    const content = stripUserSpoofedSenderPrefix(turn.input.text);
     const referenceBlock = renderTurnReferences(turn);
-    const extra = {
-        ...(sender ? { sender } : {}),
-    };
-    const hasExtra = Boolean(extra.sender);
-    const layered = layerIngressUserBody(content, {
-        quoteBlock: referenceBlock,
-    });
-    const inlinedContext = layered !== content;
-    const llmMessage = renderUserMessageForLlm(createUserMessage(layered, undefined, Date.now(), {
+    const extra = referenceBlock
+        ? { quote: { block: referenceBlock } }
+        : undefined;
+    const llmMessage = renderUserMessageForLlm(createUserMessage(content, undefined, Date.now(), {
         subjectId: turn.principal.subjectId,
         ...(turn.principal.displayName ? { displayName: turn.principal.displayName } : {}),
         roles: [...turn.principal.roles],
@@ -21,12 +15,10 @@ export function resolveIngressUserMessage(turn) {
         turnId: turn.identity.turnId,
         intent: turn.intent.kind,
         ...(turn.intent.targetTurnId ? { targetTurnId: turn.intent.targetTurnId } : {}),
-    }), inlinedContext
-        ? (sender ? { sender } : undefined)
-        : (hasExtra ? extra : undefined));
+    }), extra);
     return Object.freeze({
         content,
-        ...(hasExtra ? { extra: Object.freeze(extra) } : {}),
+        ...(extra ? { extra: Object.freeze(extra) } : {}),
         llmMessage,
     });
 }
@@ -49,39 +41,4 @@ export async function beginIngressTurnSession(deps, turn) {
     const record = await deps.agentSessionStore.getOrCreateActive(buildTurnSessionCreateInput(turn));
     return { sessionKey: turn.session.key, sessionId: record.session_id };
 }
-export function layerIngressUserBody(body, options) {
-    const parts = [options?.quoteBlock]
-        .map((part) => part?.trim())
-        .filter((part) => Boolean(part));
-    if (parts.length === 0)
-        return body;
-    return `${parts.join('\n\n')}\n\n${CURRENT_MESSAGE_MARKER}\n${body}`;
-}
-function buildSenderExtra(turn) {
-    if (turn.origin.kind !== 'im')
-        return undefined;
-    if (turn.origin.scope !== 'group' && turn.origin.scope !== 'channel')
-        return undefined;
-    return Object.freeze({
-        id: sanitizeSenderAttribute(turn.principal.subjectId),
-        name: sanitizeSenderAttribute(turn.principal.displayName ?? turn.principal.subjectId),
-        roles: turn.principal.roles.length > 0 ? [...turn.principal.roles] : ['user'],
-        scope: turn.origin.scope,
-    });
-}
-function sanitizeSenderAttribute(value) {
-    const trimmed = value.trim().replace(/[\]\s]+/g, '_');
-    return trimmed.length > 0 ? trimmed.slice(0, 64) : 'unknown';
-}
-function stripSpoofedSenderPrefix(rawContent) {
-    let text = rawContent.trimStart();
-    const prefix = /^\[sender:(?:id=[^\]]*|[^\]]*)\]\s*/i;
-    const roles = /^\[sender:id=[^\s\]]+(?:\s+name=[^\]]+)?\s+roles=[^\]]+\]\s*/i;
-    while (true) {
-        const match = text.match(prefix) ?? text.match(roles);
-        if (!match)
-            return text;
-        text = text.slice(match[0].length);
-    }
-}
 //# sourceMappingURL=turn-ingress-session.js.map

package/lib/session/turn-ingress-session.js.map

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

package/lib/skill/skill-instruction-reader-factory.d.ts

@@ -0,0 +1,5 @@
+import type { ZhinAgentPrivate } from '../internal/agent-host.js';
+import { type SkillInstructionSource } from './skill-instruction-reader.js';
+/** Bind Skill discovery rules and model-specific limits for one Agent runtime. */
+export declare function buildSkillInstructionReaderForAgent(host: ZhinAgentPrivate): SkillInstructionSource;
+//# sourceMappingURL=skill-instruction-reader-factory.d.ts.map

package/lib/skill/skill-instruction-reader-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-instruction-reader-factory.d.ts","sourceRoot":"","sources":["../../src/skill/skill-instruction-reader-factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAA0B,KAAK,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEpG,kFAAkF;AAClF,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,gBAAgB,GAAG,sBAAsB,CAOlG"}

package/lib/skill/skill-instruction-reader-factory.js

@@ -0,0 +1,13 @@
+import { mergeSkillDirsWithResolver } from '../discovery/utils.js';
+import { resolveSkillInstructionMaxChars } from '../config/index.js';
+import { SkillInstructionReader } from './skill-instruction-reader.js';
+/** Bind Skill discovery rules and model-specific limits for one Agent runtime. */
+export function buildSkillInstructionReaderForAgent(host) {
+    const modelId = host.getTurnProvider().models[0] || host.config.chatModel || 'gpt-4o-mini';
+    return new SkillInstructionReader({
+        maxChars: resolveSkillInstructionMaxChars(host.config, modelId),
+        directories: () => mergeSkillDirsWithResolver(),
+        registeredFile: (name) => host.skillRegistry?.getByName(name)?.filePath,
+    });
+}
+//# sourceMappingURL=skill-instruction-reader-factory.js.map

package/lib/skill/skill-instruction-reader-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-instruction-reader-factory.js","sourceRoot":"","sources":["../../src/skill/skill-instruction-reader-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAA+B,MAAM,+BAA+B,CAAC;AAEpG,kFAAkF;AAClF,MAAM,UAAU,mCAAmC,CAAC,IAAsB;IACxE,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,aAAa,CAAC;IAC3F,OAAO,IAAI,sBAAsB,CAAC;QAChC,QAAQ,EAAE,+BAA+B,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QAC/D,WAAW,EAAE,GAAG,EAAE,CAAC,0BAA0B,EAAE;QAC/C,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ;KACxE,CAAC,CAAC;AACL,CAAC"}

package/lib/skill/skill-instruction-reader.d.ts

@@ -0,0 +1,22 @@
+export type SkillInstructionReadResult = Readonly<{
+    status: 'found';
+    instructions: string;
+} | {
+    status: 'missing';
+    name: string;
+}>;
+export interface SkillInstructionSource {
+    read(name: string): Promise<SkillInstructionReadResult>;
+}
+export interface SkillInstructionReaderOptions {
+    readonly registeredFile?: (name: string) => string | undefined;
+    readonly directories: () => readonly string[];
+    readonly maxChars: number;
+}
+/** Resolves and reads Skill instructions without exposing filesystem lookup rules to callers. */
+export declare class SkillInstructionReader implements SkillInstructionSource {
+    #private;
+    constructor(options: SkillInstructionReaderOptions);
+    read(name: string): Promise<SkillInstructionReadResult>;
+}
+//# sourceMappingURL=skill-instruction-reader.d.ts.map

package/lib/skill/skill-instruction-reader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-instruction-reader.d.ts","sourceRoot":"","sources":["../../src/skill/skill-instruction-reader.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,0BAA0B,GAAG,QAAQ,CAC7C;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CACtC,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC/D,QAAQ,CAAC,WAAW,EAAE,MAAM,SAAS,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,iGAAiG;AACjG,qBAAa,sBAAuB,YAAW,sBAAsB;;gBAGvD,OAAO,EAAE,6BAA6B;IAO5C,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;CA8B9D"}

package/lib/skill/skill-instruction-reader.js

@@ -0,0 +1,44 @@
+import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { checkSkillDependencies, extractSkillInstructions } from './skill-instructions.js';
+/** Resolves and reads Skill instructions without exposing filesystem lookup rules to callers. */
+export class SkillInstructionReader {
+    #options;
+    constructor(options) {
+        if (!Number.isInteger(options.maxChars) || options.maxChars <= 0) {
+            throw new TypeError('Skill instruction maxChars must be a positive integer');
+        }
+        this.#options = options;
+    }
+    async read(name) {
+        const canonicalName = name.trim();
+        if (!canonicalName
+            || canonicalName !== name
+            || canonicalName === '.'
+            || canonicalName === '..'
+            || canonicalName.includes('/')
+            || canonicalName.includes('\\')) {
+            throw new TypeError('Skill name must be a non-empty canonical name');
+        }
+        const registered = this.#options.registeredFile?.(canonicalName);
+        if (registered && existsSync(registered))
+            return this.#readFile(canonicalName, registered);
+        for (const directory of this.#options.directories()) {
+            const candidate = join(directory, canonicalName, 'SKILL.md');
+            if (existsSync(candidate))
+                return this.#readFile(canonicalName, candidate);
+        }
+        return Object.freeze({ status: 'missing', name: canonicalName });
+    }
+    async #readFile(name, file) {
+        const content = await readFile(file, 'utf8');
+        const dependencyWarning = await checkSkillDependencies(content);
+        const instructions = extractSkillInstructions(name, content, this.#options.maxChars);
+        return Object.freeze({
+            status: 'found',
+            instructions: dependencyWarning ? `${dependencyWarning}\n\n${instructions}` : instructions,
+        });
+    }
+}
+//# sourceMappingURL=skill-instruction-reader.js.map

package/lib/skill/skill-instruction-reader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-instruction-reader.js","sourceRoot":"","sources":["../../src/skill/skill-instruction-reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAiB3F,iGAAiG;AACjG,MAAM,OAAO,sBAAsB;IACxB,QAAQ,CAAgC;IAEjD,YAAY,OAAsC;QAChD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,SAAS,CAAC,uDAAuD,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAY;QACrB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAClC,IACE,CAAC,aAAa;eACX,aAAa,KAAK,IAAI;eACtB,aAAa,KAAK,GAAG;eACrB,aAAa,KAAK,IAAI;eACtB,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;eAC3B,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC/B,CAAC;YACD,MAAM,IAAI,SAAS,CAAC,+CAA+C,CAAC,CAAC;QACvE,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,aAAa,CAAC,CAAC;QACjE,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC3F,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;YACpD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;YAC7D,IAAI,UAAU,CAAC,SAAS,CAAC;gBAAE,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAC7E,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,IAAY;QACxC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,iBAAiB,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,YAAY,GAAG,wBAAwB,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACrF,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,MAAM,EAAE,OAAO;YACf,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,iBAAiB,OAAO,YAAY,EAAE,CAAC,CAAC,CAAC,YAAY;SAC3F,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/skill/skill-instructions.d.ts

@@ -0,0 +1,5 @@
+/** Return a readable warning when a Skill declares unavailable executable dependencies. */
+export declare function checkSkillDependencies(content: string): Promise<string>;
+/** Extract bounded, action-oriented instructions from a SKILL.md document. */
+export declare function extractSkillInstructions(name: string, content: string, maxBodyLength?: number): string;
+//# sourceMappingURL=skill-instructions.d.ts.map

package/lib/skill/skill-instructions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-instructions.d.ts","sourceRoot":"","sources":["../../src/skill/skill-instructions.ts"],"names":[],"mappings":"AAKA,2FAA2F;AAC3F,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB7E;AAED,8EAA8E;AAC9E,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,aAAa,SAAO,GACnB,MAAM,CAsBR"}

package/lib/skill/skill-instructions.js

@@ -0,0 +1,78 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+const execFileAsync = promisify(execFile);
+/** Return a readable warning when a Skill declares unavailable executable dependencies. */
+export async function checkSkillDependencies(content) {
+    const frontmatter = content.match(/^---\s*\n([\s\S]*?)\n---/u);
+    if (!frontmatter)
+        return '';
+    const module = await import('js-yaml');
+    const yaml = module.default ?? module;
+    const metadata = yaml.load(frontmatter[1]);
+    const dependencies = metadata?.compatibility?.deps;
+    if (!Array.isArray(dependencies))
+        return '';
+    const missing = [];
+    for (const value of dependencies) {
+        if (typeof value !== 'string' || !value.trim())
+            continue;
+        try {
+            await execFileAsync('which', [value]);
+        }
+        catch {
+            missing.push(value);
+        }
+    }
+    return missing.length === 0
+        ? ''
+        : `⚠️ 当前环境缺少以下依赖，请先安装后再使用本技能：${missing.join(', ')}`;
+}
+/** Extract bounded, action-oriented instructions from a SKILL.md document. */
+export function extractSkillInstructions(name, content, maxBodyLength = 4000) {
+    const lines = [`Skill '${name}' loaded. 请立即根据以下指导执行工具调用：`, ''];
+    const frontmatter = content.match(/^---\s*\n([\s\S]*?)\n---/u);
+    if (frontmatter) {
+        const tools = frontmatter[1].match(/tools:\s*\n((?:\s+-\s+.+\n?)+)/u);
+        if (tools)
+            lines.push('## 可用工具', tools[0].trim(), '');
+    }
+    const body = frontmatter && frontmatter.index !== undefined
+        ? content.slice(frontmatter.index + frontmatter[0].length).replace(/^\s+/u, '')
+        : content;
+    const quickActions = body.match(/## (?:快速操作|Quick\s*Actions)[\s\S]*?(?=\n## [^\s]|$)/iu);
+    if (quickActions && maxBodyLength <= 2000) {
+        lines.push(quickActions[0].trim(), '', immediateAction());
+        return lines.join('\n');
+    }
+    const rules = content.match(/## 执行规则[\s\S]*?(?=\n## [^\s]|$)/u);
+    const workflow = content.match(/## (?:Workflow|Instructions|使用说明)[\s\S]*?(?=\n## [^\s]|$)/iu);
+    if (rules)
+        lines.push(rules[0].trim(), '');
+    else if (workflow)
+        lines.push(workflow[0].trim(), '');
+    else
+        appendIntro(lines, body, maxBodyLength);
+    lines.push(immediateAction());
+    return lines.join('\n');
+}
+function appendIntro(lines, body, maxBodyLength) {
+    if (!body.trim())
+        return;
+    const firstHeading = body.match(/\n## [^\s]/u);
+    const intro = firstHeading ? body.slice(0, firstHeading.index).trim() : body.trim();
+    const quickStart = body.match(/## (?:快速开始|Quick\s*Start|Getting\s*Started)[\s\S]*?(?=\n## [^\s]|$)/iu);
+    const authentication = body.match(/## (?:认证|Authentication|Auth)[\s\S]*?(?=\n## [^\s]|$)/iu);
+    lines.push('## 指导', intro, '');
+    if (!quickStart && !authentication && !(intro.length < 200 && body.length > intro.length))
+        return;
+    const detail = [quickStart?.[0].trim(), authentication?.[0].trim()]
+        .filter((value) => Boolean(value))
+        .join('\n\n') || body.slice(intro.length).trim();
+    lines.push(detail.length > maxBodyLength
+        ? `${detail.slice(0, maxBodyLength)}\n...(truncated)`
+        : detail, '');
+}
+function immediateAction() {
+    return '## 立即行动\n根据上面的指导，立即调用工具完成用户请求。禁止重复调用 load_skill，禁止用文本描述代替实际工具调用。';
+}
+//# sourceMappingURL=skill-instructions.js.map

package/lib/skill/skill-instructions.js.map

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

package/lib/skill/skill-system.js

@@ -1,10 +1,10 @@
-import { sharedToolSelection } from '../resource-hub/tool-selection.js';
+import { normalizeTool } from '../resource-hub/tool-selection.js';
 import { SkillRegistry } from '../resource-hub/skill-registry.js';
 function toBlueprintSkill(skill) {
     return {
         name: skill.name,
         description: skill.description,
-        tools: skill.tools.map((tool) => sharedToolSelection.normalize(tool)),
+        tools: skill.tools.map((tool) => normalizeTool(tool)),
         keywords: skill.keywords ?? [],
         tags: skill.tags ?? [],
         platforms: skill.platforms,
@@ -36,7 +36,7 @@ export class SkillSystem {
     }
     collectTools(context, agentId) {
         const tools = this.registry.collectAllTools(agentId);
-        return tools.map((tool) => sharedToolSelection.normalize(tool, context.message));
+        return tools.map((tool) => normalizeTool(tool, context.message));
     }
     getAlwaysSkills(agentId) {
         if (typeof this.registry.getAlwaysSkills !== 'function')

package/lib/skill/skill-system.js.map

@@ -1 +1 @@
-{"version":3,"file":"skill-system.js","sourceRoot":"","sources":["../../src/skill/skill-system.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AASlE,SAAS,gBAAgB,CAAC,KAAuB;IAC/C,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAc,CAAC;QAClF,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE;QAC9B,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,WAAW;IAKH;IAJF,QAAQ,CAAgB;IAEzC,YACE,QAAwB,EACP,UAA6B,EAAE;QAA/B,YAAO,GAAP,OAAO,CAAwB;QAEhD,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,IAAI,aAAa,EAAE,CAAC;IAClD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAuB,EAAE,KAAwD,EAAE,MAAe;QACzG,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,OAA4B;QAChD,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE;YAC/C,UAAU;YACV,QAAQ,EAAE,OAAO,EAAE,QAAQ;SAC5B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACvC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;YAC9B,KAAK;SACN,CAAC,CAAC,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAoB,EAAE,OAAgB;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,eAAe,CAAC,OAAgB;QAC9B,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,KAAK,UAAU;YAAE,OAAO,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAwB;IACxD,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,WAAW,EAAE,CAAC"}
+{"version":3,"file":"skill-system.js","sourceRoot":"","sources":["../../src/skill/skill-system.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AASlE,SAAS,gBAAgB,CAAC,KAAuB;IAC/C,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAc,CAAC;QAClE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE;QAC9B,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE;QACtB,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,WAAW;IAKH;IAJF,QAAQ,CAAgB;IAEzC,YACE,QAAwB,EACP,UAA6B,EAAE;QAA/B,YAAO,GAAP,OAAO,CAAwB;QAEhD,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,IAAI,aAAa,EAAE,CAAC;IAClD,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAuB,EAAE,KAAwD,EAAE,MAAe;QACzG,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,OAA4B;QAChD,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE;YAC/C,UAAU;YACV,QAAQ,EAAE,OAAO,EAAE,QAAQ;SAC5B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YACvC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;YAC9B,KAAK;SACN,CAAC,CAAC,CAAC;IACN,CAAC;IAED,YAAY,CAAC,OAAoB,EAAE,OAAgB;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,eAAe,CAAC,OAAgB;QAC9B,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,KAAK,UAAU;YAAE,OAAO,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAwB;IACxD,OAAO,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,WAAW,EAAE,CAAC"}

package/lib/{builtin → spawn}/spawn-task-tool.d.ts

@@ -1,11 +1,10 @@
 /**
  * spawn_task — 主会话将耗时任务派给后台子 agent（与 issue #396 对齐）
  */
-import { type Message, type Tool, type ToolParametersSchema, type ToolResult } from '@zhin.js/core';
+import { type Message, type ToolParametersSchema, type ToolResult } from '@zhin.js/core';
 import type { AgentTool } from '@zhin.js/ai';
 import type { SubagentSystem, SubagentOrigin } from '../subagent/index.js';
-import { BuiltinBaseTool } from './builtin-base-tool.js';
-import { type PermissionTaskRules } from '../spawn/permission-task.js';
+import { type PermissionTaskRules } from './permission-task.js';
 export interface SpawnTaskToolOptions {
     /** 经 permission.task 过滤后可展示的子 agent 名 */
     allowedAgents?: string[];
@@ -13,7 +12,7 @@ export interface SpawnTaskToolOptions {
 }
 export declare const SPAWN_TASK_PARAMETERS: ToolParametersSchema;
 export declare function originFromMessage(message: Message): SubagentOrigin;
-export declare class SpawnTaskBuiltinTool extends BuiltinBaseTool {
+export declare class SpawnTaskTool {
     private readonly sessionCommMessage;
     private readonly manager;
     readonly name = "spawn_task";
@@ -21,8 +20,8 @@ export declare class SpawnTaskBuiltinTool extends BuiltinBaseTool {
     readonly parameters: ToolParametersSchema<Record<string, any>>;
     private readonly permissionTaskRules?;
     constructor(sessionCommMessage: Message, manager: SubagentSystem, options?: SpawnTaskToolOptions);
-    toTool(): Tool;
-    run(args: Record<string, unknown>, _commMessage?: Message): Promise<ToolResult>;
+    definition(): AgentTool;
+    execute(args: Record<string, unknown>): Promise<ToolResult>;
 }
 export declare function createSpawnTaskTool(commMessage: Message, manager: SubagentSystem, options?: SpawnTaskToolOptions): AgentTool;
 //# sourceMappingURL=spawn-task-tool.d.ts.map

package/lib/spawn/spawn-task-tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn-task-tool.d.ts","sourceRoot":"","sources":["../../src/spawn/spawn-task-tool.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,MAAM,WAAW,oBAAoB;IACnC,yCAAyC;IACzC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C;AAgBD,eAAO,MAAM,qBAAqB,EAAE,oBAqCnC,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,CAElE;AAUD,qBAAa,aAAa;IAOtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,4CAAyB;IAC5C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAsB;gBAGxC,kBAAkB,EAAE,OAAO,EAC3B,OAAO,EAAE,cAAc,EACxC,OAAO,CAAC,EAAE,oBAAoB;IAMhC,UAAU,IAAI,SAAS;IAYjB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;CA8ClE;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,SAAS,CAMX"}

package/lib/{builtin → spawn}/spawn-task-tool.js

@@ -1,6 +1,5 @@
-import { BuiltinBaseTool } from './builtin-base-tool.js';
 import { getActiveDeferredTurnController } from '../tool-catalog/deferred-turn-controller.js';
-import { assertSpawnAgentAllowed, } from '../spawn/permission-task.js';
+import { assertSpawnAgentAllowed, } from './permission-task.js';
 function buildSpawnTaskDescription(allowedAgents) {
     const lines = [
         'Delegate complex or long-running work to a temporary chat sub-agent. This does not create or update a durable Workroom Task. It runs asynchronously and returns an ephemeral subtask ID; set wait=true to block until completion.',
@@ -11,7 +10,7 @@ function buildSpawnTaskDescription(allowedAgents) {
         lines.push(`Allowed sub-agent types: ${allowedAgents.join(', ')}.`);
     }
     else {
-        lines.push('Allowed sub-agent types are defined in ai.agents and agents/*.agent.md.');
+        lines.push('Allowed sub-agent types are defined in ai.agents and agents/<name>/agent.json.');
     }
     return lines.join(' ');
 }
@@ -28,7 +27,7 @@ export const SPAWN_TASK_PARAMETERS = {
         },
         agent: {
             type: 'string',
-            description: 'Sub-agent name (must exist in ai.agents and agents/<name>.agent.md; default subtask toolset).',
+            description: 'Sub-agent name (must exist in ai.agents and agents/<name>/agent.json; default subtask toolset).',
         },
         wait: {
             type: 'boolean',
@@ -37,7 +36,7 @@ export const SPAWN_TASK_PARAMETERS = {
         context: {
             type: 'string',
             enum: ['fork', 'fresh'],
-            description: 'Context mode: fork injects recent parent session messages; fresh starts empty. Default follows *.agent.md or role.',
+            description: 'Context mode: fork injects recent parent session messages; fresh starts empty. Default follows agent.json or role.',
         },
         tools: {
             type: 'array',
@@ -63,7 +62,7 @@ function parseStringArray(value) {
         .map(item => item.trim());
     return items.length > 0 ? items : undefined;
 }
-export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
+export class SpawnTaskTool {
     sessionCommMessage;
     manager;
     name = 'spawn_task';
@@ -71,20 +70,23 @@ export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
     parameters = SPAWN_TASK_PARAMETERS;
     permissionTaskRules;
     constructor(sessionCommMessage, manager, options) {
-        super();
         this.sessionCommMessage = sessionCommMessage;
         this.manager = manager;
         this.description = buildSpawnTaskDescription(options?.allowedAgents);
         this.permissionTaskRules = options?.permissionTaskRules;
-        this.tags.push('agent', 'async', 'task', '后台', '子任务');
-        this.keywords.push('后台', '异步', '子任务', 'spawn', 'background', '并行', '独立处理');
     }
-    toTool() {
-        const tool = super.toTool();
-        tool.source = 'builtin:context';
-        return tool;
+    definition() {
+        return {
+            name: this.name,
+            description: this.description,
+            parameters: this.parameters,
+            source: 'builtin:context',
+            tags: ['agent', 'async', 'task', '后台', '子任务'],
+            keywords: ['后台', '异步', '子任务', 'spawn', 'background', '并行', '独立处理'],
+            execute: (args) => this.execute(args),
+        };
     }
-    async run(args, _commMessage) {
+    async execute(args) {
         const task = args.task;
         const label = args.label;
         const agentName = args.agent;
@@ -127,6 +129,6 @@ export class SpawnTaskBuiltinTool extends BuiltinBaseTool {
     }
 }
 export function createSpawnTaskTool(commMessage, manager, options) {
-    return new SpawnTaskBuiltinTool(commMessage, manager, options).toTool();
+    return new SpawnTaskTool(commMessage, manager, options).definition();
 }
 //# sourceMappingURL=spawn-task-tool.js.map