@zhin.js/agent 0.1.31 → 0.1.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -2
- package/lib/builtin/memory-search-tool.d.ts +2 -0
- package/lib/builtin/memory-search-tool.d.ts.map +1 -0
- package/lib/builtin/memory-search-tool.js +61 -0
- package/lib/builtin/memory-search-tool.js.map +1 -0
- package/lib/builtin/memory-upsert-tool.d.ts +2 -0
- package/lib/builtin/memory-upsert-tool.d.ts.map +1 -0
- package/lib/builtin/memory-upsert-tool.js +75 -0
- package/lib/builtin/memory-upsert-tool.js.map +1 -0
- package/lib/builtin/orchestration-tools.d.ts +7 -0
- package/lib/builtin/orchestration-tools.d.ts.map +1 -0
- package/lib/builtin/orchestration-tools.js +283 -0
- package/lib/builtin/orchestration-tools.js.map +1 -0
- package/lib/builtin/run-deferred-task-tool.d.ts +1 -1
- package/lib/builtin/run-deferred-task-tool.d.ts.map +1 -1
- package/lib/builtin/run-deferred-task-tool.js +1 -1
- package/lib/builtin/run-deferred-task-tool.js.map +1 -1
- package/lib/builtin/run-spec-dry-run-tool.d.ts +6 -0
- package/lib/builtin/run-spec-dry-run-tool.d.ts.map +1 -0
- package/lib/builtin/run-spec-dry-run-tool.js +51 -0
- package/lib/builtin/run-spec-dry-run-tool.js.map +1 -0
- package/lib/builtin/run-validation-spec-tool.d.ts +8 -0
- package/lib/builtin/run-validation-spec-tool.d.ts.map +1 -0
- package/lib/builtin/run-validation-spec-tool.js +44 -0
- package/lib/builtin/run-validation-spec-tool.js.map +1 -0
- package/lib/builtin/spawn-task-tool.d.ts +1 -1
- package/lib/builtin/spawn-task-tool.d.ts.map +1 -1
- package/lib/builtin/spawn-task-tool.js +53 -1
- package/lib/builtin/spawn-task-tool.js.map +1 -1
- package/lib/builtin-tools.d.ts +2 -0
- package/lib/builtin-tools.d.ts.map +1 -1
- package/lib/builtin-tools.js +6 -0
- package/lib/builtin-tools.js.map +1 -1
- package/lib/create-agent-session.d.ts +16 -0
- package/lib/create-agent-session.d.ts.map +1 -0
- package/lib/create-agent-session.js +15 -0
- package/lib/create-agent-session.js.map +1 -0
- package/lib/discovery/agents.d.ts +5 -0
- package/lib/discovery/agents.d.ts.map +1 -1
- package/lib/discovery/agents.js +7 -0
- package/lib/discovery/agents.js.map +1 -1
- package/lib/discovery/skills.d.ts +1 -1
- package/lib/discovery/skills.d.ts.map +1 -1
- package/lib/discovery/skills.js +2 -9
- package/lib/discovery/skills.js.map +1 -1
- package/lib/discovery/utils.d.ts +7 -1
- package/lib/discovery/utils.d.ts.map +1 -1
- package/lib/discovery/utils.js +66 -5
- package/lib/discovery/utils.js.map +1 -1
- package/lib/index.d.ts +17 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +11 -1
- package/lib/index.js.map +1 -1
- package/lib/init/activate-ai-database-storage.d.ts.map +1 -1
- package/lib/init/activate-ai-database-storage.js +23 -1
- package/lib/init/activate-ai-database-storage.js.map +1 -1
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +69 -7
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/introspection-args.d.ts +34 -0
- package/lib/init/introspection-args.d.ts.map +1 -0
- package/lib/init/introspection-args.js +71 -0
- package/lib/init/introspection-args.js.map +1 -0
- package/lib/init/introspection-collectors.d.ts +21 -0
- package/lib/init/introspection-collectors.d.ts.map +1 -0
- package/lib/init/introspection-collectors.js +74 -0
- package/lib/init/introspection-collectors.js.map +1 -0
- package/lib/init/introspection-commands-format.d.ts +1 -1
- package/lib/init/introspection-commands-format.js +4 -4
- package/lib/init/introspection-commands-format.js.map +1 -1
- package/lib/init/introspection-output.d.ts +6 -0
- package/lib/init/introspection-output.d.ts.map +1 -0
- package/lib/init/introspection-output.js +52 -0
- package/lib/init/introspection-output.js.map +1 -0
- package/lib/init/introspection-pagination.d.ts +14 -0
- package/lib/init/introspection-pagination.d.ts.map +1 -0
- package/lib/init/introspection-pagination.js +33 -0
- package/lib/init/introspection-pagination.js.map +1 -0
- package/lib/init/introspection-rest.d.ts +24 -0
- package/lib/init/introspection-rest.d.ts.map +1 -0
- package/lib/init/introspection-rest.js +65 -0
- package/lib/init/introspection-rest.js.map +1 -0
- package/lib/init/register-agent-mesh-mcp.d.ts +2 -0
- package/lib/init/register-agent-mesh-mcp.d.ts.map +1 -0
- package/lib/init/register-agent-mesh-mcp.js +13 -0
- package/lib/init/register-agent-mesh-mcp.js.map +1 -0
- package/lib/init/register-ai-trigger.d.ts.map +1 -1
- package/lib/init/register-ai-trigger.js +29 -4
- package/lib/init/register-ai-trigger.js.map +1 -1
- package/lib/init/register-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +4 -0
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-db-models.d.ts.map +1 -1
- package/lib/init/register-db-models.js +5 -2
- package/lib/init/register-db-models.js.map +1 -1
- package/lib/init/register-db-upgrade.d.ts.map +1 -1
- package/lib/init/register-db-upgrade.js +20 -1
- package/lib/init/register-db-upgrade.js.map +1 -1
- package/lib/init/register-group-session-passive.d.ts +3 -0
- package/lib/init/register-group-session-passive.d.ts.map +1 -0
- package/lib/init/register-group-session-passive.js +55 -0
- package/lib/init/register-group-session-passive.js.map +1 -0
- package/lib/init/register-introspection-commands.d.ts.map +1 -1
- package/lib/init/register-introspection-commands.js +5 -6
- package/lib/init/register-introspection-commands.js.map +1 -1
- package/lib/init/register-management-tools.d.ts +1 -1
- package/lib/init/register-management-tools.d.ts.map +1 -1
- package/lib/init/register-management-tools.js +57 -36
- package/lib/init/register-management-tools.js.map +1 -1
- package/lib/init/upgrade-agent-db-schema.d.ts +41 -0
- package/lib/init/upgrade-agent-db-schema.d.ts.map +1 -0
- package/lib/init/upgrade-agent-db-schema.js +170 -0
- package/lib/init/upgrade-agent-db-schema.js.map +1 -0
- package/lib/init.d.ts.map +1 -1
- package/lib/init.js +4 -0
- package/lib/init.js.map +1 -1
- package/lib/mcp-server/agent-mesh-tools.d.ts +8 -0
- package/lib/mcp-server/agent-mesh-tools.d.ts.map +1 -0
- package/lib/mcp-server/agent-mesh-tools.js +138 -0
- package/lib/mcp-server/agent-mesh-tools.js.map +1 -0
- package/lib/media/deliver-subagent-result.d.ts +7 -0
- package/lib/media/deliver-subagent-result.d.ts.map +1 -1
- package/lib/media/deliver-subagent-result.js +3 -1
- package/lib/media/deliver-subagent-result.js.map +1 -1
- package/lib/media/media-normalize.d.ts +2 -0
- package/lib/media/media-normalize.d.ts.map +1 -1
- package/lib/media/media-normalize.js +89 -0
- package/lib/media/media-normalize.js.map +1 -1
- package/lib/memory-entry-registry.d.ts +7 -0
- package/lib/memory-entry-registry.d.ts.map +1 -0
- package/lib/memory-entry-registry.js +8 -0
- package/lib/memory-entry-registry.js.map +1 -0
- package/lib/orchestration-memory-hook.d.ts +3 -0
- package/lib/orchestration-memory-hook.d.ts.map +1 -0
- package/lib/orchestration-memory-hook.js +22 -0
- package/lib/orchestration-memory-hook.js.map +1 -0
- package/lib/orchestration-runtime-registry.d.ts +14 -0
- package/lib/orchestration-runtime-registry.d.ts.map +1 -0
- package/lib/orchestration-runtime-registry.js +15 -0
- package/lib/orchestration-runtime-registry.js.map +1 -0
- package/lib/orchestrator/agent-dispatcher.d.ts +36 -3
- package/lib/orchestrator/agent-dispatcher.d.ts.map +1 -1
- package/lib/orchestrator/agent-dispatcher.js +203 -13
- package/lib/orchestrator/agent-dispatcher.js.map +1 -1
- package/lib/orchestrator/delegation-processor.d.ts +33 -0
- package/lib/orchestrator/delegation-processor.d.ts.map +1 -0
- package/lib/orchestrator/delegation-processor.js +140 -0
- package/lib/orchestrator/delegation-processor.js.map +1 -0
- package/lib/orchestrator/mission-milestone-notify.d.ts +17 -0
- package/lib/orchestrator/mission-milestone-notify.d.ts.map +1 -0
- package/lib/orchestrator/mission-milestone-notify.js +49 -0
- package/lib/orchestrator/mission-milestone-notify.js.map +1 -0
- package/lib/orchestrator/mission-negotiation.d.ts +17 -0
- package/lib/orchestrator/mission-negotiation.d.ts.map +1 -0
- package/lib/orchestrator/mission-negotiation.js +89 -0
- package/lib/orchestrator/mission-negotiation.js.map +1 -0
- package/lib/orchestrator/mission-patch-acl.d.ts +9 -0
- package/lib/orchestrator/mission-patch-acl.d.ts.map +1 -0
- package/lib/orchestrator/mission-patch-acl.js +29 -0
- package/lib/orchestrator/mission-patch-acl.js.map +1 -0
- package/lib/orchestrator/mission-runner.d.ts +24 -0
- package/lib/orchestrator/mission-runner.d.ts.map +1 -0
- package/lib/orchestrator/mission-runner.js +179 -0
- package/lib/orchestrator/mission-runner.js.map +1 -0
- package/lib/orchestrator/mission-spec.d.ts +44 -0
- package/lib/orchestrator/mission-spec.d.ts.map +1 -0
- package/lib/orchestrator/mission-spec.js +121 -0
- package/lib/orchestrator/mission-spec.js.map +1 -0
- package/lib/orchestrator/mission-state.d.ts +48 -0
- package/lib/orchestrator/mission-state.d.ts.map +1 -0
- package/lib/orchestrator/mission-state.js +66 -0
- package/lib/orchestrator/mission-state.js.map +1 -0
- package/lib/orchestrator/orchestration-repository.d.ts +85 -0
- package/lib/orchestrator/orchestration-repository.d.ts.map +1 -0
- package/lib/orchestrator/orchestration-repository.js +325 -0
- package/lib/orchestrator/orchestration-repository.js.map +1 -0
- package/lib/orchestrator/orchestration-service.d.ts +58 -0
- package/lib/orchestrator/orchestration-service.d.ts.map +1 -0
- package/lib/orchestrator/orchestration-service.js +221 -0
- package/lib/orchestrator/orchestration-service.js.map +1 -0
- package/lib/orchestrator/remote-agent-registry.d.ts +32 -0
- package/lib/orchestrator/remote-agent-registry.d.ts.map +1 -0
- package/lib/orchestrator/remote-agent-registry.js +120 -0
- package/lib/orchestrator/remote-agent-registry.js.map +1 -0
- package/lib/orchestrator/remote-task-executor.d.ts +10 -0
- package/lib/orchestrator/remote-task-executor.d.ts.map +1 -0
- package/lib/orchestrator/remote-task-executor.js +142 -0
- package/lib/orchestrator/remote-task-executor.js.map +1 -0
- package/lib/orchestrator/remote-task-poller.d.ts +16 -0
- package/lib/orchestrator/remote-task-poller.d.ts.map +1 -0
- package/lib/orchestrator/remote-task-poller.js +75 -0
- package/lib/orchestrator/remote-task-poller.js.map +1 -0
- package/lib/plugin-loop-hooks.d.ts +32 -0
- package/lib/plugin-loop-hooks.d.ts.map +1 -0
- package/lib/plugin-loop-hooks.js +69 -0
- package/lib/plugin-loop-hooks.js.map +1 -0
- package/lib/service.d.ts +7 -0
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +13 -0
- package/lib/service.js.map +1 -1
- package/lib/session-tree-runtime-registry.d.ts +20 -0
- package/lib/session-tree-runtime-registry.d.ts.map +1 -0
- package/lib/session-tree-runtime-registry.js +25 -0
- package/lib/session-tree-runtime-registry.js.map +1 -0
- package/lib/subagent-artifact.d.ts +7 -0
- package/lib/subagent-artifact.d.ts.map +1 -0
- package/lib/subagent-artifact.js +26 -0
- package/lib/subagent-artifact.js.map +1 -0
- package/lib/subagent-parent-context.d.ts +9 -0
- package/lib/subagent-parent-context.d.ts.map +1 -0
- package/lib/subagent-parent-context.js +50 -0
- package/lib/subagent-parent-context.js.map +1 -0
- package/lib/subagent-preset.d.ts +10 -0
- package/lib/subagent-preset.d.ts.map +1 -0
- package/lib/subagent-preset.js +44 -0
- package/lib/subagent-preset.js.map +1 -0
- package/lib/subagent-prompt.d.ts +7 -0
- package/lib/subagent-prompt.d.ts.map +1 -0
- package/lib/subagent-prompt.js +14 -0
- package/lib/subagent-prompt.js.map +1 -0
- package/lib/subagent.d.ts +19 -0
- package/lib/subagent.d.ts.map +1 -1
- package/lib/subagent.js +134 -36
- package/lib/subagent.js.map +1 -1
- package/lib/typing-indicator/adapter-integration.d.ts +7 -3
- package/lib/typing-indicator/adapter-integration.d.ts.map +1 -1
- package/lib/typing-indicator/adapter-integration.js +30 -6
- package/lib/typing-indicator/adapter-integration.js.map +1 -1
- package/lib/typing-indicator/index.d.ts +26 -3
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +94 -6
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/typing-indicator/integration.d.ts.map +1 -1
- package/lib/typing-indicator/integration.js +7 -2
- package/lib/typing-indicator/integration.js.map +1 -1
- package/lib/zhin-agent/agent-loop-turn.d.ts +2 -1
- package/lib/zhin-agent/agent-loop-turn.d.ts.map +1 -1
- package/lib/zhin-agent/agent-loop-turn.js +45 -4
- package/lib/zhin-agent/agent-loop-turn.js.map +1 -1
- package/lib/zhin-agent/branch-summarization-runtime.d.ts +16 -0
- package/lib/zhin-agent/branch-summarization-runtime.d.ts.map +1 -0
- package/lib/zhin-agent/branch-summarization-runtime.js +58 -0
- package/lib/zhin-agent/branch-summarization-runtime.js.map +1 -0
- package/lib/zhin-agent/compaction-runtime.d.ts +25 -0
- package/lib/zhin-agent/compaction-runtime.d.ts.map +1 -0
- package/lib/zhin-agent/compaction-runtime.js +78 -0
- package/lib/zhin-agent/compaction-runtime.js.map +1 -0
- package/lib/zhin-agent/config.d.ts +17 -0
- package/lib/zhin-agent/config.d.ts.map +1 -1
- package/lib/zhin-agent/config.js +22 -0
- package/lib/zhin-agent/config.js.map +1 -1
- package/lib/zhin-agent/deferred-auto-continue.d.ts +11 -0
- package/lib/zhin-agent/deferred-auto-continue.d.ts.map +1 -0
- package/lib/zhin-agent/deferred-auto-continue.js +41 -0
- package/lib/zhin-agent/deferred-auto-continue.js.map +1 -0
- package/lib/zhin-agent/deferred-delivery.d.ts +4 -0
- package/lib/zhin-agent/deferred-delivery.d.ts.map +1 -1
- package/lib/zhin-agent/deferred-delivery.js +7 -1
- package/lib/zhin-agent/deferred-delivery.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +20 -3
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +103 -6
- package/lib/zhin-agent/index.js.map +1 -1
- package/lib/zhin-agent/persist-deferred-context.d.ts +5 -0
- package/lib/zhin-agent/persist-deferred-context.d.ts.map +1 -0
- package/lib/zhin-agent/persist-deferred-context.js +40 -0
- package/lib/zhin-agent/persist-deferred-context.js.map +1 -0
- package/lib/zhin-agent/prompt-builder.d.ts.map +1 -1
- package/lib/zhin-agent/prompt-builder.js +5 -0
- package/lib/zhin-agent/prompt-builder.js.map +1 -1
- package/lib/zhin-agent/prompt.d.ts.map +1 -1
- package/lib/zhin-agent/prompt.js +4 -0
- package/lib/zhin-agent/prompt.js.map +1 -1
- package/lib/zhin-agent/session-io.d.ts +16 -4
- package/lib/zhin-agent/session-io.d.ts.map +1 -1
- package/lib/zhin-agent/session-io.js +46 -13
- package/lib/zhin-agent/session-io.js.map +1 -1
- package/lib/zhin-agent/session-tree-commands.d.ts +5 -0
- package/lib/zhin-agent/session-tree-commands.d.ts.map +1 -0
- package/lib/zhin-agent/session-tree-commands.js +44 -0
- package/lib/zhin-agent/session-tree-commands.js.map +1 -0
- package/lib/zhin-agent/tool-orchestration.d.ts.map +1 -1
- package/lib/zhin-agent/tool-orchestration.js +13 -24
- package/lib/zhin-agent/tool-orchestration.js.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.d.ts.map +1 -1
- package/lib/zhin-agent/tool-search-orchestrator.js +13 -0
- package/lib/zhin-agent/tool-search-orchestrator.js.map +1 -1
- package/lib/zhin-agent/turn-pipeline.d.ts +2 -0
- package/lib/zhin-agent/turn-pipeline.d.ts.map +1 -1
- package/lib/zhin-agent/turn-pipeline.js +30 -21
- package/lib/zhin-agent/turn-pipeline.js.map +1 -1
- package/lib/zhin-agent/turn-user-message.d.ts +8 -0
- package/lib/zhin-agent/turn-user-message.d.ts.map +1 -0
- package/lib/zhin-agent/turn-user-message.js +10 -0
- package/lib/zhin-agent/turn-user-message.js.map +1 -0
- package/lib/zhin-agent/zhin-agent-private.d.ts +6 -0
- package/lib/zhin-agent/zhin-agent-private.d.ts.map +1 -1
- package/lib/zhin-agent/zhin-agent-private.js.map +1 -1
- package/package.json +4 -3
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ADR 0010 session-tree columns on existing SQLite DBs.
|
|
3
|
+
* CREATE TABLE IF NOT EXISTS does not add new columns to old tables.
|
|
4
|
+
*/
|
|
5
|
+
export type AgentDbQueryable = {
|
|
6
|
+
db?: {
|
|
7
|
+
query?<T = unknown>(sql: string, params?: unknown[]): Promise<T>;
|
|
8
|
+
dialect?: {
|
|
9
|
+
name?: string;
|
|
10
|
+
};
|
|
11
|
+
};
|
|
12
|
+
query?<T = unknown>(sql: string, params?: unknown[]): Promise<T>;
|
|
13
|
+
};
|
|
14
|
+
/** table → column → SQLite type for ALTER TABLE ADD COLUMN */
|
|
15
|
+
export declare const AGENT_SESSION_TREE_SCHEMA_PATCHES: Record<string, Record<string, string>>;
|
|
16
|
+
export declare function resolveAgentDbQuery(dbFeature: AgentDbQueryable): ((sql: string, params?: unknown[]) => Promise<unknown>) | undefined;
|
|
17
|
+
export declare function resolveAgentDbDialect(dbFeature: AgentDbQueryable): string;
|
|
18
|
+
export declare function listSqliteTableColumns(query: (sql: string) => Promise<unknown>, tableName: string): Promise<Set<string>>;
|
|
19
|
+
export declare function upgradeAgentSessionTreeSchema(dbFeature: AgentDbQueryable): Promise<string[]>;
|
|
20
|
+
/** Populate agent_messages.id from SQLite rowid after ADD COLUMN. */
|
|
21
|
+
export declare function backfillAgentMessageIdsFromRowid(dbFeature: AgentDbQueryable): Promise<number>;
|
|
22
|
+
export type AgentMessageBackfillRow = {
|
|
23
|
+
id: number;
|
|
24
|
+
session_id: string;
|
|
25
|
+
parent_id: number | null;
|
|
26
|
+
timestamp: number;
|
|
27
|
+
};
|
|
28
|
+
/** 将同 session 内 parent_id 为 null 的遗留行串成线性链(ADR 0010 迁移) */
|
|
29
|
+
export declare function planLinearParentBackfill(rows: AgentMessageBackfillRow[]): Array<{
|
|
30
|
+
id: number;
|
|
31
|
+
parent_id: number | null;
|
|
32
|
+
}>;
|
|
33
|
+
export declare function backfillAgentMessageParentChains(dbFeature: AgentDbQueryable): Promise<number>;
|
|
34
|
+
export declare function repairAgentSessionActiveLeaves(dbFeature: AgentDbQueryable): Promise<number>;
|
|
35
|
+
export declare function upgradeAgentSessionTreeData(dbFeature: AgentDbQueryable): Promise<{
|
|
36
|
+
columns: string[];
|
|
37
|
+
idsBackfilled: number;
|
|
38
|
+
parentLinks: number;
|
|
39
|
+
activeLeaves: number;
|
|
40
|
+
}>;
|
|
41
|
+
//# sourceMappingURL=upgrade-agent-db-schema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade-agent-db-schema.d.ts","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE;QACH,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAClE,CAAC;AAIF,8DAA8D;AAC9D,eAAO,MAAM,iCAAiC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYpF,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,gBAAgB,GAC1B,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAUrE;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM,CAEzE;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EACxC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAItB;AAED,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC,CA0BnB;AAED,qEAAqE;AACrE,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2DAA2D;AAC3D,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,uBAAuB,EAAE,GAC9B,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAqBjD;AAED,wBAAsB,gCAAgC,CACpD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,gBAAgB,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC,CAMD"}
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ADR 0010 session-tree columns on existing SQLite DBs.
|
|
3
|
+
* CREATE TABLE IF NOT EXISTS does not add new columns to old tables.
|
|
4
|
+
*/
|
|
5
|
+
/** table → column → SQLite type for ALTER TABLE ADD COLUMN */
|
|
6
|
+
export const AGENT_SESSION_TREE_SCHEMA_PATCHES = {
|
|
7
|
+
agent_messages: {
|
|
8
|
+
id: 'INTEGER',
|
|
9
|
+
parent_id: 'INTEGER',
|
|
10
|
+
extra: 'TEXT',
|
|
11
|
+
},
|
|
12
|
+
agent_sessions: {
|
|
13
|
+
active_leaf_message_id: 'INTEGER',
|
|
14
|
+
},
|
|
15
|
+
agent_summaries: {
|
|
16
|
+
branch_anchor_message_id: 'INTEGER',
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
export function resolveAgentDbQuery(dbFeature) {
|
|
20
|
+
const direct = dbFeature.query;
|
|
21
|
+
if (typeof direct === 'function') {
|
|
22
|
+
return (sql, params) => direct(sql, params);
|
|
23
|
+
}
|
|
24
|
+
const nested = dbFeature.db?.query;
|
|
25
|
+
if (typeof nested === 'function') {
|
|
26
|
+
return (sql, params) => nested(sql, params);
|
|
27
|
+
}
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
export function resolveAgentDbDialect(dbFeature) {
|
|
31
|
+
return dbFeature.db?.dialect?.name ?? '';
|
|
32
|
+
}
|
|
33
|
+
export async function listSqliteTableColumns(query, tableName) {
|
|
34
|
+
const rows = (await query(`PRAGMA table_info("${tableName}")`));
|
|
35
|
+
if (!Array.isArray(rows))
|
|
36
|
+
return new Set();
|
|
37
|
+
return new Set(rows.map((r) => String(r.name ?? '')).filter(Boolean));
|
|
38
|
+
}
|
|
39
|
+
export async function upgradeAgentSessionTreeSchema(dbFeature) {
|
|
40
|
+
const queryFn = resolveAgentDbQuery(dbFeature);
|
|
41
|
+
if (!queryFn)
|
|
42
|
+
return [];
|
|
43
|
+
const dialect = resolveAgentDbDialect(dbFeature);
|
|
44
|
+
if (dialect && dialect !== 'sqlite') {
|
|
45
|
+
return [];
|
|
46
|
+
}
|
|
47
|
+
const added = [];
|
|
48
|
+
for (const [table, columns] of Object.entries(AGENT_SESSION_TREE_SCHEMA_PATCHES)) {
|
|
49
|
+
let existing;
|
|
50
|
+
try {
|
|
51
|
+
existing = await listSqliteTableColumns((sql) => queryFn(sql), table);
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
if (existing.size === 0)
|
|
57
|
+
continue;
|
|
58
|
+
for (const [column, sqlType] of Object.entries(columns)) {
|
|
59
|
+
if (existing.has(column))
|
|
60
|
+
continue;
|
|
61
|
+
await queryFn(`ALTER TABLE "${table}" ADD COLUMN "${column}" ${sqlType}`);
|
|
62
|
+
added.push(`${table}.${column}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return added;
|
|
66
|
+
}
|
|
67
|
+
/** Populate agent_messages.id from SQLite rowid after ADD COLUMN. */
|
|
68
|
+
export async function backfillAgentMessageIdsFromRowid(dbFeature) {
|
|
69
|
+
const queryFn = resolveAgentDbQuery(dbFeature);
|
|
70
|
+
if (!queryFn)
|
|
71
|
+
return 0;
|
|
72
|
+
const dialect = resolveAgentDbDialect(dbFeature);
|
|
73
|
+
if (dialect && dialect !== 'sqlite')
|
|
74
|
+
return 0;
|
|
75
|
+
let columns;
|
|
76
|
+
try {
|
|
77
|
+
columns = await listSqliteTableColumns((sql) => queryFn(sql), 'agent_messages');
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return 0;
|
|
81
|
+
}
|
|
82
|
+
if (!columns.has('id'))
|
|
83
|
+
return 0;
|
|
84
|
+
const countRows = (await queryFn(`SELECT COUNT(*) AS c FROM agent_messages WHERE id IS NULL`));
|
|
85
|
+
const pending = Number(countRows?.[0]?.c ?? 0);
|
|
86
|
+
if (pending <= 0)
|
|
87
|
+
return 0;
|
|
88
|
+
await queryFn(`UPDATE agent_messages SET id = rowid WHERE id IS NULL`);
|
|
89
|
+
return pending;
|
|
90
|
+
}
|
|
91
|
+
/** 将同 session 内 parent_id 为 null 的遗留行串成线性链(ADR 0010 迁移) */
|
|
92
|
+
export function planLinearParentBackfill(rows) {
|
|
93
|
+
const bySession = new Map();
|
|
94
|
+
for (const row of rows) {
|
|
95
|
+
const list = bySession.get(row.session_id) ?? [];
|
|
96
|
+
list.push(row);
|
|
97
|
+
bySession.set(row.session_id, list);
|
|
98
|
+
}
|
|
99
|
+
const updates = [];
|
|
100
|
+
for (const list of bySession.values()) {
|
|
101
|
+
const sorted = [...list].sort((a, b) => a.timestamp - b.timestamp || a.id - b.id);
|
|
102
|
+
for (let i = 1; i < sorted.length; i += 1) {
|
|
103
|
+
const row = sorted[i];
|
|
104
|
+
if (row.parent_id != null)
|
|
105
|
+
continue;
|
|
106
|
+
const prev = sorted[i - 1];
|
|
107
|
+
updates.push({ id: row.id, parent_id: prev.id });
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
return updates;
|
|
111
|
+
}
|
|
112
|
+
export async function backfillAgentMessageParentChains(dbFeature) {
|
|
113
|
+
const queryFn = resolveAgentDbQuery(dbFeature);
|
|
114
|
+
if (!queryFn)
|
|
115
|
+
return 0;
|
|
116
|
+
const dialect = resolveAgentDbDialect(dbFeature);
|
|
117
|
+
if (dialect && dialect !== 'sqlite')
|
|
118
|
+
return 0;
|
|
119
|
+
let rows;
|
|
120
|
+
try {
|
|
121
|
+
rows = (await queryFn(`SELECT id, session_id, parent_id, timestamp FROM agent_messages ORDER BY session_id, timestamp, id`));
|
|
122
|
+
}
|
|
123
|
+
catch {
|
|
124
|
+
return 0;
|
|
125
|
+
}
|
|
126
|
+
if (!Array.isArray(rows) || rows.length === 0)
|
|
127
|
+
return 0;
|
|
128
|
+
const updates = planLinearParentBackfill(rows);
|
|
129
|
+
for (const { id, parent_id } of updates) {
|
|
130
|
+
await queryFn(`UPDATE agent_messages SET parent_id = ? WHERE id = ?`, [parent_id, id]);
|
|
131
|
+
}
|
|
132
|
+
return updates.length;
|
|
133
|
+
}
|
|
134
|
+
export async function repairAgentSessionActiveLeaves(dbFeature) {
|
|
135
|
+
const queryFn = resolveAgentDbQuery(dbFeature);
|
|
136
|
+
if (!queryFn)
|
|
137
|
+
return 0;
|
|
138
|
+
const dialect = resolveAgentDbDialect(dbFeature);
|
|
139
|
+
if (dialect && dialect !== 'sqlite')
|
|
140
|
+
return 0;
|
|
141
|
+
let sessions;
|
|
142
|
+
try {
|
|
143
|
+
sessions = (await queryFn(`SELECT session_id, active_leaf_message_id FROM agent_sessions WHERE status = 'active'`));
|
|
144
|
+
}
|
|
145
|
+
catch {
|
|
146
|
+
return 0;
|
|
147
|
+
}
|
|
148
|
+
if (!Array.isArray(sessions))
|
|
149
|
+
return 0;
|
|
150
|
+
let repaired = 0;
|
|
151
|
+
for (const session of sessions) {
|
|
152
|
+
if (session.active_leaf_message_id != null)
|
|
153
|
+
continue;
|
|
154
|
+
const maxRows = (await queryFn(`SELECT MAX(id) AS max_id FROM agent_messages WHERE session_id = ?`, [session.session_id]));
|
|
155
|
+
const maxId = maxRows?.[0]?.max_id;
|
|
156
|
+
if (maxId == null)
|
|
157
|
+
continue;
|
|
158
|
+
await queryFn(`UPDATE agent_sessions SET active_leaf_message_id = ? WHERE session_id = ?`, [maxId, session.session_id]);
|
|
159
|
+
repaired += 1;
|
|
160
|
+
}
|
|
161
|
+
return repaired;
|
|
162
|
+
}
|
|
163
|
+
export async function upgradeAgentSessionTreeData(dbFeature) {
|
|
164
|
+
const columns = await upgradeAgentSessionTreeSchema(dbFeature);
|
|
165
|
+
const idsBackfilled = await backfillAgentMessageIdsFromRowid(dbFeature);
|
|
166
|
+
const parentLinks = await backfillAgentMessageParentChains(dbFeature);
|
|
167
|
+
const activeLeaves = await repairAgentSessionActiveLeaves(dbFeature);
|
|
168
|
+
return { columns, idsBackfilled, parentLinks, activeLeaves };
|
|
169
|
+
}
|
|
170
|
+
//# sourceMappingURL=upgrade-agent-db-schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upgrade-agent-db-schema.js","sourceRoot":"","sources":["../../src/init/upgrade-agent-db-schema.ts"],"names":[],"mappings":"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"}
|
package/lib/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AAoBzB;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAoBtC"}
|
package/lib/init.js
CHANGED
|
@@ -22,6 +22,7 @@ import { registerDbModels } from './init/register-db-models.js';
|
|
|
22
22
|
import { registerAIService } from './init/register-ai-service.js';
|
|
23
23
|
import { createZhinAgentContext } from './init/create-zhin-agent.js';
|
|
24
24
|
import { registerAITrigger } from './init/register-ai-trigger.js';
|
|
25
|
+
import { registerGroupSessionPassive } from './init/register-group-session-passive.js';
|
|
25
26
|
import { registerDbUpgrade } from './init/register-db-upgrade.js';
|
|
26
27
|
import { registerManagementTools } from './init/register-management-tools.js';
|
|
27
28
|
import { registerOwnerApproveCommands } from './init/register-owner-approve-commands.js';
|
|
@@ -29,6 +30,7 @@ import { registerIntrospectionCommands } from './init/register-introspection-com
|
|
|
29
30
|
import { registerBuiltinTools } from './init/register-builtin-tools.js';
|
|
30
31
|
import { registerHomeTools } from './init/register-home-tools.js';
|
|
31
32
|
import { registerTypingIndicator } from './init/register-typing-indicator.js';
|
|
33
|
+
import { registerAgentMeshMcp } from './init/register-agent-mesh-mcp.js';
|
|
32
34
|
/**
|
|
33
35
|
* 初始化 AI 模块
|
|
34
36
|
*
|
|
@@ -41,6 +43,7 @@ import { registerTypingIndicator } from './init/register-typing-indicator.js';
|
|
|
41
43
|
export function initAgentModule() {
|
|
42
44
|
const refs = createRefs();
|
|
43
45
|
registerOrchestrator();
|
|
46
|
+
registerAgentMeshMcp();
|
|
44
47
|
registerMcpFromConfig();
|
|
45
48
|
registerMcpMemoryDefault();
|
|
46
49
|
registerToolService();
|
|
@@ -48,6 +51,7 @@ export function initAgentModule() {
|
|
|
48
51
|
registerAIService(refs);
|
|
49
52
|
createZhinAgentContext(refs);
|
|
50
53
|
registerAITrigger(refs);
|
|
54
|
+
registerGroupSessionPassive(refs);
|
|
51
55
|
registerDbUpgrade(refs);
|
|
52
56
|
registerManagementTools(refs);
|
|
53
57
|
registerOwnerApproveCommands();
|
package/lib/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2CAA2C,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe;IAC7B,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAE1B,oBAAoB,EAAE,CAAC;IACvB,oBAAoB,EAAE,CAAC;IACvB,qBAAqB,EAAE,CAAC;IACxB,wBAAwB,EAAE,CAAC;IAC3B,mBAAmB,EAAE,CAAC;IACtB,gBAAgB,EAAE,CAAC;IACnB,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7B,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,2BAA2B,CAAC,IAAI,CAAC,CAAC;IAClC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxB,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC9B,4BAA4B,EAAE,CAAC;IAC/B,6BAA6B,CAAC,IAAI,CAAC,CAAC;IACpC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3B,iBAAiB,EAAE,CAAC;IACpB,uBAAuB,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent Mesh MCP tools — agent.delegate_task / query_status / get_result / cancel_task
|
|
3
|
+
*/
|
|
4
|
+
import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
5
|
+
import { AGENT_MESH_TOOL_NAMES } from '@zhin.js/core';
|
|
6
|
+
export { AGENT_MESH_TOOL_NAMES };
|
|
7
|
+
export declare function registerAgentMeshTools(server: McpServer): void;
|
|
8
|
+
//# sourceMappingURL=agent-mesh-tools.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-mesh-tools.d.ts","sourceRoot":"","sources":["../../src/mcp-server/agent-mesh-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAMtD,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAQjC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CA8I9D"}
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { AGENT_MESH_TOOL_NAMES } from '@zhin.js/core';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { getAgentDispatcher } from '../orchestrator/agent-dispatcher.js';
|
|
4
|
+
import { getDelegationProcessor } from '../orchestrator/delegation-processor.js';
|
|
5
|
+
import { getOrchestrationRuntime } from '../orchestration-runtime-registry.js';
|
|
6
|
+
export { AGENT_MESH_TOOL_NAMES };
|
|
7
|
+
const artifactSchema = z.object({
|
|
8
|
+
name: z.string().optional(),
|
|
9
|
+
content: z.string().optional(),
|
|
10
|
+
mime: z.string().optional(),
|
|
11
|
+
});
|
|
12
|
+
export function registerAgentMeshTools(server) {
|
|
13
|
+
server.registerTool('agent.delegate_task', {
|
|
14
|
+
description: '委托任务给本实例主 Agent(远程 Mesh 入口)',
|
|
15
|
+
inputSchema: {
|
|
16
|
+
title: z.string().describe('任务标题'),
|
|
17
|
+
description: z.string().describe('任务描述'),
|
|
18
|
+
acceptance_criteria: z.string().optional().describe('验收标准'),
|
|
19
|
+
artifacts: z.array(artifactSchema).optional().describe('显式附件'),
|
|
20
|
+
},
|
|
21
|
+
}, async (args) => {
|
|
22
|
+
const processor = getDelegationProcessor();
|
|
23
|
+
if (!processor) {
|
|
24
|
+
return {
|
|
25
|
+
content: [{ type: 'text', text: JSON.stringify({ error: 'DelegationProcessor not ready' }) }],
|
|
26
|
+
isError: true,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
const result = await processor.createDelegation({
|
|
30
|
+
title: args.title,
|
|
31
|
+
description: args.description,
|
|
32
|
+
acceptance_criteria: args.acceptance_criteria,
|
|
33
|
+
artifacts: args.artifacts,
|
|
34
|
+
});
|
|
35
|
+
return {
|
|
36
|
+
content: [{
|
|
37
|
+
type: 'text',
|
|
38
|
+
text: JSON.stringify({
|
|
39
|
+
remote_task_id: result.remote_task_id,
|
|
40
|
+
run_id: result.run_id,
|
|
41
|
+
status: 'pending',
|
|
42
|
+
}),
|
|
43
|
+
}],
|
|
44
|
+
};
|
|
45
|
+
});
|
|
46
|
+
server.registerTool('agent.query_status', {
|
|
47
|
+
description: '查询委托任务状态',
|
|
48
|
+
inputSchema: {
|
|
49
|
+
task_id: z.string().describe('remote_task_id'),
|
|
50
|
+
},
|
|
51
|
+
}, async (args) => {
|
|
52
|
+
const runtime = getOrchestrationRuntime();
|
|
53
|
+
const dispatcher = getAgentDispatcher();
|
|
54
|
+
const task = await runtime?.service.repositoryHandle.getTask(args.task_id);
|
|
55
|
+
if (task)
|
|
56
|
+
dispatcher.syncTaskFromRecord(task);
|
|
57
|
+
const result = dispatcher.getResult(args.task_id);
|
|
58
|
+
const status = task?.status ?? (result ? (result.success ? 'completed' : 'failed') : 'unknown');
|
|
59
|
+
return {
|
|
60
|
+
content: [{
|
|
61
|
+
type: 'text',
|
|
62
|
+
text: JSON.stringify({
|
|
63
|
+
task_id: args.task_id,
|
|
64
|
+
status,
|
|
65
|
+
error: task?.error ?? result?.error,
|
|
66
|
+
}),
|
|
67
|
+
}],
|
|
68
|
+
};
|
|
69
|
+
});
|
|
70
|
+
server.registerTool('agent.get_result', {
|
|
71
|
+
description: '获取已完成委托任务的结果',
|
|
72
|
+
inputSchema: {
|
|
73
|
+
task_id: z.string().describe('remote_task_id'),
|
|
74
|
+
},
|
|
75
|
+
}, async (args) => {
|
|
76
|
+
const runtime = getOrchestrationRuntime();
|
|
77
|
+
const dispatcher = getAgentDispatcher();
|
|
78
|
+
const task = await runtime?.service.repositoryHandle.getTask(args.task_id);
|
|
79
|
+
if (task)
|
|
80
|
+
dispatcher.syncTaskFromRecord(task);
|
|
81
|
+
const result = dispatcher.getResult(args.task_id);
|
|
82
|
+
if (!result) {
|
|
83
|
+
return {
|
|
84
|
+
content: [{ type: 'text', text: JSON.stringify({ error: 'Task not completed' }) }],
|
|
85
|
+
isError: true,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
return {
|
|
89
|
+
content: [{
|
|
90
|
+
type: 'text',
|
|
91
|
+
text: JSON.stringify({
|
|
92
|
+
task_id: args.task_id,
|
|
93
|
+
success: result.success,
|
|
94
|
+
summary: result.summary,
|
|
95
|
+
error: result.error,
|
|
96
|
+
}),
|
|
97
|
+
}],
|
|
98
|
+
};
|
|
99
|
+
});
|
|
100
|
+
server.registerTool('agent.cancel_task', {
|
|
101
|
+
description: '取消 pending/running 委托任务',
|
|
102
|
+
inputSchema: {
|
|
103
|
+
task_id: z.string().describe('remote_task_id'),
|
|
104
|
+
},
|
|
105
|
+
}, async (args) => {
|
|
106
|
+
const runtime = getOrchestrationRuntime();
|
|
107
|
+
if (!runtime) {
|
|
108
|
+
return {
|
|
109
|
+
content: [{ type: 'text', text: JSON.stringify({ error: 'Orchestration not ready' }) }],
|
|
110
|
+
isError: true,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
const task = await runtime.service.repositoryHandle.getTask(args.task_id);
|
|
114
|
+
if (!task) {
|
|
115
|
+
return {
|
|
116
|
+
content: [{ type: 'text', text: JSON.stringify({ error: 'Task not found' }) }],
|
|
117
|
+
isError: true,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
if (task.status === 'completed' || task.status === 'skipped') {
|
|
121
|
+
return {
|
|
122
|
+
content: [{ type: 'text', text: JSON.stringify({ error: 'Task already finished' }) }],
|
|
123
|
+
isError: true,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
await runtime.service.repositoryHandle.updateTaskStatus(args.task_id, 'failed', {
|
|
127
|
+
error: 'cancelled via agent.cancel_task',
|
|
128
|
+
finished_at: Date.now(),
|
|
129
|
+
});
|
|
130
|
+
return {
|
|
131
|
+
content: [{
|
|
132
|
+
type: 'text',
|
|
133
|
+
text: JSON.stringify({ task_id: args.task_id, status: 'cancelled' }),
|
|
134
|
+
}],
|
|
135
|
+
};
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
//# sourceMappingURL=agent-mesh-tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-mesh-tools.js","sourceRoot":"","sources":["../../src/mcp-server/agent-mesh-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 子 agent 完成回告:文本 + 工具媒体(generate_image / voice_tts)走统一出站链。
|
|
3
|
+
* 日志 preview 中的 `{image}` 表示本条含 image MessageElement(见 core segment.raw),不是未发送的占位符。
|
|
4
|
+
*/
|
|
5
|
+
import { type OutputElement } from '@zhin.js/ai';
|
|
1
6
|
import type { SendOptions } from '@zhin.js/core';
|
|
2
7
|
import type { SubagentOrigin } from '../subagent.js';
|
|
3
8
|
import type { ToolCallRecord } from '../zhin-agent/tool-calls-user-format.js';
|
|
@@ -5,6 +10,8 @@ export interface SubagentOutboundDelivery {
|
|
|
5
10
|
/** 面向用户的说明文本(含任务摘要时由调用方组装) */
|
|
6
11
|
text: string;
|
|
7
12
|
toolCalls?: ToolCallRecord[];
|
|
13
|
+
/** 主 Agent deferred auto-continue turn 的完整出站元素(优先于 text+toolCalls) */
|
|
14
|
+
elements?: OutputElement[];
|
|
8
15
|
}
|
|
9
16
|
export interface DeliverSubagentResultParams {
|
|
10
17
|
origin: SubagentOrigin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver-subagent-result.d.ts","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deliver-subagent-result.d.ts","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAe,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAI9E,MAAM,WAAW,wBAAwB;IACvC,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7B,sEAAsE;IACtE,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,IAAI,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACjD;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC9F"}
|
|
@@ -13,7 +13,9 @@ export async function deliverSubagentResult(params) {
|
|
|
13
13
|
id: origin.sceneId,
|
|
14
14
|
type: origin.sceneType,
|
|
15
15
|
};
|
|
16
|
-
const elements =
|
|
16
|
+
const elements = delivery.elements?.length
|
|
17
|
+
? delivery.elements
|
|
18
|
+
: mergeToolOutboundElements(parseOutput(delivery.text), delivery.toolCalls ?? []);
|
|
17
19
|
const segments = await publishOutboundElements(elements, origin.platform);
|
|
18
20
|
if (!segments.length) {
|
|
19
21
|
await send({ ...base, content: delivery.text });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver-subagent-result.js","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"deliver-subagent-result.js","sourceRoot":"","sources":["../../src/media/deliver-subagent-result.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,WAAW,EAAsB,MAAM,aAAa,CAAC;AAI9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAgB/D,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,MAAmC;IAC7E,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,IAAI,GAAiC;QACzC,OAAO,EAAE,MAAM,CAAC,QAAQ;QACxB,GAAG,EAAE,MAAM,CAAC,KAAK;QACjB,EAAE,EAAE,MAAM,CAAC,OAAO;QAClB,IAAI,EAAE,MAAM,CAAC,SAAwB;KACtC,CAAC;IAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,MAAM;QACxC,CAAC,CAAC,QAAQ,CAAC,QAAQ;QACnB,CAAC,CAAC,yBAAyB,CACzB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC1B,QAAQ,CAAC,SAAS,IAAI,EAAE,CACzB,CAAC;IACJ,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1E,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,CAAC,CAAiB,EAAE,EAAE,CACpC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;IACvF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnD,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC;YACT,GAAG,IAAI;YACP,OAAO,EAAE,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,QAAQ;SACzD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { ContentPart } from '@zhin.js/ai';
|
|
2
2
|
import type { MediaBinaryPayload } from './media-types.js';
|
|
3
|
+
/** 读取本地媒体文件为 base64(相对路径相对 process.cwd()) */
|
|
4
|
+
export declare function readLocalFileAsBase64(filePath: string, maxBytes: number): Promise<MediaBinaryPayload | null>;
|
|
3
5
|
export declare function fetchUrlAsBase64(url: string, maxBytes: number): Promise<MediaBinaryPayload | null>;
|
|
4
6
|
/**
|
|
5
7
|
* ContentPart[] → MediaBinaryPayload[](优先已有 base64;URL 按需 fetch)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-normalize.d.ts","sourceRoot":"","sources":["../../src/media/media-normalize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"media-normalize.d.ts","sourceRoot":"","sources":["../../src/media/media-normalize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,kBAAkB,EAAa,MAAM,kBAAkB,CAAC;AAwEtE,6CAA6C;AAC7C,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAepC;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAexG;AAED;;GAEG;AACH,wBAAsB,+BAA+B,CACnD,KAAK,EAAE,WAAW,EAAE,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmE/B;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAEpE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,GAAG,IAAI,CAMnF"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import * as fs from 'node:fs/promises';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
1
4
|
function guessMimeFromFormat(fmt) {
|
|
2
5
|
if (fmt === 'wav')
|
|
3
6
|
return 'audio/wav';
|
|
@@ -23,6 +26,72 @@ function parseDataUri(dataUri) {
|
|
|
23
26
|
return null;
|
|
24
27
|
return { mime: m[1], base64: m[2] };
|
|
25
28
|
}
|
|
29
|
+
function stripSurroundingQuotes(value) {
|
|
30
|
+
const trimmed = value.trim();
|
|
31
|
+
if ((trimmed.startsWith('"') && trimmed.endsWith('"'))
|
|
32
|
+
|| (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
|
|
33
|
+
return trimmed.slice(1, -1);
|
|
34
|
+
}
|
|
35
|
+
return trimmed;
|
|
36
|
+
}
|
|
37
|
+
function resolveLocalMediaPath(url) {
|
|
38
|
+
const normalized = stripSurroundingQuotes(url);
|
|
39
|
+
if (!normalized || normalized.startsWith('data:'))
|
|
40
|
+
return null;
|
|
41
|
+
if (normalized.startsWith('http://') || normalized.startsWith('https://'))
|
|
42
|
+
return null;
|
|
43
|
+
if (normalized.startsWith('file://')) {
|
|
44
|
+
try {
|
|
45
|
+
return fileURLToPath(normalized);
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return path.isAbsolute(normalized)
|
|
52
|
+
? normalized
|
|
53
|
+
: path.resolve(process.cwd(), normalized);
|
|
54
|
+
}
|
|
55
|
+
function mimeFromExtension(filePath) {
|
|
56
|
+
const ext = path.extname(filePath).toLowerCase();
|
|
57
|
+
if (['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp'].includes(ext)) {
|
|
58
|
+
if (ext === '.png')
|
|
59
|
+
return { kind: 'image', mimeType: 'image/png' };
|
|
60
|
+
if (ext === '.gif')
|
|
61
|
+
return { kind: 'image', mimeType: 'image/gif' };
|
|
62
|
+
if (ext === '.webp')
|
|
63
|
+
return { kind: 'image', mimeType: 'image/webp' };
|
|
64
|
+
if (ext === '.bmp')
|
|
65
|
+
return { kind: 'image', mimeType: 'image/bmp' };
|
|
66
|
+
return { kind: 'image', mimeType: 'image/jpeg' };
|
|
67
|
+
}
|
|
68
|
+
if (['.mp3', '.wav', '.ogg', '.m4a'].includes(ext)) {
|
|
69
|
+
return { kind: 'audio', mimeType: ext === '.wav' ? 'audio/wav' : 'audio/mpeg' };
|
|
70
|
+
}
|
|
71
|
+
if (['.mp4', '.webm', '.mov'].includes(ext)) {
|
|
72
|
+
return { kind: 'video', mimeType: 'video/mp4' };
|
|
73
|
+
}
|
|
74
|
+
return { kind: 'file', mimeType: 'application/octet-stream' };
|
|
75
|
+
}
|
|
76
|
+
/** 读取本地媒体文件为 base64(相对路径相对 process.cwd()) */
|
|
77
|
+
export async function readLocalFileAsBase64(filePath, maxBytes) {
|
|
78
|
+
try {
|
|
79
|
+
const stat = await fs.stat(filePath);
|
|
80
|
+
if (!stat.isFile() || stat.size > maxBytes)
|
|
81
|
+
return null;
|
|
82
|
+
const buf = await fs.readFile(filePath);
|
|
83
|
+
const { kind, mimeType } = mimeFromExtension(filePath);
|
|
84
|
+
return {
|
|
85
|
+
kind,
|
|
86
|
+
base64: buf.toString('base64'),
|
|
87
|
+
mimeType,
|
|
88
|
+
fileName: path.basename(filePath),
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
return null;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
26
95
|
export async function fetchUrlAsBase64(url, maxBytes) {
|
|
27
96
|
try {
|
|
28
97
|
const res = await fetch(url, { signal: AbortSignal.timeout(30_000) });
|
|
@@ -75,6 +144,18 @@ export async function normalizeContentPartsToPayloads(parts, maxFileBytes) {
|
|
|
75
144
|
out.push({ kind: 'image', base64: parsed.base64, mimeType: parsed.mime });
|
|
76
145
|
continue;
|
|
77
146
|
}
|
|
147
|
+
const localPath = resolveLocalMediaPath(url);
|
|
148
|
+
if (localPath) {
|
|
149
|
+
const local = await readLocalFileAsBase64(localPath, maxFileBytes);
|
|
150
|
+
if (local) {
|
|
151
|
+
out.push({
|
|
152
|
+
...local,
|
|
153
|
+
kind: 'image',
|
|
154
|
+
mimeType: local.mimeType.startsWith('image/') ? local.mimeType : 'image/jpeg',
|
|
155
|
+
});
|
|
156
|
+
continue;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
78
159
|
const fetched = await fetchUrlAsBase64(url, maxFileBytes);
|
|
79
160
|
if (fetched)
|
|
80
161
|
out.push(fetched);
|
|
@@ -87,6 +168,14 @@ export async function normalizeContentPartsToPayloads(parts, maxFileBytes) {
|
|
|
87
168
|
out.push({ kind: 'video', base64: parsed.base64, mimeType: parsed.mime });
|
|
88
169
|
continue;
|
|
89
170
|
}
|
|
171
|
+
const localPath = resolveLocalMediaPath(url);
|
|
172
|
+
if (localPath) {
|
|
173
|
+
const local = await readLocalFileAsBase64(localPath, maxFileBytes);
|
|
174
|
+
if (local) {
|
|
175
|
+
out.push({ ...local, kind: 'video' });
|
|
176
|
+
continue;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
90
179
|
const fetched = await fetchUrlAsBase64(url, maxFileBytes);
|
|
91
180
|
if (fetched)
|
|
92
181
|
out.push({ ...fetched, kind: 'video' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-normalize.js","sourceRoot":"","sources":["../../src/media/media-normalize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"media-normalize.js","sourceRoot":"","sources":["../../src/media/media-normalize.ts"],"names":[],"mappings":"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"}
|