@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
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* JSON file persistence for HTTP agent sessions (ADR 0040 P3).
|
|
3
|
+
*/
|
|
4
|
+
import { mkdir, readFile, readdir, writeFile } from 'node:fs/promises';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
export class FileHttpSessionPersistence {
|
|
7
|
+
dataDir;
|
|
8
|
+
constructor(dataDir) {
|
|
9
|
+
this.dataDir = dataDir;
|
|
10
|
+
}
|
|
11
|
+
sessionPath(sessionId) {
|
|
12
|
+
const safe = sessionId.replace(/[^a-zA-Z0-9_-]/g, '_');
|
|
13
|
+
return join(this.dataDir, `${safe}.json`);
|
|
14
|
+
}
|
|
15
|
+
async save(snapshot) {
|
|
16
|
+
await mkdir(this.dataDir, { recursive: true });
|
|
17
|
+
const payload = {
|
|
18
|
+
...snapshot,
|
|
19
|
+
turnRunning: false,
|
|
20
|
+
updatedAt: Date.now(),
|
|
21
|
+
};
|
|
22
|
+
await writeFile(this.sessionPath(snapshot.sessionId), `${JSON.stringify(payload)}\n`, 'utf8');
|
|
23
|
+
}
|
|
24
|
+
async load(sessionId) {
|
|
25
|
+
try {
|
|
26
|
+
const raw = await readFile(this.sessionPath(sessionId), 'utf8');
|
|
27
|
+
const parsed = JSON.parse(raw);
|
|
28
|
+
if (!parsed?.sessionId)
|
|
29
|
+
return null;
|
|
30
|
+
return { ...parsed, turnRunning: false };
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
async listSessionIds() {
|
|
37
|
+
try {
|
|
38
|
+
const names = await readdir(this.dataDir);
|
|
39
|
+
const ids = [];
|
|
40
|
+
for (const name of names) {
|
|
41
|
+
if (!name.endsWith('.json'))
|
|
42
|
+
continue;
|
|
43
|
+
try {
|
|
44
|
+
const raw = await readFile(join(this.dataDir, name), 'utf8');
|
|
45
|
+
const parsed = JSON.parse(raw);
|
|
46
|
+
if (parsed?.sessionId)
|
|
47
|
+
ids.push(parsed.sessionId);
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
/* skip corrupt */
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return ids;
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return [];
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=http-session-persistence.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-session-persistence.js","sourceRoot":"","sources":["../../src/session/http-session-persistence.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAuBjC,MAAM,OAAO,0BAA0B;IACR;IAA7B,YAA6B,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAExC,WAAW,CAAC,SAAiB;QACnC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,QAAsC;QAC/C,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG;YACd,GAAG,QAAQ;YACX,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;QACF,MAAM,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChG,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB;QAC1B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAiC,CAAC;YAC/D,IAAI,CAAC,MAAM,EAAE,SAAS;gBAAE,OAAO,IAAI,CAAC;YACpC,OAAO,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,GAAG,GAAa,EAAE,CAAC;YACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAAE,SAAS;gBACtC,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;oBAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAiC,CAAC;oBAC/D,IAAI,MAAM,EAAE,SAAS;wBAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACpD,CAAC;gBAAC,MAAM,CAAC;oBACP,kBAAkB;gBACpB,CAAC;YACH,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { AgentStreamSink } from '../event/agent-stream-bus.js';
|
|
2
|
+
import type { ParkController, HttpSessionParkState } from './park-controller.js';
|
|
3
|
+
import type { SessionEventLog } from './session-event-log.js';
|
|
4
|
+
export interface HttpSessionSinkDeps {
|
|
5
|
+
sessions: Map<string, HttpSessionParkState>;
|
|
6
|
+
log: SessionEventLog;
|
|
7
|
+
park: ParkController;
|
|
8
|
+
onPersist?: (sessionId: string) => void;
|
|
9
|
+
}
|
|
10
|
+
export declare function createHttpSessionSink(deps: HttpSessionSinkDeps): AgentStreamSink;
|
|
11
|
+
//# sourceMappingURL=http-session-sink.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-session-sink.d.ts","sourceRoot":"","sources":["../../src/session/http-session-sink.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAA6B,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAC5C,GAAG,EAAE,eAAe,CAAC;IACrB,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe,CA8BhF"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HttpSessionSink — bus adapter writing HTTP session event log (ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
|
|
5
|
+
export function createHttpSessionSink(deps) {
|
|
6
|
+
const ingest = (sessionId, event, skipMidTurnPark = false) => {
|
|
7
|
+
const state = deps.sessions.get(sessionId);
|
|
8
|
+
if (!state)
|
|
9
|
+
return;
|
|
10
|
+
deps.log.append(sessionId, event);
|
|
11
|
+
for (const stepEvent of state.stepProjector.onStreamEvent(event)) {
|
|
12
|
+
deps.log.append(sessionId, stepEvent);
|
|
13
|
+
}
|
|
14
|
+
deps.park.syncPendingFromEvent(state, event);
|
|
15
|
+
deps.park.refreshParked(state);
|
|
16
|
+
if (!skipMidTurnPark && deps.park.shouldEmitMidTurnPark(state, event)) {
|
|
17
|
+
deps.park.emitSessionWaiting(state, 'parked');
|
|
18
|
+
}
|
|
19
|
+
deps.onPersist?.(sessionId);
|
|
20
|
+
};
|
|
21
|
+
return {
|
|
22
|
+
name: 'http-session',
|
|
23
|
+
handle(event, ctx) {
|
|
24
|
+
const sessionId = ctx.httpSessionId;
|
|
25
|
+
if (!sessionId)
|
|
26
|
+
return;
|
|
27
|
+
const skipMidTurnPark = event.type === AgentStreamEventType.SESSION_WAITING;
|
|
28
|
+
ingest(sessionId, event, skipMidTurnPark);
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=http-session-sink.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-session-sink.js","sourceRoot":"","sources":["../../src/session/http-session-sink.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAyB,MAAM,0BAA0B,CAAC;AAYvF,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,MAAM,GAAG,CAAC,SAAiB,EAAE,KAAuB,EAAE,eAAe,GAAG,KAAK,EAAQ,EAAE;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAElC,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAE/B,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;YACtE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,MAAM,CAAC,KAAK,EAAE,GAA8B;YAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC;YACpC,IAAI,CAAC,SAAS;gBAAE,OAAO;YACvB,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,eAAe,CAAC;YAC5E,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Projects turn-scoped steps from AgentStream events (ADR 0040 P3 / ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import { type AgentStreamEvent } from '@zhin.js/ai/agent-stream';
|
|
5
|
+
import { type AgentStepCheckpoint } from '@zhin.js/ai/agent-step-checkpoint';
|
|
6
|
+
export declare class HttpStepProjector {
|
|
7
|
+
private steps;
|
|
8
|
+
private current;
|
|
9
|
+
getSteps(): AgentStepCheckpoint[];
|
|
10
|
+
restoreSteps(steps: AgentStepCheckpoint[]): void;
|
|
11
|
+
/** Returns extra step wire events to append after the triggering event. */
|
|
12
|
+
onStreamEvent(event: AgentStreamEvent): AgentStreamEvent[];
|
|
13
|
+
pendingRequestIds(): string[];
|
|
14
|
+
isParked(): boolean;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=http-step-projector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-step-projector.d.ts","sourceRoot":"","sources":["../../src/session/http-step-projector.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAGL,KAAK,mBAAmB,EAEzB,MAAM,mCAAmC,CAAC;AAQ3C,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,OAAO,CAAoC;IAEnD,QAAQ,IAAI,mBAAmB,EAAE;IAIjC,YAAY,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,IAAI;IAWhD,2EAA2E;IAC3E,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE;IAkF1D,iBAAiB,IAAI,MAAM,EAAE;IAU7B,QAAQ,IAAI,OAAO;CAIpB"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Projects turn-scoped steps from AgentStream events (ADR 0040 P3 / ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
|
|
5
|
+
import { AgentStepStatus, createStepId, } from '@zhin.js/ai/agent-step-checkpoint';
|
|
6
|
+
function interruptKindFromEvent(event) {
|
|
7
|
+
if (event.type === AgentStreamEventType.INPUT_REQUESTED)
|
|
8
|
+
return 'approval';
|
|
9
|
+
if (event.type === AgentStreamEventType.AUTHORIZATION_REQUIRED)
|
|
10
|
+
return 'authorization';
|
|
11
|
+
return 'unknown';
|
|
12
|
+
}
|
|
13
|
+
export class HttpStepProjector {
|
|
14
|
+
steps = [];
|
|
15
|
+
current = null;
|
|
16
|
+
getSteps() {
|
|
17
|
+
return [...this.steps];
|
|
18
|
+
}
|
|
19
|
+
restoreSteps(steps) {
|
|
20
|
+
this.steps = [...steps];
|
|
21
|
+
this.current = null;
|
|
22
|
+
for (let i = this.steps.length - 1; i >= 0; i--) {
|
|
23
|
+
if (this.steps[i].status === AgentStepStatus.RUNNING) {
|
|
24
|
+
this.current = { ...this.steps[i] };
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
/** Returns extra step wire events to append after the triggering event. */
|
|
30
|
+
onStreamEvent(event) {
|
|
31
|
+
const extras = [];
|
|
32
|
+
const ts = event.timestamp ?? Date.now();
|
|
33
|
+
if (event.type === AgentStreamEventType.TURN_STARTED) {
|
|
34
|
+
const turnId = typeof event.data?.turnId === 'string' ? event.data.turnId : undefined;
|
|
35
|
+
const step = {
|
|
36
|
+
stepId: createStepId(),
|
|
37
|
+
turnId,
|
|
38
|
+
status: AgentStepStatus.RUNNING,
|
|
39
|
+
startedAt: ts,
|
|
40
|
+
};
|
|
41
|
+
this.current = step;
|
|
42
|
+
this.steps.push(step);
|
|
43
|
+
extras.push({
|
|
44
|
+
type: AgentStreamEventType.STEP_STARTED,
|
|
45
|
+
timestamp: ts,
|
|
46
|
+
data: { stepId: step.stepId, turnId, status: step.status },
|
|
47
|
+
});
|
|
48
|
+
return extras;
|
|
49
|
+
}
|
|
50
|
+
if (!this.current)
|
|
51
|
+
return extras;
|
|
52
|
+
if (event.type === AgentStreamEventType.INPUT_REQUESTED
|
|
53
|
+
|| event.type === AgentStreamEventType.AUTHORIZATION_REQUIRED) {
|
|
54
|
+
const requestId = typeof event.data?.requestId === 'string' ? event.data.requestId : undefined;
|
|
55
|
+
this.current.status = AgentStepStatus.INTERRUPTED;
|
|
56
|
+
this.current.interruptKind = interruptKindFromEvent(event);
|
|
57
|
+
this.current.requestId = requestId;
|
|
58
|
+
extras.push({
|
|
59
|
+
type: AgentStreamEventType.STEP_INTERRUPTED,
|
|
60
|
+
timestamp: ts,
|
|
61
|
+
data: {
|
|
62
|
+
stepId: this.current.stepId,
|
|
63
|
+
turnId: this.current.turnId,
|
|
64
|
+
status: this.current.status,
|
|
65
|
+
interruptKind: this.current.interruptKind,
|
|
66
|
+
requestId,
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
return extras;
|
|
70
|
+
}
|
|
71
|
+
if (event.type === AgentStreamEventType.TURN_COMPLETED) {
|
|
72
|
+
this.current.status = AgentStepStatus.COMPLETED;
|
|
73
|
+
this.current.completedAt = ts;
|
|
74
|
+
extras.push({
|
|
75
|
+
type: AgentStreamEventType.STEP_COMPLETED,
|
|
76
|
+
timestamp: ts,
|
|
77
|
+
data: {
|
|
78
|
+
stepId: this.current.stepId,
|
|
79
|
+
turnId: this.current.turnId,
|
|
80
|
+
status: this.current.status,
|
|
81
|
+
},
|
|
82
|
+
});
|
|
83
|
+
this.current = null;
|
|
84
|
+
return extras;
|
|
85
|
+
}
|
|
86
|
+
if (event.type === AgentStreamEventType.TURN_FAILED) {
|
|
87
|
+
this.current.status = AgentStepStatus.INTERRUPTED;
|
|
88
|
+
this.current.completedAt = ts;
|
|
89
|
+
extras.push({
|
|
90
|
+
type: AgentStreamEventType.STEP_INTERRUPTED,
|
|
91
|
+
timestamp: ts,
|
|
92
|
+
data: {
|
|
93
|
+
stepId: this.current.stepId,
|
|
94
|
+
turnId: this.current.turnId,
|
|
95
|
+
status: this.current.status,
|
|
96
|
+
interruptKind: 'unknown',
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
this.current = null;
|
|
100
|
+
return extras;
|
|
101
|
+
}
|
|
102
|
+
return extras;
|
|
103
|
+
}
|
|
104
|
+
pendingRequestIds() {
|
|
105
|
+
const ids = new Set();
|
|
106
|
+
for (const step of this.steps) {
|
|
107
|
+
if (step.status === AgentStepStatus.INTERRUPTED && step.requestId) {
|
|
108
|
+
ids.add(step.requestId);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return [...ids];
|
|
112
|
+
}
|
|
113
|
+
isParked() {
|
|
114
|
+
return this.pendingRequestIds().length > 0
|
|
115
|
+
|| (this.current?.status === AgentStepStatus.INTERRUPTED);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
//# sourceMappingURL=http-step-projector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-step-projector.js","sourceRoot":"","sources":["../../src/session/http-step-projector.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,oBAAoB,EAAyB,MAAM,0BAA0B,CAAC;AACvF,OAAO,EACL,eAAe,EACf,YAAY,GAGb,MAAM,mCAAmC,CAAC;AAE3C,SAAS,sBAAsB,CAAC,KAAuB;IACrD,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,eAAe;QAAE,OAAO,UAAU,CAAC;IAC3E,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,sBAAsB;QAAE,OAAO,eAAe,CAAC;IACvF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,OAAO,iBAAiB;IACpB,KAAK,GAA0B,EAAE,CAAC;IAClC,OAAO,GAA+B,IAAI,CAAC;IAEnD,QAAQ;QACN,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,KAA4B;QACvC,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;gBACrD,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpC,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,2EAA2E;IAC3E,aAAa,CAAC,KAAuB;QACnC,MAAM,MAAM,GAAuB,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAEzC,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,YAAY,EAAE,CAAC;YACrD,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACtF,MAAM,IAAI,GAAwB;gBAChC,MAAM,EAAE,YAAY,EAAE;gBACtB,MAAM;gBACN,MAAM,EAAE,eAAe,CAAC,OAAO;gBAC/B,SAAS,EAAE,EAAE;aACd,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,oBAAoB,CAAC,YAAY;gBACvC,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;aAC3D,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC;QAEjC,IACE,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,eAAe;eAChD,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,sBAAsB,EAC7D,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,IAAI,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/F,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC;YAClD,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;gBAC3C,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE;oBACJ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;oBACzC,SAAS;iBACV;aACF,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,cAAc,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,oBAAoB,CAAC,cAAc;gBACzC,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE;oBACJ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;iBAC5B;aACF,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,WAAW,EAAE,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,eAAe,CAAC,WAAW,CAAC;YAClD,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,oBAAoB,CAAC,gBAAgB;gBAC3C,SAAS,EAAE,EAAE;gBACb,IAAI,EAAE;oBACJ,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,aAAa,EAAE,SAAS;iBACzB;aACF,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,iBAAiB;QACf,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAClE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,MAAM,GAAG,CAAC;eACrC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,KAAK,eAAe,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;CACF"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { AgentStreamBus } from '../event/agent-stream-bus.js';
|
|
2
|
+
import type { ZhinAgent } from '../zhin-agent/index.js';
|
|
3
|
+
import type { ParkController, HttpSessionParkState } from './park-controller.js';
|
|
4
|
+
export interface HttpTurnRunnerDeps {
|
|
5
|
+
getAgent: () => ZhinAgent | null;
|
|
6
|
+
bus: AgentStreamBus;
|
|
7
|
+
park: ParkController;
|
|
8
|
+
sessions: Map<string, HttpSessionParkState>;
|
|
9
|
+
onPersist?: (sessionId: string) => void;
|
|
10
|
+
}
|
|
11
|
+
export declare class HttpTurnRunner {
|
|
12
|
+
private readonly deps;
|
|
13
|
+
constructor(deps: HttpTurnRunnerDeps);
|
|
14
|
+
run(sessionId: string, message: string): Promise<void>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=http-turn-runner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-turn-runner.d.ts","sourceRoot":"","sources":["../../src/session/http-turn-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,SAAS,GAAG,IAAI,CAAC;IACjC,GAAG,EAAE,cAAc,CAAC;IACpB,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,kBAAkB;IAE/C,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA8C7D"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HTTP turn runner — processStream without duplicate TurnEvent mapping (ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import { createSyntheticMessage } from '@zhin.js/core';
|
|
5
|
+
import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
|
|
6
|
+
export class HttpTurnRunner {
|
|
7
|
+
deps;
|
|
8
|
+
constructor(deps) {
|
|
9
|
+
this.deps = deps;
|
|
10
|
+
}
|
|
11
|
+
async run(sessionId, message) {
|
|
12
|
+
const state = this.deps.sessions.get(sessionId);
|
|
13
|
+
if (!state)
|
|
14
|
+
return;
|
|
15
|
+
const agent = this.deps.getAgent();
|
|
16
|
+
if (!agent) {
|
|
17
|
+
state.status = 'failed';
|
|
18
|
+
await this.deps.bus.publish({
|
|
19
|
+
type: AgentStreamEventType.SESSION_FAILED,
|
|
20
|
+
data: { code: 'AGENT_UNAVAILABLE', message: 'ZhinAgent runtime 未就绪' },
|
|
21
|
+
}, { sessionId, httpSessionId: sessionId });
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
state.turnRunning = true;
|
|
25
|
+
const commMessage = createSyntheticMessage({
|
|
26
|
+
adapter: 'host',
|
|
27
|
+
endpoint: 'zhin-v1',
|
|
28
|
+
sender: { id: 'http-client', isMaster: true },
|
|
29
|
+
channel: { type: 'private', id: sessionId },
|
|
30
|
+
extra: { httpSessionId: sessionId },
|
|
31
|
+
});
|
|
32
|
+
try {
|
|
33
|
+
for await (const _turnEvent of agent.processStream(message, commMessage)) {
|
|
34
|
+
/* wire events arrive via HttpSessionSink */
|
|
35
|
+
}
|
|
36
|
+
state.status = 'waiting';
|
|
37
|
+
this.deps.park.emitSessionWaiting(state, state.parked ? 'parked' : 'idle');
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
state.status = 'failed';
|
|
41
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
42
|
+
await this.deps.bus.publish({
|
|
43
|
+
type: AgentStreamEventType.TURN_FAILED,
|
|
44
|
+
data: { code: 'TURN_ERROR', message: msg },
|
|
45
|
+
}, { sessionId, httpSessionId: sessionId });
|
|
46
|
+
await this.deps.bus.publish({
|
|
47
|
+
type: AgentStreamEventType.SESSION_FAILED,
|
|
48
|
+
data: { code: 'TURN_ERROR', message: msg },
|
|
49
|
+
}, { sessionId, httpSessionId: sessionId });
|
|
50
|
+
}
|
|
51
|
+
finally {
|
|
52
|
+
state.turnRunning = false;
|
|
53
|
+
this.deps.onPersist?.(sessionId);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=http-turn-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-turn-runner.js","sourceRoot":"","sources":["../../src/session/http-turn-runner.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAahE,MAAM,OAAO,cAAc;IACI;IAA7B,YAA6B,IAAwB;QAAxB,SAAI,GAAJ,IAAI,CAAoB;IAAG,CAAC;IAEzD,KAAK,CAAC,GAAG,CAAC,SAAiB,EAAE,OAAe;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;YACxB,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAC1B,IAAI,EAAE,oBAAoB,CAAC,cAAc;gBACzC,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,uBAAuB,EAAE;aACtE,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAEzB,MAAM,WAAW,GAAG,sBAAsB,CAAC;YACzC,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC7C,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE;YAC3C,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,UAAU,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;gBACzE,4CAA4C;YAC9C,CAAC;YACD,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;YACxB,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAC1B,IAAI,EAAE,oBAAoB,CAAC,WAAW;gBACtC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE;aAC3C,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;YAC5C,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAC1B,IAAI,EAAE,oBAAoB,CAAC,cAAc;gBACzC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE;aAC3C,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9C,CAAC;gBAAS,CAAC;YACT,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* IM ask_user adapter for SessionInteractionPort (ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import type { Message, Plugin } from '@zhin.js/core';
|
|
5
|
+
import type { ApprovalRequestInput, SessionInteractionPort } from './session-interaction-port.js';
|
|
6
|
+
export declare class ImApprovalAdapter implements SessionInteractionPort {
|
|
7
|
+
private readonly plugin;
|
|
8
|
+
private readonly commMessage;
|
|
9
|
+
constructor(plugin: Plugin | undefined, commMessage: Message);
|
|
10
|
+
requestApproval(input: ApprovalRequestInput): Promise<boolean>;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=im-approval-adapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"im-approval-adapter.d.ts","sourceRoot":"","sources":["../../src/session/im-approval-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAElG,qBAAa,iBAAkB,YAAW,sBAAsB;IAE5D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBADX,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,WAAW,EAAE,OAAO;IAGjC,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;CAiBrE"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { AskUserBuiltinTool } from '../builtin/ask-user-tool.js';
|
|
2
|
+
export class ImApprovalAdapter {
|
|
3
|
+
plugin;
|
|
4
|
+
commMessage;
|
|
5
|
+
constructor(plugin, commMessage) {
|
|
6
|
+
this.plugin = plugin;
|
|
7
|
+
this.commMessage = commMessage;
|
|
8
|
+
}
|
|
9
|
+
async requestApproval(input) {
|
|
10
|
+
if (!this.plugin) {
|
|
11
|
+
throw new Error('approval required but Host plugin is unavailable');
|
|
12
|
+
}
|
|
13
|
+
const askTool = new AskUserBuiltinTool(this.plugin);
|
|
14
|
+
const raw = await askTool.run({
|
|
15
|
+
question: input.question,
|
|
16
|
+
type: 'confirm',
|
|
17
|
+
timeout: input.timeoutMs ?? 120,
|
|
18
|
+
sensitive: true,
|
|
19
|
+
}, this.commMessage);
|
|
20
|
+
const answer = typeof raw === 'string' ? raw.trim().toLowerCase() : String(raw);
|
|
21
|
+
return answer === 'yes';
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=im-approval-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"im-approval-adapter.js","sourceRoot":"","sources":["../../src/session/im-approval-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAGjE,MAAM,OAAO,iBAAiB;IAET;IACA;IAFnB,YACmB,MAA0B,EAC1B,WAAoB;QADpB,WAAM,GAAN,MAAM,CAAoB;QAC1B,gBAAW,GAAX,WAAW,CAAS;IACpC,CAAC;IAEJ,KAAK,CAAC,eAAe,CAAC,KAA2B;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B;YACE,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK,CAAC,SAAS,IAAI,GAAG;YAC/B,SAAS,EAAE,IAAI;SAChB,EACD,IAAI,CAAC,WAAW,CACjB,CAAC;QACF,MAAM,MAAM,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChF,OAAO,MAAM,KAAK,KAAK,CAAC;IAC1B,CAAC;CACF"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { type AgentStreamEvent } from '@zhin.js/ai/agent-stream';
|
|
2
|
+
import type { AgentStepCheckpoint } from '@zhin.js/ai/agent-step-checkpoint';
|
|
3
|
+
import type { AgentStreamBus } from '../event/agent-stream-bus.js';
|
|
4
|
+
import type { HttpStepProjector } from './http-step-projector.js';
|
|
5
|
+
export interface HttpSessionParkState {
|
|
6
|
+
sessionId: string;
|
|
7
|
+
continuationToken: string;
|
|
8
|
+
status: 'running' | 'waiting' | 'completed' | 'failed';
|
|
9
|
+
parked: boolean;
|
|
10
|
+
pendingRequestIds: string[];
|
|
11
|
+
turnRunning: boolean;
|
|
12
|
+
stepProjector: HttpStepProjector;
|
|
13
|
+
}
|
|
14
|
+
export declare class ParkController {
|
|
15
|
+
private readonly bus;
|
|
16
|
+
constructor(bus: AgentStreamBus);
|
|
17
|
+
newContinuationToken(): string;
|
|
18
|
+
syncPendingFromEvent(state: HttpSessionParkState, event: AgentStreamEvent): void;
|
|
19
|
+
refreshParked(state: HttpSessionParkState): void;
|
|
20
|
+
shouldEmitMidTurnPark(state: HttpSessionParkState, event: AgentStreamEvent): boolean;
|
|
21
|
+
emitSessionWaiting(state: HttpSessionParkState, reason: 'idle' | 'parked'): void;
|
|
22
|
+
getSteps(state: HttpSessionParkState): AgentStepCheckpoint[];
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=park-controller.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"park-controller.d.ts","sourceRoot":"","sources":["../../src/session/park-controller.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACvD,MAAM,EAAE,OAAO,CAAC;IAChB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,iBAAiB,CAAC;CAClC;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,cAAc;IAEhD,oBAAoB,IAAI,MAAM;IAI9B,oBAAoB,CAAC,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAsBhF,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI;IAIhD,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,gBAAgB,GAAG,OAAO;IASpF,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAgBhF,QAAQ,CAAC,KAAK,EAAE,oBAAoB,GAAG,mBAAmB,EAAE;CAG7D"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Park / waiting semantics for HTTP sessions (ADR 0040 P3 / ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import { randomUUID } from 'node:crypto';
|
|
5
|
+
import { AgentStreamEventType } from '@zhin.js/ai/agent-stream';
|
|
6
|
+
export class ParkController {
|
|
7
|
+
bus;
|
|
8
|
+
constructor(bus) {
|
|
9
|
+
this.bus = bus;
|
|
10
|
+
}
|
|
11
|
+
newContinuationToken() {
|
|
12
|
+
return `zhin:${randomUUID()}`;
|
|
13
|
+
}
|
|
14
|
+
syncPendingFromEvent(state, event) {
|
|
15
|
+
const requestId = typeof event.data?.requestId === 'string' ? event.data.requestId : '';
|
|
16
|
+
if (!requestId)
|
|
17
|
+
return;
|
|
18
|
+
if (event.type === AgentStreamEventType.INPUT_REQUESTED
|
|
19
|
+
|| event.type === AgentStreamEventType.AUTHORIZATION_REQUIRED) {
|
|
20
|
+
if (!state.pendingRequestIds.includes(requestId)) {
|
|
21
|
+
state.pendingRequestIds = [...state.pendingRequestIds, requestId];
|
|
22
|
+
}
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
if (event.type === AgentStreamEventType.INPUT_COMPLETED
|
|
26
|
+
|| event.type === AgentStreamEventType.AUTHORIZATION_COMPLETED) {
|
|
27
|
+
state.pendingRequestIds = state.pendingRequestIds.filter((id) => id !== requestId);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
refreshParked(state) {
|
|
31
|
+
state.parked = state.pendingRequestIds.length > 0 || state.stepProjector.isParked();
|
|
32
|
+
}
|
|
33
|
+
shouldEmitMidTurnPark(state, event) {
|
|
34
|
+
return state.turnRunning
|
|
35
|
+
&& state.parked
|
|
36
|
+
&& (event.type === AgentStreamEventType.INPUT_REQUESTED
|
|
37
|
+
|| event.type === AgentStreamEventType.AUTHORIZATION_REQUIRED);
|
|
38
|
+
}
|
|
39
|
+
emitSessionWaiting(state, reason) {
|
|
40
|
+
state.status = 'waiting';
|
|
41
|
+
state.continuationToken = this.newContinuationToken();
|
|
42
|
+
void this.bus.publish({
|
|
43
|
+
type: AgentStreamEventType.SESSION_WAITING,
|
|
44
|
+
data: {
|
|
45
|
+
sessionId: state.sessionId,
|
|
46
|
+
continuationToken: state.continuationToken,
|
|
47
|
+
parked: reason === 'parked',
|
|
48
|
+
reason,
|
|
49
|
+
pendingRequestIds: state.pendingRequestIds,
|
|
50
|
+
steps: state.stepProjector.getSteps(),
|
|
51
|
+
},
|
|
52
|
+
}, { sessionId: state.sessionId, httpSessionId: state.sessionId });
|
|
53
|
+
}
|
|
54
|
+
getSteps(state) {
|
|
55
|
+
return state.stepProjector.getSteps();
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=park-controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"park-controller.js","sourceRoot":"","sources":["../../src/session/park-controller.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAyB,MAAM,0BAA0B,CAAC;AAevF,MAAM,OAAO,cAAc;IACI;IAA7B,YAA6B,GAAmB;QAAnB,QAAG,GAAH,GAAG,CAAgB;IAAG,CAAC;IAEpD,oBAAoB;QAClB,OAAO,QAAQ,UAAU,EAAE,EAAE,CAAC;IAChC,CAAC;IAED,oBAAoB,CAAC,KAA2B,EAAE,KAAuB;QACvE,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,IAAI,EAAE,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QACxF,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,IACE,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,eAAe;eAChD,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,sBAAsB,EAC7D,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACjD,KAAK,CAAC,iBAAiB,GAAG,CAAC,GAAG,KAAK,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YACpE,CAAC;YACD,OAAO;QACT,CAAC;QAED,IACE,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,eAAe;eAChD,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,uBAAuB,EAC9D,CAAC;YACD,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,aAAa,CAAC,KAA2B;QACvC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;IACtF,CAAC;IAED,qBAAqB,CAAC,KAA2B,EAAE,KAAuB;QACxE,OAAO,KAAK,CAAC,WAAW;eACnB,KAAK,CAAC,MAAM;eACZ,CACD,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,eAAe;mBAChD,KAAK,CAAC,IAAI,KAAK,oBAAoB,CAAC,sBAAsB,CAC9D,CAAC;IACN,CAAC;IAED,kBAAkB,CAAC,KAA2B,EAAE,MAAyB;QACvE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;QACzB,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACtD,KAAK,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;YACpB,IAAI,EAAE,oBAAoB,CAAC,eAAe;YAC1C,IAAI,EAAE;gBACJ,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;gBAC1C,MAAM,EAAE,MAAM,KAAK,QAAQ;gBAC3B,MAAM;gBACN,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;gBAC1C,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE;aACtC;SACF,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,QAAQ,CAAC,KAA2B;QAClC,OAAO,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;CACF"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolve SessionInteractionPort from transport context (ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import { type Message, type Plugin } from '@zhin.js/core';
|
|
5
|
+
import type { HttpApprovalAdapter } from './http-approval-adapter.js';
|
|
6
|
+
import type { SessionInteractionPort } from './session-interaction-port.js';
|
|
7
|
+
export declare function readHttpSessionId(commMessage: Message): string | undefined;
|
|
8
|
+
export declare function resolveSessionInteractionPort(commMessage: Message, plugin: Plugin | undefined, httpApprovalAdapter?: HttpApprovalAdapter): SessionInteractionPort;
|
|
9
|
+
//# sourceMappingURL=resolve-session-interaction-port.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-session-interaction-port.d.ts","sourceRoot":"","sources":["../../src/session/resolve-session-interaction-port.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAG1E;AAED,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,sBAAsB,CAMxB"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ImApprovalAdapter } from './im-approval-adapter.js';
|
|
2
|
+
export function readHttpSessionId(commMessage) {
|
|
3
|
+
const extra = commMessage.extra;
|
|
4
|
+
return typeof extra?.httpSessionId === 'string' ? extra.httpSessionId : undefined;
|
|
5
|
+
}
|
|
6
|
+
export function resolveSessionInteractionPort(commMessage, plugin, httpApprovalAdapter) {
|
|
7
|
+
const httpSessionId = readHttpSessionId(commMessage);
|
|
8
|
+
if (httpSessionId && httpApprovalAdapter) {
|
|
9
|
+
return httpApprovalAdapter;
|
|
10
|
+
}
|
|
11
|
+
return new ImApprovalAdapter(plugin, commMessage);
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=resolve-session-interaction-port.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-session-interaction-port.js","sourceRoot":"","sources":["../../src/session/resolve-session-interaction-port.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,MAAM,UAAU,iBAAiB,CAAC,WAAoB;IACpD,MAAM,KAAK,GAAI,WAAmD,CAAC,KAAK,CAAC;IACzE,OAAO,OAAO,KAAK,EAAE,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,WAAoB,EACpB,MAA0B,EAC1B,mBAAyC;IAEzC,MAAM,aAAa,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACrD,IAAI,aAAa,IAAI,mBAAmB,EAAE,CAAC;QACzC,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Append-only HTTP session event log (ADR 0041).
|
|
3
|
+
*/
|
|
4
|
+
import type { AgentStreamEvent } from '@zhin.js/ai/agent-stream';
|
|
5
|
+
export type SessionEventListener = (event: AgentStreamEvent, index: number) => void;
|
|
6
|
+
export declare class SessionEventLog {
|
|
7
|
+
private readonly events;
|
|
8
|
+
private readonly listeners;
|
|
9
|
+
getEvents(sessionId: string): AgentStreamEvent[];
|
|
10
|
+
append(sessionId: string, event: AgentStreamEvent): number;
|
|
11
|
+
slice(sessionId: string, startIndex: number): AgentStreamEvent[];
|
|
12
|
+
subscribe(sessionId: string, listener: SessionEventListener): () => void;
|
|
13
|
+
replaceEvents(sessionId: string, events: AgentStreamEvent[]): void;
|
|
14
|
+
deleteSession(sessionId: string): void;
|
|
15
|
+
private notify;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=session-event-log.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-event-log.d.ts","sourceRoot":"","sources":["../../src/session/session-event-log.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;AAEpF,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;IAChE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgD;IAE1E,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAIhD,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,MAAM;IAgB1D,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAMhE,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,GAAG,MAAM,IAAI;IAaxE,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAIlE,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKtC,OAAO,CAAC,MAAM;CAOf"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
export class SessionEventLog {
|
|
2
|
+
events = new Map();
|
|
3
|
+
listeners = new Map();
|
|
4
|
+
getEvents(sessionId) {
|
|
5
|
+
return this.events.get(sessionId) ?? [];
|
|
6
|
+
}
|
|
7
|
+
append(sessionId, event) {
|
|
8
|
+
const stamped = {
|
|
9
|
+
...event,
|
|
10
|
+
timestamp: event.timestamp ?? Date.now(),
|
|
11
|
+
};
|
|
12
|
+
let list = this.events.get(sessionId);
|
|
13
|
+
if (!list) {
|
|
14
|
+
list = [];
|
|
15
|
+
this.events.set(sessionId, list);
|
|
16
|
+
}
|
|
17
|
+
list.push(stamped);
|
|
18
|
+
const index = list.length - 1;
|
|
19
|
+
this.notify(sessionId, stamped, index);
|
|
20
|
+
return index;
|
|
21
|
+
}
|
|
22
|
+
slice(sessionId, startIndex) {
|
|
23
|
+
const list = this.events.get(sessionId) ?? [];
|
|
24
|
+
const from = Math.max(0, Math.floor(startIndex));
|
|
25
|
+
return list.slice(from);
|
|
26
|
+
}
|
|
27
|
+
subscribe(sessionId, listener) {
|
|
28
|
+
let set = this.listeners.get(sessionId);
|
|
29
|
+
if (!set) {
|
|
30
|
+
set = new Set();
|
|
31
|
+
this.listeners.set(sessionId, set);
|
|
32
|
+
}
|
|
33
|
+
set.add(listener);
|
|
34
|
+
return () => {
|
|
35
|
+
set?.delete(listener);
|
|
36
|
+
if (set?.size === 0)
|
|
37
|
+
this.listeners.delete(sessionId);
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
replaceEvents(sessionId, events) {
|
|
41
|
+
this.events.set(sessionId, [...events]);
|
|
42
|
+
}
|
|
43
|
+
deleteSession(sessionId) {
|
|
44
|
+
this.events.delete(sessionId);
|
|
45
|
+
this.listeners.delete(sessionId);
|
|
46
|
+
}
|
|
47
|
+
notify(sessionId, event, index) {
|
|
48
|
+
const set = this.listeners.get(sessionId);
|
|
49
|
+
if (!set)
|
|
50
|
+
return;
|
|
51
|
+
for (const listener of set) {
|
|
52
|
+
listener(event, index);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=session-event-log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-event-log.js","sourceRoot":"","sources":["../../src/session/session-event-log.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,eAAe;IACT,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IAC/C,SAAS,GAAG,IAAI,GAAG,EAAqC,CAAC;IAE1E,SAAS,CAAC,SAAiB;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,SAAiB,EAAE,KAAuB;QAC/C,MAAM,OAAO,GAAqB;YAChC,GAAG,KAAK;YACR,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;SACzC,CAAC;QACF,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,UAAkB;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,SAAS,CAAC,SAAiB,EAAE,QAA8B;QACzD,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClB,OAAO,GAAG,EAAE;YACV,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtB,IAAI,GAAG,EAAE,IAAI,KAAK,CAAC;gBAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,SAAiB,EAAE,MAA0B;QACzD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,aAAa,CAAC,SAAiB;QAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEO,MAAM,CAAC,SAAiB,EAAE,KAAuB,EAAE,KAAa;QACtE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,KAAK,MAAM,QAAQ,IAAI,GAAG,EAAE,CAAC;YAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SessionInteractionPort — blocking HITL only (ADR 0041).
|
|
3
|
+
* Stream events publish via AgentStreamBus separately.
|
|
4
|
+
*/
|
|
5
|
+
export interface ApprovalRequestInput {
|
|
6
|
+
requestId: string;
|
|
7
|
+
toolName: string;
|
|
8
|
+
question: string;
|
|
9
|
+
timeoutMs?: number;
|
|
10
|
+
}
|
|
11
|
+
export interface SessionInteractionPort {
|
|
12
|
+
requestApproval(input: ApprovalRequestInput): Promise<boolean>;
|
|
13
|
+
resolveApproval?(requestId: string, approved: boolean): boolean;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=session-interaction-port.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-interaction-port.d.ts","sourceRoot":"","sources":["../../src/session/session-interaction-port.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/D,eAAe,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC;CACjE"}
|