@zhin.js/agent 1.0.2 → 1.0.3
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/lib/activity-feedback/adapter-integration.d.ts +1 -0
- package/lib/activity-feedback/adapter-integration.d.ts.map +1 -1
- package/lib/activity-feedback/adapter-integration.js +11 -3
- package/lib/activity-feedback/adapter-integration.js.map +1 -1
- package/lib/activity-feedback/event-context.d.ts.map +1 -1
- package/lib/activity-feedback/event-context.js +4 -0
- package/lib/activity-feedback/event-context.js.map +1 -1
- package/lib/assistant/deliver-schedule-to-adapter.d.ts +21 -0
- package/lib/assistant/deliver-schedule-to-adapter.d.ts.map +1 -0
- package/lib/assistant/deliver-schedule-to-adapter.js +19 -0
- package/lib/assistant/deliver-schedule-to-adapter.js.map +1 -0
- package/lib/authoring/bridge.d.ts +40 -0
- package/lib/authoring/bridge.d.ts.map +1 -0
- package/lib/authoring/bridge.js +113 -0
- package/lib/authoring/bridge.js.map +1 -0
- package/lib/authoring/define-agent.d.ts +4 -0
- package/lib/authoring/define-agent.d.ts.map +1 -0
- package/lib/authoring/define-agent.js +8 -0
- package/lib/authoring/define-agent.js.map +1 -0
- package/lib/authoring/define-connection.d.ts +5 -0
- package/lib/authoring/define-connection.d.ts.map +1 -0
- package/lib/authoring/define-connection.js +8 -0
- package/lib/authoring/define-connection.js.map +1 -0
- package/lib/authoring/define-dynamic.d.ts +4 -0
- package/lib/authoring/define-dynamic.d.ts.map +1 -0
- package/lib/authoring/define-dynamic.js +8 -0
- package/lib/authoring/define-dynamic.js.map +1 -0
- package/lib/authoring/define-eval.d.ts +5 -0
- package/lib/authoring/define-eval.d.ts.map +1 -0
- package/lib/authoring/define-eval.js +8 -0
- package/lib/authoring/define-eval.js.map +1 -0
- package/lib/authoring/define-hook.d.ts +4 -0
- package/lib/authoring/define-hook.d.ts.map +1 -0
- package/lib/authoring/define-hook.js +8 -0
- package/lib/authoring/define-hook.js.map +1 -0
- package/lib/authoring/define-schedule.d.ts +4 -0
- package/lib/authoring/define-schedule.d.ts.map +1 -0
- package/lib/authoring/define-schedule.js +8 -0
- package/lib/authoring/define-schedule.js.map +1 -0
- package/lib/authoring/define-skill.d.ts +6 -0
- package/lib/authoring/define-skill.d.ts.map +1 -0
- package/lib/authoring/define-skill.js +9 -0
- package/lib/authoring/define-skill.js.map +1 -0
- package/lib/authoring/define-state.d.ts +4 -0
- package/lib/authoring/define-state.d.ts.map +1 -0
- package/lib/authoring/define-state.js +8 -0
- package/lib/authoring/define-state.js.map +1 -0
- package/lib/authoring/define-tool.d.ts +5 -0
- package/lib/authoring/define-tool.d.ts.map +1 -0
- package/lib/authoring/define-tool.js +8 -0
- package/lib/authoring/define-tool.js.map +1 -0
- package/lib/authoring/disable-tool.d.ts +13 -0
- package/lib/authoring/disable-tool.d.ts.map +1 -0
- package/lib/authoring/disable-tool.js +36 -0
- package/lib/authoring/disable-tool.js.map +1 -0
- package/lib/authoring/entries/connections.d.ts +3 -0
- package/lib/authoring/entries/connections.d.ts.map +1 -0
- package/lib/authoring/entries/connections.js +2 -0
- package/lib/authoring/entries/connections.js.map +1 -0
- package/lib/authoring/entries/evals.d.ts +3 -0
- package/lib/authoring/entries/evals.d.ts.map +1 -0
- package/lib/authoring/entries/evals.js +2 -0
- package/lib/authoring/entries/evals.js.map +1 -0
- package/lib/authoring/entries/hooks.d.ts +3 -0
- package/lib/authoring/entries/hooks.d.ts.map +1 -0
- package/lib/authoring/entries/hooks.js +2 -0
- package/lib/authoring/entries/hooks.js.map +1 -0
- package/lib/authoring/entries/schedules.d.ts +3 -0
- package/lib/authoring/entries/schedules.d.ts.map +1 -0
- package/lib/authoring/entries/schedules.js +2 -0
- package/lib/authoring/entries/schedules.js.map +1 -0
- package/lib/authoring/entries/skills.d.ts +3 -0
- package/lib/authoring/entries/skills.d.ts.map +1 -0
- package/lib/authoring/entries/skills.js +2 -0
- package/lib/authoring/entries/skills.js.map +1 -0
- package/lib/authoring/entries/tools.d.ts +5 -0
- package/lib/authoring/entries/tools.d.ts.map +1 -0
- package/lib/authoring/entries/tools.js +3 -0
- package/lib/authoring/entries/tools.js.map +1 -0
- package/lib/authoring/index.d.ts +25 -0
- package/lib/authoring/index.d.ts.map +1 -0
- package/lib/authoring/index.js +14 -0
- package/lib/authoring/index.js.map +1 -0
- package/lib/authoring/tool-policy.d.ts +3 -0
- package/lib/authoring/tool-policy.d.ts.map +1 -0
- package/lib/authoring/tool-policy.js +2 -0
- package/lib/authoring/tool-policy.js.map +1 -0
- package/lib/authoring/types.d.ts +209 -0
- package/lib/authoring/types.d.ts.map +1 -0
- package/lib/authoring/types.js +10 -0
- package/lib/authoring/types.js.map +1 -0
- package/lib/authoring/zod-schema.d.ts +20 -0
- package/lib/authoring/zod-schema.d.ts.map +1 -0
- package/lib/authoring/zod-schema.js +79 -0
- package/lib/authoring/zod-schema.js.map +1 -0
- package/lib/collaboration/ask-user-bridge.d.ts.map +1 -1
- package/lib/collaboration/ask-user-bridge.js +16 -2
- package/lib/collaboration/ask-user-bridge.js.map +1 -1
- package/lib/collaboration/inbound-turn-execute.js +4 -4
- package/lib/collaboration/inbound-turn-execute.js.map +1 -1
- package/lib/collaboration/inbound-turn-pipeline.d.ts.map +1 -1
- package/lib/collaboration/inbound-turn-pipeline.js +17 -9
- package/lib/collaboration/inbound-turn-pipeline.js.map +1 -1
- package/lib/collaboration/init-wizard-service.d.ts.map +1 -1
- package/lib/collaboration/init-wizard-service.js +2 -1
- package/lib/collaboration/init-wizard-service.js.map +1 -1
- package/lib/connection/authorization-flow.d.ts +26 -0
- package/lib/connection/authorization-flow.d.ts.map +1 -0
- package/lib/connection/authorization-flow.js +76 -0
- package/lib/connection/authorization-flow.js.map +1 -0
- package/lib/connection/index.d.ts +3 -0
- package/lib/connection/index.d.ts.map +1 -0
- package/lib/connection/index.js +2 -0
- package/lib/connection/index.js.map +1 -0
- package/lib/core/agent-core-run.d.ts +1 -0
- package/lib/core/agent-core-run.d.ts.map +1 -1
- package/lib/core/agent-core-run.js +25 -1
- package/lib/core/agent-core-run.js.map +1 -1
- package/lib/core/agent-loop-turn.d.ts +1 -1
- package/lib/core/agent-loop-turn.d.ts.map +1 -1
- package/lib/core/agent-loop-turn.js +1 -1
- package/lib/core/agent-loop-turn.js.map +1 -1
- package/lib/core/text-sanitize.d.ts.map +1 -1
- package/lib/core/text-sanitize.js +16 -1
- package/lib/core/text-sanitize.js.map +1 -1
- package/lib/core/tool-calls-user-format.d.ts.map +1 -1
- package/lib/core/tool-calls-user-format.js +18 -4
- package/lib/core/tool-calls-user-format.js.map +1 -1
- package/lib/core/turn-event-mapper.d.ts +1 -0
- package/lib/core/turn-event-mapper.d.ts.map +1 -1
- package/lib/core/turn-event-mapper.js +2 -1
- package/lib/core/turn-event-mapper.js.map +1 -1
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +2 -1
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/discovery/agent-surface-info.d.ts +42 -0
- package/lib/discovery/agent-surface-info.d.ts.map +1 -0
- package/lib/discovery/agent-surface-info.js +201 -0
- package/lib/discovery/agent-surface-info.js.map +1 -0
- package/lib/discovery/agent-surface.d.ts +32 -0
- package/lib/discovery/agent-surface.d.ts.map +1 -0
- package/lib/discovery/agent-surface.js +422 -0
- package/lib/discovery/agent-surface.js.map +1 -0
- package/lib/discovery/agents.d.ts +6 -16
- package/lib/discovery/agents.d.ts.map +1 -1
- package/lib/discovery/agents.js +86 -94
- package/lib/discovery/agents.js.map +1 -1
- package/lib/discovery/register-agent-surface.d.ts +27 -0
- package/lib/discovery/register-agent-surface.d.ts.map +1 -0
- package/lib/discovery/register-agent-surface.js +155 -0
- package/lib/discovery/register-agent-surface.js.map +1 -0
- package/lib/dynamic/dynamic-registry.d.ts +34 -0
- package/lib/dynamic/dynamic-registry.d.ts.map +1 -0
- package/lib/dynamic/dynamic-registry.js +52 -0
- package/lib/dynamic/dynamic-registry.js.map +1 -0
- package/lib/event/agent-stream-bus.d.ts +25 -0
- package/lib/event/agent-stream-bus.d.ts.map +1 -0
- package/lib/event/agent-stream-bus.js +22 -0
- package/lib/event/agent-stream-bus.js.map +1 -0
- package/lib/event/agent-stream-hooks.d.ts +10 -0
- package/lib/event/agent-stream-hooks.d.ts.map +1 -0
- package/lib/event/agent-stream-hooks.js +28 -0
- package/lib/event/agent-stream-hooks.js.map +1 -0
- package/lib/event/hook-stream-sink.d.ts +7 -0
- package/lib/event/hook-stream-sink.d.ts.map +1 -0
- package/lib/event/hook-stream-sink.js +9 -0
- package/lib/event/hook-stream-sink.js.map +1 -0
- package/lib/event/index.d.ts +6 -0
- package/lib/event/index.d.ts.map +1 -1
- package/lib/event/index.js +4 -0
- package/lib/event/index.js.map +1 -1
- package/lib/event/publish-agent-stream.d.ts +11 -0
- package/lib/event/publish-agent-stream.d.ts.map +1 -0
- package/lib/event/publish-agent-stream.js +14 -0
- package/lib/event/publish-agent-stream.js.map +1 -0
- package/lib/event/turn-to-agent-stream.d.ts +12 -0
- package/lib/event/turn-to-agent-stream.d.ts.map +1 -0
- package/lib/event/turn-to-agent-stream.js +124 -0
- package/lib/event/turn-to-agent-stream.js.map +1 -0
- package/lib/index.d.ts +24 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +17 -0
- package/lib/index.js.map +1 -1
- package/lib/init/bootstrap-gate.d.ts +6 -0
- package/lib/init/bootstrap-gate.d.ts.map +1 -0
- package/lib/init/bootstrap-gate.js +28 -0
- package/lib/init/bootstrap-gate.js.map +1 -0
- package/lib/init/create-zhin-agent.d.ts.map +1 -1
- package/lib/init/create-zhin-agent.js +18 -2
- package/lib/init/create-zhin-agent.js.map +1 -1
- package/lib/init/introspection-collectors.d.ts +5 -0
- package/lib/init/introspection-collectors.d.ts.map +1 -1
- package/lib/init/introspection-collectors.js +35 -0
- package/lib/init/introspection-collectors.js.map +1 -1
- package/lib/init/register-builtin-tools.d.ts.map +1 -1
- package/lib/init/register-builtin-tools.js +38 -9
- package/lib/init/register-builtin-tools.js.map +1 -1
- package/lib/init/register-db-upgrade.d.ts.map +1 -1
- package/lib/init/register-db-upgrade.js +20 -11
- package/lib/init/register-db-upgrade.js.map +1 -1
- package/lib/init/types.d.ts +2 -0
- package/lib/init/types.d.ts.map +1 -1
- package/lib/internal/agent-host.d.ts +5 -0
- package/lib/internal/agent-host.d.ts.map +1 -1
- package/lib/internal/host-types.d.ts +7 -0
- package/lib/internal/host-types.d.ts.map +1 -1
- package/lib/mcp-client/bridge.d.ts.map +1 -1
- package/lib/mcp-client/bridge.js +3 -1
- package/lib/mcp-client/bridge.js.map +1 -1
- package/lib/media/subagent-user-delivery.d.ts.map +1 -1
- package/lib/media/subagent-user-delivery.js +57 -12
- package/lib/media/subagent-user-delivery.js.map +1 -1
- package/lib/orchestrator/hook-registry.d.ts +9 -1
- package/lib/orchestrator/hook-registry.d.ts.map +1 -1
- package/lib/orchestrator/hook-registry.js +36 -2
- package/lib/orchestrator/hook-registry.js.map +1 -1
- package/lib/orchestrator/index.d.ts +5 -0
- package/lib/orchestrator/index.d.ts.map +1 -1
- package/lib/orchestrator/index.js +10 -0
- package/lib/orchestrator/index.js.map +1 -1
- package/lib/orchestrator/mcp-registry.d.ts +8 -0
- package/lib/orchestrator/mcp-registry.d.ts.map +1 -1
- package/lib/orchestrator/mcp-registry.js +19 -0
- package/lib/orchestrator/mcp-registry.js.map +1 -1
- package/lib/orchestrator/tool-selection.d.ts.map +1 -1
- package/lib/orchestrator/tool-selection.js +4 -0
- package/lib/orchestrator/tool-selection.js.map +1 -1
- package/lib/orchestrator/types.d.ts +6 -1
- package/lib/orchestrator/types.d.ts.map +1 -1
- package/lib/prompt/assembly.d.ts.map +1 -1
- package/lib/prompt/assembly.js +3 -1
- package/lib/prompt/assembly.js.map +1 -1
- package/lib/prompt/system-prompt.d.ts.map +1 -1
- package/lib/prompt/system-prompt.js +50 -14
- package/lib/prompt/system-prompt.js.map +1 -1
- package/lib/security/audit-logger.d.ts.map +1 -1
- package/lib/security/audit-logger.js +118 -13
- package/lib/security/audit-logger.js.map +1 -1
- package/lib/security/sandbox-enhanced.d.ts.map +1 -1
- package/lib/security/sandbox-enhanced.js +27 -19
- package/lib/security/sandbox-enhanced.js.map +1 -1
- package/lib/security/sandbox.d.ts.map +1 -1
- package/lib/security/sandbox.js +6 -6
- package/lib/security/sandbox.js.map +1 -1
- package/lib/session/agent-session-host-port.d.ts +23 -0
- package/lib/session/agent-session-host-port.d.ts.map +1 -0
- package/lib/session/agent-session-host-port.js +61 -0
- package/lib/session/agent-session-host-port.js.map +1 -0
- package/lib/session/http-agent-session-store.d.ts +76 -0
- package/lib/session/http-agent-session-store.d.ts.map +1 -0
- package/lib/session/http-agent-session-store.js +211 -0
- package/lib/session/http-agent-session-store.js.map +1 -0
- package/lib/session/http-approval-adapter.d.ts +11 -0
- package/lib/session/http-approval-adapter.d.ts.map +1 -0
- package/lib/session/http-approval-adapter.js +19 -0
- package/lib/session/http-approval-adapter.js.map +1 -0
- package/lib/session/http-approval-waiter.d.ts +11 -0
- package/lib/session/http-approval-waiter.d.ts.map +1 -0
- package/lib/session/http-approval-waiter.js +38 -0
- package/lib/session/http-approval-waiter.js.map +1 -0
- package/lib/session/http-session-persistence.d.ts +28 -0
- package/lib/session/http-session-persistence.d.ts.map +1 -0
- package/lib/session/http-session-persistence.js +60 -0
- package/lib/session/http-session-persistence.js.map +1 -0
- package/lib/session/http-session-sink.d.ts +11 -0
- package/lib/session/http-session-sink.d.ts.map +1 -0
- package/lib/session/http-session-sink.js +32 -0
- package/lib/session/http-session-sink.js.map +1 -0
- package/lib/session/http-step-projector.d.ts +16 -0
- package/lib/session/http-step-projector.d.ts.map +1 -0
- package/lib/session/http-step-projector.js +118 -0
- package/lib/session/http-step-projector.js.map +1 -0
- package/lib/session/http-turn-runner.d.ts +16 -0
- package/lib/session/http-turn-runner.d.ts.map +1 -0
- package/lib/session/http-turn-runner.js +57 -0
- package/lib/session/http-turn-runner.js.map +1 -0
- package/lib/session/im-approval-adapter.d.ts +12 -0
- package/lib/session/im-approval-adapter.d.ts.map +1 -0
- package/lib/session/im-approval-adapter.js +24 -0
- package/lib/session/im-approval-adapter.js.map +1 -0
- package/lib/session/park-controller.d.ts +24 -0
- package/lib/session/park-controller.d.ts.map +1 -0
- package/lib/session/park-controller.js +58 -0
- package/lib/session/park-controller.js.map +1 -0
- package/lib/session/resolve-session-interaction-port.d.ts +9 -0
- package/lib/session/resolve-session-interaction-port.d.ts.map +1 -0
- package/lib/session/resolve-session-interaction-port.js +13 -0
- package/lib/session/resolve-session-interaction-port.js.map +1 -0
- package/lib/session/session-event-log.d.ts +17 -0
- package/lib/session/session-event-log.d.ts.map +1 -0
- package/lib/session/session-event-log.js +56 -0
- package/lib/session/session-event-log.js.map +1 -0
- package/lib/session/session-interaction-port.d.ts +15 -0
- package/lib/session/session-interaction-port.d.ts.map +1 -0
- package/lib/session/session-interaction-port.js +2 -0
- package/lib/session/session-interaction-port.js.map +1 -0
- package/lib/skill/progressive-disclosure.d.ts +9 -0
- package/lib/skill/progressive-disclosure.d.ts.map +1 -0
- package/lib/skill/progressive-disclosure.js +14 -0
- package/lib/skill/progressive-disclosure.js.map +1 -0
- package/lib/state/agent-state-store.d.ts +18 -0
- package/lib/state/agent-state-store.d.ts.map +1 -0
- package/lib/state/agent-state-store.js +50 -0
- package/lib/state/agent-state-store.js.map +1 -0
- package/lib/subagent/subagent-runtime.d.ts.map +1 -1
- package/lib/subagent/subagent-runtime.js +7 -7
- package/lib/subagent/subagent-runtime.js.map +1 -1
- package/lib/subagent-prompt.d.ts.map +1 -1
- package/lib/subagent-prompt.js +32 -8
- package/lib/subagent-prompt.js.map +1 -1
- package/lib/task-executor.d.ts +1 -0
- package/lib/task-executor.d.ts.map +1 -1
- package/lib/task-executor.js +12 -6
- package/lib/task-executor.js.map +1 -1
- package/lib/tool/deferred-resolution.d.ts.map +1 -1
- package/lib/tool/deferred-resolution.js +4 -10
- package/lib/tool/deferred-resolution.js.map +1 -1
- package/lib/tool/prepare-turn-tools.d.ts +1 -1
- package/lib/tool/prepare-turn-tools.d.ts.map +1 -1
- package/lib/tool/prepare-turn-tools.js +15 -1
- package/lib/tool/prepare-turn-tools.js.map +1 -1
- package/lib/tool/tool-approval-gate.d.ts +30 -0
- package/lib/tool/tool-approval-gate.d.ts.map +1 -0
- package/lib/tool/tool-approval-gate.js +74 -0
- package/lib/tool/tool-approval-gate.js.map +1 -0
- package/lib/tool/tool-approval-once-store.d.ts +10 -0
- package/lib/tool/tool-approval-once-store.d.ts.map +1 -0
- package/lib/tool/tool-approval-once-store.js +16 -0
- package/lib/tool/tool-approval-once-store.js.map +1 -0
- package/lib/tool/tool-model-output.d.ts +3 -0
- package/lib/tool/tool-model-output.d.ts.map +1 -0
- package/lib/tool/tool-model-output.js +7 -0
- package/lib/tool/tool-model-output.js.map +1 -0
- package/lib/turn/index.d.ts +1 -1
- package/lib/turn/index.d.ts.map +1 -1
- package/lib/turn/index.js +1 -1
- package/lib/turn/index.js.map +1 -1
- package/lib/turn/process-stream.d.ts.map +1 -1
- package/lib/turn/process-stream.js +17 -3
- package/lib/turn/process-stream.js.map +1 -1
- package/lib/turn/turn-complete.d.ts.map +1 -1
- package/lib/turn/turn-complete.js +3 -7
- package/lib/turn/turn-complete.js.map +1 -1
- package/lib/turn/turn-metrics.d.ts +13 -2
- package/lib/turn/turn-metrics.d.ts.map +1 -1
- package/lib/turn/turn-metrics.js +69 -9
- package/lib/turn/turn-metrics.js.map +1 -1
- package/lib/turn/turn-pipeline.d.ts.map +1 -1
- package/lib/turn/turn-pipeline.js +14 -5
- package/lib/turn/turn-pipeline.js.map +1 -1
- package/lib/typing-indicator/adapter-integration.js +3 -3
- package/lib/typing-indicator/adapter-integration.js.map +1 -1
- package/lib/utils/config-env.js +30 -7
- package/lib/utils/config-env.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +1 -1
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +1 -2
- package/lib/zhin-agent/index.js.map +1 -1
- package/package.json +47 -7
package/lib/discovery/agents.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Agent
|
|
2
|
+
* Agent 预设发现(分形 agents/<name>/ 目录)
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* 加载顺序:Workspace > ~/.zhin > data > 插件包 agent/subagents(由 register-agent-surface 处理)
|
|
5
5
|
* 同名先发现者优先
|
|
6
6
|
*/
|
|
7
7
|
import * as fs from 'node:fs';
|
|
@@ -9,15 +9,74 @@ import * as os from 'node:os';
|
|
|
9
9
|
import * as path from 'node:path';
|
|
10
10
|
import { Logger } from '@zhin.js/core';
|
|
11
11
|
import { getDataDir } from './utils.js';
|
|
12
|
+
import { discoverWorkspaceFractalAgent, resolvePluginPackageRoot, } from './agent-surface.js';
|
|
13
|
+
import { isAuthoringDefinition } from '../authoring/types.js';
|
|
14
|
+
import { normalizeToolDenylist } from '../authoring/disable-tool.js';
|
|
12
15
|
const KNOWN_AGENT_ROLES = new Set([
|
|
13
16
|
'subtask', 'worker', 'researcher', 'evaluator', 'executor', 'reviewer', 'planner',
|
|
14
17
|
]);
|
|
15
18
|
const logger = new Logger(null, 'builtin-tools');
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
async function importAgentDefinition(agentFile) {
|
|
20
|
+
try {
|
|
21
|
+
const url = `file://${path.resolve(agentFile)}?t=${Date.now()}`;
|
|
22
|
+
const mod = await import(url);
|
|
23
|
+
const exported = mod.default ?? mod;
|
|
24
|
+
if (isAuthoringDefinition(exported, 'agent'))
|
|
25
|
+
return exported;
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
logger.debug(`Failed to import agent definition ${agentFile}: ${e}`);
|
|
29
|
+
}
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
function agentMetaFromFractal(name, agentDir, def, instructionsBody, ownerPlugin) {
|
|
33
|
+
const description = def?.description;
|
|
34
|
+
if (!description && !instructionsBody)
|
|
35
|
+
return null;
|
|
36
|
+
const agentFile = [path.join(agentDir, 'agent.ts'), path.join(agentDir, 'agent.js')]
|
|
37
|
+
.find((p) => fs.existsSync(p)) ?? path.join(agentDir, 'agent.ts');
|
|
38
|
+
const roleRaw = def?.role?.trim();
|
|
39
|
+
return {
|
|
40
|
+
name,
|
|
41
|
+
description: description ?? name,
|
|
42
|
+
keywords: def?.keywords,
|
|
43
|
+
tags: def?.tags,
|
|
44
|
+
toolNames: def?.toolNames,
|
|
45
|
+
disallowedTools: normalizeToolDenylist(def?.disallowedTools),
|
|
46
|
+
filePath: agentFile,
|
|
47
|
+
maxIterations: def?.maxIterations,
|
|
48
|
+
ownerPlugin,
|
|
49
|
+
role: roleRaw && KNOWN_AGENT_ROLES.has(roleRaw) ? roleRaw : undefined,
|
|
50
|
+
contextMode: def?.contextMode,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
async function discoverFractalAgentsInDir(agentsDir, ownerPlugin) {
|
|
54
|
+
const agents = [];
|
|
55
|
+
if (!fs.existsSync(agentsDir))
|
|
56
|
+
return agents;
|
|
57
|
+
let entries;
|
|
58
|
+
try {
|
|
59
|
+
entries = await fs.promises.readdir(agentsDir, { withFileTypes: true });
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return agents;
|
|
63
|
+
}
|
|
64
|
+
for (const entry of entries) {
|
|
65
|
+
if (!entry.isDirectory())
|
|
66
|
+
continue;
|
|
67
|
+
const agentDir = path.join(agentsDir, entry.name);
|
|
68
|
+
const fractal = await discoverWorkspaceFractalAgent(agentDir);
|
|
69
|
+
if (!fractal)
|
|
70
|
+
continue;
|
|
71
|
+
const def = fractal.agentDefinition ?? await importAgentDefinition(path.join(agentDir, 'agent.ts'));
|
|
72
|
+
const meta = agentMetaFromFractal(fractal.name, agentDir, def, fractal.instructionsBody, ownerPlugin);
|
|
73
|
+
if (meta)
|
|
74
|
+
agents.push(meta);
|
|
75
|
+
}
|
|
76
|
+
return agents;
|
|
77
|
+
}
|
|
19
78
|
/**
|
|
20
|
-
* 扫描 agents/
|
|
79
|
+
* 扫描 agents/ 分形目录,发现 workspace / plugin workspace agents
|
|
21
80
|
*/
|
|
22
81
|
export async function discoverWorkspaceAgents(root) {
|
|
23
82
|
const agents = [];
|
|
@@ -27,24 +86,16 @@ export async function discoverWorkspaceAgents(root) {
|
|
|
27
86
|
path.join(os.homedir(), '.zhin', 'agents'),
|
|
28
87
|
path.join(getDataDir(), 'agents'),
|
|
29
88
|
];
|
|
30
|
-
// Build dir → pluginName mapping for attribution
|
|
31
89
|
const dirToPlugin = new Map();
|
|
32
90
|
if (root) {
|
|
33
91
|
const addPluginDir = (p) => {
|
|
34
92
|
if (!p?.filePath)
|
|
35
93
|
return;
|
|
36
|
-
const
|
|
37
|
-
const d = path.join(
|
|
94
|
+
const packageRoot = resolvePluginPackageRoot(p.filePath);
|
|
95
|
+
const d = path.join(packageRoot, 'agents');
|
|
38
96
|
if (!agentDirs.includes(d))
|
|
39
97
|
agentDirs.push(d);
|
|
40
98
|
dirToPlugin.set(d, p.name);
|
|
41
|
-
const dirName = path.basename(dir);
|
|
42
|
-
if (dirName === 'src' || dirName === 'lib') {
|
|
43
|
-
const d2 = path.join(path.dirname(dir), 'agents');
|
|
44
|
-
if (!agentDirs.includes(d2))
|
|
45
|
-
agentDirs.push(d2);
|
|
46
|
-
dirToPlugin.set(d2, p.name);
|
|
47
|
-
}
|
|
48
99
|
};
|
|
49
100
|
addPluginDir(root);
|
|
50
101
|
for (const child of (root.children || [])) {
|
|
@@ -52,91 +103,32 @@ export async function discoverWorkspaceAgents(root) {
|
|
|
52
103
|
}
|
|
53
104
|
}
|
|
54
105
|
for (const agentsDir of agentDirs) {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
entries = await fs.promises.readdir(agentsDir, { withFileTypes: true });
|
|
60
|
-
}
|
|
61
|
-
catch {
|
|
62
|
-
continue;
|
|
63
|
-
}
|
|
64
|
-
for (const entry of entries) {
|
|
65
|
-
let agentMdPath;
|
|
66
|
-
if (entry.isFile() && entry.name.endsWith('.agent.md')) {
|
|
67
|
-
agentMdPath = path.join(agentsDir, entry.name);
|
|
68
|
-
}
|
|
69
|
-
else if (entry.isDirectory()) {
|
|
70
|
-
const nested = path.join(agentsDir, entry.name, `${entry.name}.agent.md`);
|
|
71
|
-
if (fs.existsSync(nested))
|
|
72
|
-
agentMdPath = nested;
|
|
73
|
-
}
|
|
74
|
-
if (!agentMdPath)
|
|
106
|
+
const found = await discoverFractalAgentsInDir(agentsDir, dirToPlugin.get(agentsDir));
|
|
107
|
+
for (const meta of found) {
|
|
108
|
+
if (seenNames.has(meta.name)) {
|
|
109
|
+
logger.debug(`Agent '${meta.name}' 已由先序目录加载,跳过: ${meta.filePath}`);
|
|
75
110
|
continue;
|
|
76
|
-
try {
|
|
77
|
-
const content = await fs.promises.readFile(agentMdPath, 'utf-8');
|
|
78
|
-
const match = content.match(/^---\s*\n([\s\S]*?)\n---\s*(?:\n|$)/);
|
|
79
|
-
if (!match) {
|
|
80
|
-
logger.debug(`Agent文件 ${agentMdPath} 没有有效的frontmatter格式`);
|
|
81
|
-
continue;
|
|
82
|
-
}
|
|
83
|
-
let jsYaml;
|
|
84
|
-
try {
|
|
85
|
-
jsYaml = await import('js-yaml');
|
|
86
|
-
if (jsYaml.default)
|
|
87
|
-
jsYaml = jsYaml.default;
|
|
88
|
-
}
|
|
89
|
-
catch (e) {
|
|
90
|
-
logger.warn(`Unable to import js-yaml module: ${e}`);
|
|
91
|
-
continue;
|
|
92
|
-
}
|
|
93
|
-
const metadata = jsYaml.load(match[1]);
|
|
94
|
-
if (!metadata || !metadata.name || !metadata.description) {
|
|
95
|
-
logger.debug(`Agent文件 ${agentMdPath} 缺少必需的 name/description 字段`);
|
|
96
|
-
continue;
|
|
97
|
-
}
|
|
98
|
-
if (seenNames.has(metadata.name)) {
|
|
99
|
-
logger.debug(`Agent '${metadata.name}' 已由先序目录加载,跳过: ${agentMdPath}`);
|
|
100
|
-
continue;
|
|
101
|
-
}
|
|
102
|
-
seenNames.add(metadata.name);
|
|
103
|
-
const roleRaw = typeof metadata.role === 'string' ? metadata.role.trim() : undefined;
|
|
104
|
-
const contextRaw = typeof metadata.contextMode === 'string' ? metadata.contextMode.trim() : undefined;
|
|
105
|
-
const effortRaw = typeof metadata.effort === 'string' ? metadata.effort.trim() : undefined;
|
|
106
|
-
const memoryRaw = typeof metadata.memory === 'string' ? metadata.memory.trim() : undefined;
|
|
107
|
-
const VALID_EFFORT = new Set(['low', 'medium', 'high', 'max']);
|
|
108
|
-
const VALID_MEMORY = new Set(['user', 'session', 'agent']);
|
|
109
|
-
agents.push({
|
|
110
|
-
name: metadata.name,
|
|
111
|
-
description: metadata.description,
|
|
112
|
-
keywords: metadata.keywords || [],
|
|
113
|
-
tags: metadata.tags || [],
|
|
114
|
-
toolNames: Array.isArray(metadata.tools) ? metadata.tools : [],
|
|
115
|
-
disallowedTools: Array.isArray(metadata.disallowedTools) ? metadata.disallowedTools : undefined,
|
|
116
|
-
filePath: agentMdPath,
|
|
117
|
-
model: metadata.model,
|
|
118
|
-
provider: metadata.provider,
|
|
119
|
-
maxIterations: typeof metadata.maxIterations === 'number' ? metadata.maxIterations : undefined,
|
|
120
|
-
ownerPlugin: dirToPlugin.get(agentsDir),
|
|
121
|
-
role: roleRaw && KNOWN_AGENT_ROLES.has(roleRaw) ? roleRaw : undefined,
|
|
122
|
-
contextMode: contextRaw === 'fork' || contextRaw === 'fresh' ? contextRaw : undefined,
|
|
123
|
-
toolAliases: metadata.toolAliases && typeof metadata.toolAliases === 'object' && !Array.isArray(metadata.toolAliases)
|
|
124
|
-
? metadata.toolAliases
|
|
125
|
-
: undefined,
|
|
126
|
-
effort: effortRaw && VALID_EFFORT.has(effortRaw) ? effortRaw : undefined,
|
|
127
|
-
memory: memoryRaw && VALID_MEMORY.has(memoryRaw) ? memoryRaw : undefined,
|
|
128
|
-
});
|
|
129
|
-
logger.debug(`Agent发现成功: ${metadata.name}`);
|
|
130
|
-
}
|
|
131
|
-
catch (e) {
|
|
132
|
-
logger.warn(`Failed to parse agent.md in ${agentMdPath}:`, e);
|
|
133
111
|
}
|
|
112
|
+
seenNames.add(meta.name);
|
|
113
|
+
agents.push(meta);
|
|
114
|
+
logger.debug(`Agent发现成功: ${meta.name}`);
|
|
134
115
|
}
|
|
135
116
|
}
|
|
136
117
|
return agents;
|
|
137
118
|
}
|
|
138
|
-
/**
|
|
119
|
+
/** 读取分形 agent instructions.md 正文 */
|
|
120
|
+
export async function loadAgentInstructionsBody(agentDir) {
|
|
121
|
+
const instructionsPath = path.join(agentDir, 'instructions.md');
|
|
122
|
+
if (!fs.existsSync(instructionsPath))
|
|
123
|
+
return '';
|
|
124
|
+
const content = await fs.promises.readFile(instructionsPath, 'utf-8');
|
|
125
|
+
return content.trim();
|
|
126
|
+
}
|
|
127
|
+
/** @deprecated 使用 loadAgentInstructionsBody */
|
|
139
128
|
export async function loadAgentMarkdownBody(filePath) {
|
|
129
|
+
if (filePath.endsWith('agent.ts') || filePath.endsWith('agent.js')) {
|
|
130
|
+
return loadAgentInstructionsBody(path.dirname(filePath));
|
|
131
|
+
}
|
|
140
132
|
const content = await fs.promises.readFile(filePath, 'utf-8');
|
|
141
133
|
return content.replace(/^---\s*\n[\s\S]*?\n---\s*(?:\n|$)/, '').trim();
|
|
142
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAe,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../src/discovery/agents.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Register discovered plugin agent/ surfaces into AgentOrchestrator and schedules.
|
|
3
|
+
*/
|
|
4
|
+
import { type Plugin, type Tool as CoreTool } from '@zhin.js/core';
|
|
5
|
+
import type { AgentOrchestrator } from '../orchestrator/index.js';
|
|
6
|
+
export interface RegisterAgentSurfaceOptions {
|
|
7
|
+
connectionsConfig?: Record<string, unknown>;
|
|
8
|
+
toolService?: {
|
|
9
|
+
addTool: (tool: CoreTool, pluginName: string) => () => void;
|
|
10
|
+
} | null;
|
|
11
|
+
}
|
|
12
|
+
export declare function registerPluginAgentSurfaces(orchestrator: AgentOrchestrator, root: Plugin, options?: RegisterAgentSurfaceOptions): Promise<{
|
|
13
|
+
tools: number;
|
|
14
|
+
skills: number;
|
|
15
|
+
schedules: number;
|
|
16
|
+
connections: number;
|
|
17
|
+
hooks: number;
|
|
18
|
+
evals: number;
|
|
19
|
+
workspaceAgents: number;
|
|
20
|
+
}>;
|
|
21
|
+
export declare function runPluginEvals(root: Plugin): Promise<{
|
|
22
|
+
id: string;
|
|
23
|
+
ok: boolean;
|
|
24
|
+
error?: string;
|
|
25
|
+
}[]>;
|
|
26
|
+
export declare function resetAuthoringRegistrationForTests(): void;
|
|
27
|
+
//# sourceMappingURL=register-agent-surface.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-agent-surface.d.ts","sourceRoot":"","sources":["../../src/discovery/register-agent-surface.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAU,KAAK,MAAM,EAAE,KAAK,IAAI,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAgClE,MAAM,WAAW,2BAA2B;IAC1C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,WAAW,CAAC,EAAE;QAAE,OAAO,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CACtF;AAMD,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,iBAAiB,EAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAAC;IACT,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC,CAiHD;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAqBzG;AAED,wBAAgB,kCAAkC,IAAI,IAAI,CAIzD"}
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Register discovered plugin agent/ surfaces into AgentOrchestrator and schedules.
|
|
3
|
+
*/
|
|
4
|
+
import { Logger } from '@zhin.js/core';
|
|
5
|
+
import { ScheduleEngine, getScheduleEngine, setScheduleEngine } from '@zhin.js/kernel';
|
|
6
|
+
import { bridgeAuthoringConnection, bridgeAuthoringHook, bridgeAuthoringSkill, bridgeAuthoringTool, bridgeAuthoringToolToOrchestratorTool, } from '../authoring/bridge.js';
|
|
7
|
+
import { discoverAllPluginAgentSurfaces, } from './agent-surface.js';
|
|
8
|
+
import { errMsg } from './utils.js';
|
|
9
|
+
import { registerAuthoringStateFromDefinition } from '../state/agent-state-store.js';
|
|
10
|
+
import { registerDynamicResolver } from '../dynamic/dynamic-registry.js';
|
|
11
|
+
const logger = new Logger(null, 'agent-surface-register');
|
|
12
|
+
const registeredScheduleIds = new Set();
|
|
13
|
+
const registeredAuthoringToolNames = new Set();
|
|
14
|
+
const registeredAuthoringSkillNames = new Set();
|
|
15
|
+
function ensureScheduleEngine() {
|
|
16
|
+
let engine = getScheduleEngine();
|
|
17
|
+
if (!engine) {
|
|
18
|
+
engine = new ScheduleEngine();
|
|
19
|
+
setScheduleEngine(engine);
|
|
20
|
+
}
|
|
21
|
+
return engine;
|
|
22
|
+
}
|
|
23
|
+
function flattenSurfaces(surface) {
|
|
24
|
+
return [surface, ...surface.subagents.flatMap((s) => flattenSurfaces(s))];
|
|
25
|
+
}
|
|
26
|
+
export async function registerPluginAgentSurfaces(orchestrator, root, options = {}) {
|
|
27
|
+
let toolCount = 0;
|
|
28
|
+
let skillCount = 0;
|
|
29
|
+
let scheduleCount = 0;
|
|
30
|
+
let connectionCount = 0;
|
|
31
|
+
let hookCount = 0;
|
|
32
|
+
let evalCount = 0;
|
|
33
|
+
const surfaces = await discoverAllPluginAgentSurfaces(root);
|
|
34
|
+
const allBridgedTools = [];
|
|
35
|
+
for (const surface of surfaces) {
|
|
36
|
+
for (const flat of flattenSurfaces(surface)) {
|
|
37
|
+
for (const discovered of flat.tools) {
|
|
38
|
+
if (registeredAuthoringToolNames.has(discovered.runtimeName))
|
|
39
|
+
continue;
|
|
40
|
+
try {
|
|
41
|
+
const bridged = bridgeAuthoringTool(discovered);
|
|
42
|
+
const tool = bridgeAuthoringToolToOrchestratorTool(bridged);
|
|
43
|
+
orchestrator.addTool(tool, undefined, discovered.pluginName);
|
|
44
|
+
options.toolService?.addTool(tool, discovered.pluginName);
|
|
45
|
+
allBridgedTools.push(tool);
|
|
46
|
+
registeredAuthoringToolNames.add(discovered.runtimeName);
|
|
47
|
+
toolCount++;
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
logger.warn(`Failed to register tool ${discovered.runtimeName}: ${errMsg(e)}`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
for (const discovered of flat.schedules) {
|
|
54
|
+
const scheduleId = discovered.runtimeName;
|
|
55
|
+
if (registeredScheduleIds.has(scheduleId))
|
|
56
|
+
continue;
|
|
57
|
+
try {
|
|
58
|
+
const engine = ensureScheduleEngine();
|
|
59
|
+
engine.register(scheduleId, 'solar', async () => { await discovered.definition.execute(); }, { cron: discovered.definition.cron });
|
|
60
|
+
registeredScheduleIds.add(scheduleId);
|
|
61
|
+
scheduleCount++;
|
|
62
|
+
}
|
|
63
|
+
catch (e) {
|
|
64
|
+
logger.warn(`Failed to register schedule ${scheduleId}: ${errMsg(e)}`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
for (const discovered of flat.connections) {
|
|
68
|
+
const configValue = options.connectionsConfig?.[discovered.slotName]
|
|
69
|
+
?? options.connectionsConfig?.[discovered.runtimeName];
|
|
70
|
+
if (configValue === undefined) {
|
|
71
|
+
logger.debug(`Connection ${discovered.slotName} has no config — skipped`);
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
const bridged = bridgeAuthoringConnection(discovered, configValue);
|
|
75
|
+
if (!bridged.ok) {
|
|
76
|
+
logger.warn(bridged.error);
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
orchestrator.addMcp(bridged.entry, undefined, discovered.pluginName);
|
|
80
|
+
connectionCount++;
|
|
81
|
+
}
|
|
82
|
+
for (const discovered of flat.hooks) {
|
|
83
|
+
const hook = bridgeAuthoringHook(discovered);
|
|
84
|
+
orchestrator.addHook(hook, undefined, discovered.pluginName);
|
|
85
|
+
hookCount++;
|
|
86
|
+
}
|
|
87
|
+
for (const discovered of flat.states) {
|
|
88
|
+
registerAuthoringStateFromDefinition(discovered.runtimeName, discovered.pluginName, discovered.definition.initial);
|
|
89
|
+
}
|
|
90
|
+
if (flat.dynamic) {
|
|
91
|
+
registerDynamicResolver({
|
|
92
|
+
pluginName: flat.dynamic.pluginName,
|
|
93
|
+
resolve: flat.dynamic.definition.resolve,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
evalCount += flat.evals.length;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
// Skills after tools so toolNames can resolve
|
|
100
|
+
for (const surface of surfaces) {
|
|
101
|
+
for (const flat of flattenSurfaces(surface)) {
|
|
102
|
+
for (const discovered of flat.skills) {
|
|
103
|
+
if (registeredAuthoringSkillNames.has(discovered.runtimeName))
|
|
104
|
+
continue;
|
|
105
|
+
try {
|
|
106
|
+
const skill = bridgeAuthoringSkill(discovered, allBridgedTools);
|
|
107
|
+
orchestrator.addSkill(skill, undefined, discovered.pluginName);
|
|
108
|
+
registeredAuthoringSkillNames.add(discovered.runtimeName);
|
|
109
|
+
skillCount++;
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
logger.warn(`Failed to register skill ${discovered.runtimeName}: ${errMsg(e)}`);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
return {
|
|
118
|
+
tools: toolCount,
|
|
119
|
+
skills: skillCount,
|
|
120
|
+
schedules: scheduleCount,
|
|
121
|
+
connections: connectionCount,
|
|
122
|
+
hooks: hookCount,
|
|
123
|
+
evals: evalCount,
|
|
124
|
+
workspaceAgents: 0,
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
export async function runPluginEvals(root) {
|
|
128
|
+
const surfaces = await discoverAllPluginAgentSurfaces(root);
|
|
129
|
+
const results = [];
|
|
130
|
+
for (const surface of surfaces) {
|
|
131
|
+
for (const ev of surface.evals) {
|
|
132
|
+
try {
|
|
133
|
+
let lastReply = '';
|
|
134
|
+
const t = {
|
|
135
|
+
send: async (_message) => { },
|
|
136
|
+
get reply() { return lastReply; },
|
|
137
|
+
succeeded: () => { lastReply = 'ok'; },
|
|
138
|
+
calledTool: (_name) => ({ soft: () => { } }),
|
|
139
|
+
};
|
|
140
|
+
await ev.definition.test(t);
|
|
141
|
+
results.push({ id: ev.runtimeName, ok: true });
|
|
142
|
+
}
|
|
143
|
+
catch (e) {
|
|
144
|
+
results.push({ id: ev.runtimeName, ok: false, error: errMsg(e) });
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
return results;
|
|
149
|
+
}
|
|
150
|
+
export function resetAuthoringRegistrationForTests() {
|
|
151
|
+
registeredScheduleIds.clear();
|
|
152
|
+
registeredAuthoringToolNames.clear();
|
|
153
|
+
registeredAuthoringSkillNames.clear();
|
|
154
|
+
}
|
|
155
|
+
//# sourceMappingURL=register-agent-surface.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-agent-surface.js","sourceRoot":"","sources":["../../src/discovery/register-agent-surface.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* defineDynamic turn overrides — tools / instructions (ADR 0039 P2).
|
|
3
|
+
*/
|
|
4
|
+
import type { Message } from '@zhin.js/core';
|
|
5
|
+
import type { AgentTool } from '@zhin.js/ai';
|
|
6
|
+
import type { AuthoringDynamicDefinition } from '../authoring/types.js';
|
|
7
|
+
export interface DynamicResolveContext {
|
|
8
|
+
sessionId: string;
|
|
9
|
+
userId: string;
|
|
10
|
+
adapter: string;
|
|
11
|
+
commMessage: Message;
|
|
12
|
+
agentId?: string;
|
|
13
|
+
}
|
|
14
|
+
export interface DynamicResolveResult {
|
|
15
|
+
additionalInstructions?: string;
|
|
16
|
+
allowedToolNames?: string[];
|
|
17
|
+
deniedToolNames?: string[];
|
|
18
|
+
}
|
|
19
|
+
export interface RegisteredDynamicResolver {
|
|
20
|
+
pluginName: string;
|
|
21
|
+
resolve: AuthoringDynamicDefinition['resolve'];
|
|
22
|
+
}
|
|
23
|
+
export declare function resetDynamicRegistryForTests(): void;
|
|
24
|
+
export declare function registerDynamicResolver(entry: RegisteredDynamicResolver): void;
|
|
25
|
+
export declare function listDynamicResolvers(): RegisteredDynamicResolver[];
|
|
26
|
+
export interface AppliedDynamicTurnOverrides {
|
|
27
|
+
tools: AgentTool[];
|
|
28
|
+
additionalInstructions?: string;
|
|
29
|
+
}
|
|
30
|
+
export declare function applyDynamicTurnOverrides(input: {
|
|
31
|
+
tools: AgentTool[];
|
|
32
|
+
ctx: DynamicResolveContext;
|
|
33
|
+
}): Promise<AppliedDynamicTurnOverrides>;
|
|
34
|
+
//# sourceMappingURL=dynamic-registry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-registry.d.ts","sourceRoot":"","sources":["../../src/dynamic/dynamic-registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAExE,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAC;CAChD;AAID,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,yBAAyB,GAAG,IAAI,CAE9E;AAED,wBAAgB,oBAAoB,IAAI,yBAAyB,EAAE,CAElE;AAED,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE;IACL,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,GAAG,EAAE,qBAAqB,CAAC;CAC5B,GACA,OAAO,CAAC,2BAA2B,CAAC,CA0CtC"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
const resolvers = [];
|
|
2
|
+
export function resetDynamicRegistryForTests() {
|
|
3
|
+
resolvers.length = 0;
|
|
4
|
+
}
|
|
5
|
+
export function registerDynamicResolver(entry) {
|
|
6
|
+
resolvers.push(entry);
|
|
7
|
+
}
|
|
8
|
+
export function listDynamicResolvers() {
|
|
9
|
+
return [...resolvers];
|
|
10
|
+
}
|
|
11
|
+
export async function applyDynamicTurnOverrides(input) {
|
|
12
|
+
if (!resolvers.length) {
|
|
13
|
+
return { tools: input.tools };
|
|
14
|
+
}
|
|
15
|
+
const merged = {};
|
|
16
|
+
for (const entry of resolvers) {
|
|
17
|
+
const patch = await entry.resolve(input.ctx);
|
|
18
|
+
if (!patch)
|
|
19
|
+
continue;
|
|
20
|
+
if (patch.additionalInstructions) {
|
|
21
|
+
merged.additionalInstructions = merged.additionalInstructions
|
|
22
|
+
? `${merged.additionalInstructions}\n\n${patch.additionalInstructions}`
|
|
23
|
+
: patch.additionalInstructions;
|
|
24
|
+
}
|
|
25
|
+
if (patch.allowedToolNames?.length) {
|
|
26
|
+
merged.allowedToolNames = [...new Set([
|
|
27
|
+
...(merged.allowedToolNames ?? []),
|
|
28
|
+
...patch.allowedToolNames,
|
|
29
|
+
])];
|
|
30
|
+
}
|
|
31
|
+
if (patch.deniedToolNames?.length) {
|
|
32
|
+
merged.deniedToolNames = [...new Set([
|
|
33
|
+
...(merged.deniedToolNames ?? []),
|
|
34
|
+
...patch.deniedToolNames,
|
|
35
|
+
])];
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
let tools = input.tools;
|
|
39
|
+
if (merged.allowedToolNames?.length) {
|
|
40
|
+
const allow = new Set(merged.allowedToolNames);
|
|
41
|
+
tools = tools.filter((t) => allow.has(t.name));
|
|
42
|
+
}
|
|
43
|
+
if (merged.deniedToolNames?.length) {
|
|
44
|
+
const deny = new Set(merged.deniedToolNames);
|
|
45
|
+
tools = tools.filter((t) => !deny.has(t.name));
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
tools,
|
|
49
|
+
additionalInstructions: merged.additionalInstructions,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=dynamic-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dynamic-registry.js","sourceRoot":"","sources":["../../src/dynamic/dynamic-registry.ts"],"names":[],"mappings":"AA0BA,MAAM,SAAS,GAAgC,EAAE,CAAC;AAElD,MAAM,UAAU,4BAA4B;IAC1C,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAgC;IACtE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC;AACxB,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAGC;IAED,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACtB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,KAAK,CAAC,sBAAsB,EAAE,CAAC;YACjC,MAAM,CAAC,sBAAsB,GAAG,MAAM,CAAC,sBAAsB;gBAC3D,CAAC,CAAC,GAAG,MAAM,CAAC,sBAAsB,OAAO,KAAK,CAAC,sBAAsB,EAAE;gBACvE,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC;QACnC,CAAC;QACD,IAAI,KAAK,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;YACnC,MAAM,CAAC,gBAAgB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;oBACpC,GAAG,CAAC,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC;oBAClC,GAAG,KAAK,CAAC,gBAAgB;iBAC1B,CAAC,CAAC,CAAC;QACN,CAAC;QACD,IAAI,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;YAClC,MAAM,CAAC,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;oBACnC,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;oBACjC,GAAG,KAAK,CAAC,eAAe;iBACzB,CAAC,CAAC,CAAC;QACN,CAAC;IACH,CAAC;IAED,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IACxB,IAAI,MAAM,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC/C,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC7C,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO;QACL,KAAK;QACL,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;KACtD,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AgentStreamBus — single egress for Eve-aligned wire events (ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import type { AgentStreamEvent } from '@zhin.js/ai/agent-stream';
|
|
5
|
+
export interface AgentStreamPublishContext {
|
|
6
|
+
sessionId?: string;
|
|
7
|
+
httpSessionId?: string;
|
|
8
|
+
turnId?: string;
|
|
9
|
+
agentId?: string;
|
|
10
|
+
}
|
|
11
|
+
export interface AgentStreamSink {
|
|
12
|
+
readonly name: string;
|
|
13
|
+
handle(event: AgentStreamEvent, ctx: AgentStreamPublishContext): void | Promise<void>;
|
|
14
|
+
}
|
|
15
|
+
export interface AgentStreamBus {
|
|
16
|
+
registerSink(sink: AgentStreamSink): () => void;
|
|
17
|
+
publish(event: AgentStreamEvent, ctx?: AgentStreamPublishContext): Promise<void>;
|
|
18
|
+
}
|
|
19
|
+
export declare class DefaultAgentStreamBus implements AgentStreamBus {
|
|
20
|
+
private readonly sinks;
|
|
21
|
+
registerSink(sink: AgentStreamSink): () => void;
|
|
22
|
+
publish(event: AgentStreamEvent, ctx?: AgentStreamPublishContext): Promise<void>;
|
|
23
|
+
}
|
|
24
|
+
export declare function createAgentStreamBus(): DefaultAgentStreamBus;
|
|
25
|
+
//# sourceMappingURL=agent-stream-bus.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-stream-bus.d.ts","sourceRoot":"","sources":["../../src/event/agent-stream-bus.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,WAAW,yBAAyB;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,EAAE,yBAAyB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvF;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,IAAI,CAAC;IAChD,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClF;AAED,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,IAAI;IAQzC,OAAO,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,GAAE,yBAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;CAO3F;AAED,wBAAgB,oBAAoB,IAAI,qBAAqB,CAE5D"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export class DefaultAgentStreamBus {
|
|
2
|
+
sinks = [];
|
|
3
|
+
registerSink(sink) {
|
|
4
|
+
this.sinks.push(sink);
|
|
5
|
+
return () => {
|
|
6
|
+
const idx = this.sinks.indexOf(sink);
|
|
7
|
+
if (idx !== -1)
|
|
8
|
+
this.sinks.splice(idx, 1);
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
async publish(event, ctx = {}) {
|
|
12
|
+
const stamped = {
|
|
13
|
+
...event,
|
|
14
|
+
timestamp: event.timestamp ?? Date.now(),
|
|
15
|
+
};
|
|
16
|
+
await Promise.all(this.sinks.map((sink) => sink.handle(stamped, ctx)));
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export function createAgentStreamBus() {
|
|
20
|
+
return new DefaultAgentStreamBus();
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=agent-stream-bus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-stream-bus.js","sourceRoot":"","sources":["../../src/event/agent-stream-bus.ts"],"names":[],"mappings":"AAsBA,MAAM,OAAO,qBAAqB;IACf,KAAK,GAAsB,EAAE,CAAC;IAE/C,YAAY,CAAC,IAAqB;QAChC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,GAAG,KAAK,CAAC,CAAC;gBAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAuB,EAAE,MAAiC,EAAE;QACxE,MAAM,OAAO,GAAqB;YAChC,GAAG,KAAK;YACR,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;SACzC,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC;CACF;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,qBAAqB,EAAE,CAAC;AACrC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bridge AgentStream wire events ↔ HookRegistry subscriptions (ADR 0039 P0).
|
|
3
|
+
*/
|
|
4
|
+
import type { AIHookEvent } from '../orchestrator/types.js';
|
|
5
|
+
import { type AgentStreamEvent, type AgentStreamEventTypeName } from '@zhin.js/ai/agent-stream';
|
|
6
|
+
/** Legacy `type:action` hook keys → Eve-aligned stream event names. */
|
|
7
|
+
export declare const LEGACY_HOOK_STREAM_ALIASES: Readonly<Record<string, AgentStreamEventTypeName>>;
|
|
8
|
+
export declare function isAgentStreamHookEventName(event: string): event is AgentStreamEventTypeName;
|
|
9
|
+
export declare function agentStreamEventToAIHookEvent(streamEvent: AgentStreamEvent, sessionId?: string): AIHookEvent;
|
|
10
|
+
//# sourceMappingURL=agent-stream-hooks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-stream-hooks.d.ts","sourceRoot":"","sources":["../../src/event/agent-stream-hooks.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAwB,KAAK,gBAAgB,EAAE,KAAK,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEtH,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAMzF,CAAC;AAEF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,wBAAwB,CAE3F;AAED,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,gBAAgB,EAC7B,SAAS,CAAC,EAAE,MAAM,GACjB,WAAW,CAeb"}
|