@zhin.js/agent 1.1.15 → 1.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -4
- package/lib/activity-feedback/adapter-integration.d.ts +33 -10
- package/lib/activity-feedback/adapter-integration.d.ts.map +1 -1
- package/lib/activity-feedback/adapter-integration.js +90 -88
- package/lib/activity-feedback/adapter-integration.js.map +1 -1
- package/lib/activity-feedback/ai-bus.d.ts +2 -1
- package/lib/activity-feedback/ai-bus.d.ts.map +1 -1
- package/lib/activity-feedback/ai-bus.js +14 -3
- package/lib/activity-feedback/ai-bus.js.map +1 -1
- package/lib/activity-feedback/index.d.ts +3 -3
- package/lib/activity-feedback/index.d.ts.map +1 -1
- package/lib/activity-feedback/index.js +2 -2
- package/lib/activity-feedback/index.js.map +1 -1
- package/lib/activity-feedback/manager.d.ts +0 -5
- package/lib/activity-feedback/manager.d.ts.map +1 -1
- package/lib/activity-feedback/manager.js +21 -17
- package/lib/activity-feedback/manager.js.map +1 -1
- package/lib/activity-feedback/turn-event-projector.d.ts +11 -0
- package/lib/activity-feedback/turn-event-projector.d.ts.map +1 -0
- package/lib/activity-feedback/turn-event-projector.js +58 -0
- package/lib/activity-feedback/turn-event-projector.js.map +1 -0
- package/lib/ai-event-subscriber.d.ts +2 -2
- package/lib/ai-event-subscriber.d.ts.map +1 -1
- package/lib/ai-event-subscriber.js +1 -1
- package/lib/ai-event-subscriber.js.map +1 -1
- package/lib/authoring/bridge.d.ts.map +1 -1
- package/lib/authoring/bridge.js +15 -4
- package/lib/authoring/bridge.js.map +1 -1
- package/lib/authoring/define-tool.d.ts +8 -3
- package/lib/authoring/define-tool.d.ts.map +1 -1
- package/lib/authoring/define-tool.js +10 -0
- package/lib/authoring/define-tool.js.map +1 -1
- package/lib/authoring/types.d.ts +10 -3
- package/lib/authoring/types.d.ts.map +1 -1
- package/lib/authoring/types.js.map +1 -1
- package/lib/config/validate-ai-config.d.ts.map +1 -1
- package/lib/config/validate-ai-config.js +50 -0
- package/lib/config/validate-ai-config.js.map +1 -1
- package/lib/config/zhin-agent-config.d.ts +1 -3
- package/lib/config/zhin-agent-config.d.ts.map +1 -1
- package/lib/config/zhin-agent-defaults.d.ts.map +1 -1
- package/lib/config/zhin-agent-defaults.js +0 -2
- package/lib/config/zhin-agent-defaults.js.map +1 -1
- package/lib/core/agent-core-run.js +1 -1
- package/lib/core/agent-core-run.js.map +1 -1
- package/lib/deferred-worker-runner.d.ts.map +1 -1
- package/lib/deferred-worker-runner.js +2 -15
- package/lib/deferred-worker-runner.js.map +1 -1
- package/lib/deferred-worker-tool-load.d.ts +1 -1
- package/lib/deferred-worker-tool-load.js +1 -1
- package/lib/event/event-emitter.js +1 -1
- package/lib/event/event-emitter.js.map +1 -1
- package/lib/hooks.d.ts +0 -12
- package/lib/hooks.d.ts.map +1 -1
- package/lib/hooks.js.map +1 -1
- package/lib/index.d.ts +7 -11
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +5 -7
- package/lib/index.js.map +1 -1
- package/lib/init/dispose-zhin-agent.d.ts +1 -1
- package/lib/init/dispose-zhin-agent.d.ts.map +1 -1
- package/lib/init/dispose-zhin-agent.js +2 -2
- package/lib/init/dispose-zhin-agent.js.map +1 -1
- package/lib/internal/agent-host.d.ts +0 -3
- package/lib/internal/agent-host.d.ts.map +1 -1
- package/lib/plugin-runtime/capability-ingress.d.ts +2 -0
- package/lib/plugin-runtime/capability-ingress.d.ts.map +1 -1
- package/lib/plugin-runtime/capability-ingress.js +7 -0
- package/lib/plugin-runtime/capability-ingress.js.map +1 -1
- package/lib/plugin-runtime/capability-tools.d.ts.map +1 -1
- package/lib/plugin-runtime/capability-tools.js +1 -0
- package/lib/plugin-runtime/capability-tools.js.map +1 -1
- package/lib/plugin-runtime/full-agent-turn-engine.d.ts.map +1 -1
- package/lib/plugin-runtime/full-agent-turn-engine.js +31 -29
- package/lib/plugin-runtime/full-agent-turn-engine.js.map +1 -1
- package/lib/plugin-runtime/workroom-projection-outbound.d.ts +4 -4
- package/lib/plugin-runtime/workroom-projection-outbound.d.ts.map +1 -1
- package/lib/plugin-runtime/workroom-projection-outbound.js +2 -2
- package/lib/plugin-runtime/workroom-projection-outbound.js.map +1 -1
- package/lib/prompt/assembly.d.ts +3 -1
- package/lib/prompt/assembly.d.ts.map +1 -1
- package/lib/prompt/assembly.js +27 -52
- package/lib/prompt/assembly.js.map +1 -1
- package/lib/prompt/index.d.ts +3 -6
- package/lib/prompt/index.d.ts.map +1 -1
- package/lib/prompt/index.js +2 -4
- package/lib/prompt/index.js.map +1 -1
- package/lib/prompt/prompt-assembly-registry.d.ts +14 -6
- package/lib/prompt/prompt-assembly-registry.d.ts.map +1 -1
- package/lib/prompt/prompt-assembly-registry.js +14 -5
- package/lib/prompt/prompt-assembly-registry.js.map +1 -1
- package/lib/prompt/prompt-budget.d.ts +11 -6
- package/lib/prompt/prompt-budget.d.ts.map +1 -1
- package/lib/prompt/prompt-budget.js +42 -11
- package/lib/prompt/prompt-budget.js.map +1 -1
- package/lib/prompt/system-prompt.d.ts +2 -4
- package/lib/prompt/system-prompt.d.ts.map +1 -1
- package/lib/prompt/system-prompt.js +34 -54
- package/lib/prompt/system-prompt.js.map +1 -1
- package/lib/resource-hub/index.d.ts +15 -5
- package/lib/resource-hub/index.d.ts.map +1 -1
- package/lib/resource-hub/index.js +10 -0
- package/lib/resource-hub/index.js.map +1 -1
- package/lib/resource-hub/public-api.d.ts +10 -0
- package/lib/resource-hub/public-api.d.ts.map +1 -0
- package/lib/resource-hub/public-api.js +6 -0
- package/lib/resource-hub/public-api.js.map +1 -0
- package/lib/resource-hub/types.d.ts +2 -1
- package/lib/resource-hub/types.d.ts.map +1 -1
- package/lib/routing/workroom-bot-identity.d.ts.map +1 -1
- package/lib/routing/workroom-bot-identity.js +11 -4
- package/lib/routing/workroom-bot-identity.js.map +1 -1
- package/lib/subagent/subagent-runtime.d.ts +13 -1
- package/lib/subagent/subagent-runtime.d.ts.map +1 -1
- package/lib/subagent/subagent-runtime.js +136 -34
- package/lib/subagent/subagent-runtime.js.map +1 -1
- package/lib/subagent/subagent-system-init.js +4 -4
- package/lib/subagent/subagent-system-init.js.map +1 -1
- package/lib/subagent/subagent-system.d.ts +2 -1
- package/lib/subagent/subagent-system.d.ts.map +1 -1
- package/lib/subagent/subagent-system.js +10 -3
- package/lib/subagent/subagent-system.js.map +1 -1
- package/lib/task-executor.d.ts +7 -1
- package/lib/task-executor.d.ts.map +1 -1
- package/lib/task-executor.js +74 -48
- package/lib/task-executor.js.map +1 -1
- package/lib/turn/inbound-queue-runtime.d.ts.map +1 -1
- package/lib/turn/inbound-queue-runtime.js +6 -2
- package/lib/turn/inbound-queue-runtime.js.map +1 -1
- package/lib/turn/inbound-turn-queue.d.ts +1 -0
- package/lib/turn/inbound-turn-queue.d.ts.map +1 -1
- package/lib/turn/inbound-turn-queue.js +14 -4
- package/lib/turn/inbound-turn-queue.js.map +1 -1
- 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/turn-context-bridge.d.ts +0 -2
- package/lib/turn/turn-context-bridge.d.ts.map +1 -1
- package/lib/turn/turn-context-bridge.js +1 -8
- package/lib/turn/turn-context-bridge.js.map +1 -1
- package/lib/turn/turn-ingress.d.ts +3 -1
- package/lib/turn/turn-ingress.d.ts.map +1 -1
- package/lib/turn/turn-ingress.js.map +1 -1
- package/lib/turn/turn-pipeline.d.ts +1 -1
- package/lib/turn/turn-pipeline.d.ts.map +1 -1
- package/lib/turn/turn-pipeline.js +40 -3
- package/lib/turn/turn-pipeline.js.map +1 -1
- package/lib/typing-indicator/index.d.ts +4 -0
- package/lib/typing-indicator/index.d.ts.map +1 -1
- package/lib/typing-indicator/index.js +96 -23
- package/lib/typing-indicator/index.js.map +1 -1
- package/lib/utils/keyed-mutex.d.ts +1 -1
- package/lib/utils/keyed-mutex.d.ts.map +1 -1
- package/lib/utils/keyed-mutex.js +18 -4
- package/lib/utils/keyed-mutex.js.map +1 -1
- package/lib/workroom/catalog-definition.d.ts +7 -0
- package/lib/workroom/catalog-definition.d.ts.map +1 -1
- package/lib/workroom/catalog.js +15 -1
- package/lib/workroom/catalog.js.map +1 -1
- package/lib/workroom/human-ingress-application.d.ts +2 -0
- package/lib/workroom/human-ingress-application.d.ts.map +1 -1
- package/lib/workroom/human-ingress-application.js +1 -0
- package/lib/workroom/human-ingress-application.js.map +1 -1
- package/lib/workroom/human-ingress-source-reader.js +9 -2
- package/lib/workroom/human-ingress-source-reader.js.map +1 -1
- package/lib/workroom/projection-outbox.d.ts +5 -0
- package/lib/workroom/projection-outbox.d.ts.map +1 -1
- package/lib/workroom/projection-outbox.js +13 -1
- package/lib/workroom/projection-outbox.js.map +1 -1
- package/lib/zhin-agent/index.d.ts +2 -5
- package/lib/zhin-agent/index.d.ts.map +1 -1
- package/lib/zhin-agent/index.js +23 -17
- package/lib/zhin-agent/index.js.map +1 -1
- package/package.json +13 -12
- package/lib/agent-prompt/format.d.ts +0 -6
- package/lib/agent-prompt/format.d.ts.map +0 -1
- package/lib/agent-prompt/format.js +0 -40
- package/lib/agent-prompt/format.js.map +0 -1
- package/lib/agent-prompt/index.d.ts +0 -5
- package/lib/agent-prompt/index.d.ts.map +0 -1
- package/lib/agent-prompt/index.js +0 -4
- package/lib/agent-prompt/index.js.map +0 -1
- package/lib/agent-prompt/registry.d.ts +0 -7
- package/lib/agent-prompt/registry.d.ts.map +0 -1
- package/lib/agent-prompt/registry.js +0 -23
- package/lib/agent-prompt/registry.js.map +0 -1
- package/lib/agent-prompt/resolver.d.ts +0 -13
- package/lib/agent-prompt/resolver.d.ts.map +0 -1
- package/lib/agent-prompt/resolver.js +0 -75
- package/lib/agent-prompt/resolver.js.map +0 -1
- package/lib/prompt/define-agent-prompt-section.d.ts +0 -29
- package/lib/prompt/define-agent-prompt-section.d.ts.map +0 -1
- package/lib/prompt/define-agent-prompt-section.js +0 -22
- package/lib/prompt/define-agent-prompt-section.js.map +0 -1
- package/lib/prompt/discover-prompt-sections.d.ts +0 -21
- package/lib/prompt/discover-prompt-sections.d.ts.map +0 -1
- package/lib/prompt/discover-prompt-sections.js +0 -49
- package/lib/prompt/discover-prompt-sections.js.map +0 -1
- package/lib/prompt/prompt-section-loader.d.ts +0 -27
- package/lib/prompt/prompt-section-loader.d.ts.map +0 -1
- package/lib/prompt/prompt-section-loader.js +0 -75
- package/lib/prompt/prompt-section-loader.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-system-init.js","sourceRoot":"","sources":["../../src/subagent/subagent-system-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAWtC,MAAM,UAAU,oBAAoB,CAAC,IAA+B;IAClE,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,aAAa,CAAC;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE;QACxB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;QACxC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;QAChD,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB;QACtD,gBAAgB,EAAE,IAAI,CAAC,MAAM;QAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC3E,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC;QAC3E,YAAY,EAAE,IAAI,CAAC,OAAO;QAC1B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"subagent-system-init.js","sourceRoot":"","sources":["../../src/subagent/subagent-system-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAE9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAWtC,MAAM,UAAU,oBAAoB,CAAC,IAA+B;IAClE,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,aAAa,CAAC;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE;QACxB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;QACxC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,qBAAqB;QAChD,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB;QACtD,gBAAgB,EAAE,IAAI,CAAC,MAAM;QAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC3E,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC;QAC3E,YAAY,EAAE,IAAI,CAAC,OAAO;QAC1B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,SAAS,GAAG,6BAA6B,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;gBAClF,MAAM,EAAE,UAAU;gBAClB,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,OAAO,EAAE,KAAK,CAAC,IAAI;gBACnB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,OAAO,EAAE,KAAK,CAAC,KAAK;gBACpB,WAAW,EAAE;oBACX,aAAa,EAAE,KAAK,CAAC,KAAK;iBAC3B;aACF,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAC5D,CAAC;iBAAM,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;gBACnC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;KAC5C,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAChE,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -8,6 +8,7 @@ export declare class SubagentSystem {
|
|
|
8
8
|
private readonly senders;
|
|
9
9
|
private readonly definitions;
|
|
10
10
|
private runtime;
|
|
11
|
+
private disposal?;
|
|
11
12
|
constructor(_config?: SubagentSystemConfig);
|
|
12
13
|
register(definition: SubagentDefinition): void;
|
|
13
14
|
getDefinition(name: string): SubagentDefinition | undefined;
|
|
@@ -24,7 +25,7 @@ export declare class SubagentSystem {
|
|
|
24
25
|
spawnSync(options: SpawnOptions): Promise<string>;
|
|
25
26
|
cancel(taskId: string): boolean;
|
|
26
27
|
getRunningCount(): number;
|
|
27
|
-
dispose(): void
|
|
28
|
+
dispose(): Promise<void>;
|
|
28
29
|
}
|
|
29
30
|
export declare const defaultSubagentSystem: SubagentSystem;
|
|
30
31
|
export type { SpawnOptions, SubagentCompletePayload, SubagentLifecycleEvent, SubagentOrigin, SubagentResultDelivery, SubagentResultSender, SubagentRuntimeOptions, };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-system.d.ts","sourceRoot":"","sources":["../../src/subagent/subagent-system.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3F,OAAO,EACL,eAAe,EACf,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,qBAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"subagent-system.d.ts","sourceRoot":"","sources":["../../src/subagent/subagent-system.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAyB,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3F,OAAO,EACL,eAAe,EACf,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAC/B,qBAAa,cAAc;IAOb,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IACrE,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,QAAQ,CAAC,CAAgB;gBAEJ,OAAO,GAAE,oBAAyB;IAE/D,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,IAAI;IAI9C,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAI3D,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAMpD,UAAU,IAAI,eAAe,GAAG,IAAI;IAIpC,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IASrC,SAAS,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAM7C,aAAa,IAAI,oBAAoB,GAAG,IAAI;IAkB5C,SAAS,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAK7C,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;IAItD,eAAe,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,GAAG,IAAI;IAI5D,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAI1E,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7C,SAAS,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAKvD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAI/B,eAAe,IAAI,MAAM;IAIzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAWzB;AAED,eAAO,MAAM,qBAAqB,gBAAyB,CAAC;AAE5D,YAAY,EACV,YAAY,EACZ,uBAAuB,EACvB,sBAAsB,EACtB,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,sBAAsB,GACvB,CAAC"}
|
|
@@ -6,6 +6,7 @@ export class SubagentSystem {
|
|
|
6
6
|
senders = [];
|
|
7
7
|
definitions = new Map();
|
|
8
8
|
runtime = null;
|
|
9
|
+
disposal;
|
|
9
10
|
constructor(_config = {}) {
|
|
10
11
|
this._config = _config;
|
|
11
12
|
}
|
|
@@ -88,10 +89,16 @@ export class SubagentSystem {
|
|
|
88
89
|
return this.runtime?.getRunningCount() ?? 0;
|
|
89
90
|
}
|
|
90
91
|
dispose() {
|
|
91
|
-
this.
|
|
92
|
+
if (this.disposal)
|
|
93
|
+
return this.disposal;
|
|
94
|
+
const runtime = this.runtime;
|
|
92
95
|
this.runtime = null;
|
|
93
|
-
this.
|
|
94
|
-
|
|
96
|
+
this.disposal = (async () => {
|
|
97
|
+
await runtime?.dispose();
|
|
98
|
+
this.resultSinks.length = 0;
|
|
99
|
+
this.senders.length = 0;
|
|
100
|
+
})();
|
|
101
|
+
return this.disposal;
|
|
95
102
|
}
|
|
96
103
|
}
|
|
97
104
|
export const defaultSubagentSystem = new SubagentSystem({});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-system.js","sourceRoot":"","sources":["../../src/subagent/subagent-system.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,eAAe,GAQhB,MAAM,uBAAuB,CAAC;AAC/B,MAAM,OAAO,cAAc;
|
|
1
|
+
{"version":3,"file":"subagent-system.js","sourceRoot":"","sources":["../../src/subagent/subagent-system.ts"],"names":[],"mappings":"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"}
|
package/lib/task-executor.d.ts
CHANGED
|
@@ -40,7 +40,13 @@ export declare function createTaskExecutor(deps: TaskExecutorDeps): {
|
|
|
40
40
|
resolveAdapter: (platform: string) => {
|
|
41
41
|
sendMessage: (opts: import("@zhin.js/core").SendOptions) => Promise<string>;
|
|
42
42
|
} | undefined;
|
|
43
|
+
dispose: () => Promise<void>;
|
|
43
44
|
};
|
|
44
|
-
|
|
45
|
+
/**
|
|
46
|
+
* @deprecated Task executors now own and drain their own scene locks through
|
|
47
|
+
* `executor.dispose()`. Retained only to provide explicit migration guidance;
|
|
48
|
+
* calling it now rejects because no process-global lock owner exists.
|
|
49
|
+
*/
|
|
50
|
+
export declare function drainTaskExecutorLocks(_timeoutMs: number): Promise<void>;
|
|
45
51
|
export type TaskExecutor = ReturnType<typeof createTaskExecutor>;
|
|
46
52
|
//# sourceMappingURL=task-executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-executor.d.ts","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"AAGA,OAAO,EAA4B,KAAK,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACvG,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAElF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAGrF,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EACtB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKrE,MAAM,WAAW,mBAAoB,SAAQ,uBAAuB;IAClE,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,wBAAwB,CAAC;CAC1C;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IAClI,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,aAAa,CAAC,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;IACzD,MAAM,CAAC,EAAE,uBAAuB,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,yBAAyB,CAAC;IAC1C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC7C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,yBAAyB,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,OAAO,sBAAsB,EAAE,SAAS,CAAC;CAC3D;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB;mBAY3B,WAAW,YAAW,oBAAoB,KAAQ,OAAO,CAAC,mBAAmB,CAAC;sBAmEhG,MAAM,UACN,yBAAyB,YACxB;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,KACtC,OAAO,CAAC,mBAAmB,CAAC;+BA1GJ,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,eAAe,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS;mBA4H7G,OAAO,CAAC,IAAI,CAAC;EAalC;AAgBD;;;;GAIG;AACH,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9E;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
|
package/lib/task-executor.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/** Delivery boundary for the independent schedule execution domain. */
|
|
2
2
|
import { getLogger } from '@zhin.js/logger';
|
|
3
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
3
4
|
import { createNotificationRouter } from './assistant/notification-router.js';
|
|
4
5
|
import { scheduleJobCreatorFromPrincipal } from './assistant/job-creator.js';
|
|
5
6
|
import { deliverScheduleToAdapter } from './assistant/deliver-schedule-to-adapter.js';
|
|
@@ -8,8 +9,11 @@ import { ScheduleExecutionDomainImpl, } from './schedule-domain/execution-domain
|
|
|
8
9
|
import { JsonlScheduleAuditLogger } from './schedule-domain/audit-logger.js';
|
|
9
10
|
import { DEFAULT_CONFIG } from './config/zhin-agent-defaults.js';
|
|
10
11
|
const logger = getLogger('task-executor');
|
|
11
|
-
const sceneLocks = new KeyedMutex();
|
|
12
12
|
export function createTaskExecutor(deps) {
|
|
13
|
+
const sceneLocks = new KeyedMutex();
|
|
14
|
+
const executionContext = new AsyncLocalStorage();
|
|
15
|
+
let disposed = false;
|
|
16
|
+
let disposal;
|
|
13
17
|
const router = deps.router ?? createNotificationRouter({ resolveAdapter: deps.resolveAdapter });
|
|
14
18
|
const domain = deps.domain ?? new ScheduleExecutionDomainImpl({
|
|
15
19
|
turn: deps.turn ?? missingScheduleTurnPort(),
|
|
@@ -17,6 +21,8 @@ export function createTaskExecutor(deps) {
|
|
|
17
21
|
auditLogger: new JsonlScheduleAuditLogger(deps.dataDir),
|
|
18
22
|
});
|
|
19
23
|
async function execute(job, options = {}) {
|
|
24
|
+
if (disposed)
|
|
25
|
+
throw new Error('TaskExecutor has been disposed');
|
|
20
26
|
options.signal?.throwIfAborted();
|
|
21
27
|
const previewSource = options.previewSource;
|
|
22
28
|
const effectiveNotify = router.resolveEffectiveNotify(job.notify, deps.defaultNotify);
|
|
@@ -28,54 +34,59 @@ export function createTaskExecutor(deps) {
|
|
|
28
34
|
const lockKey = previewSource
|
|
29
35
|
? `preview:${previewSource.sessionKey}`
|
|
30
36
|
: scheduleLockKey(job, effectiveNotify);
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
const executionPlan = previewSource
|
|
45
|
-
? {
|
|
46
|
-
prompt: job.action.prompt,
|
|
47
|
-
tools: result.audit.toolsResolved.length ? result.audit.toolsResolved : undefined,
|
|
48
|
-
skills: result.audit.skillsResolved?.length ? result.audit.skillsResolved : undefined,
|
|
49
|
-
previewSample: result.output || undefined,
|
|
50
|
-
previewedAt: Date.now(),
|
|
51
|
-
confirmed: false,
|
|
37
|
+
return sceneLocks.run(lockKey, () => executionContext.run(true, async () => {
|
|
38
|
+
// Activity belongs to admitted execution, not to time spent waiting for
|
|
39
|
+
// the per-scene mutex. Keeping its terminal inside the same critical
|
|
40
|
+
// section prevents a prior run from clearing a later run's indicator.
|
|
41
|
+
await event('start');
|
|
42
|
+
let result;
|
|
43
|
+
try {
|
|
44
|
+
result = await domain.execute(job, {
|
|
45
|
+
preview: Boolean(previewSource),
|
|
46
|
+
signal: options.signal,
|
|
47
|
+
});
|
|
48
|
+
options.signal?.throwIfAborted();
|
|
52
49
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
notify: effectiveNotify,
|
|
66
|
-
content: result.output,
|
|
67
|
-
router,
|
|
68
|
-
source: 'scheduled',
|
|
69
|
-
});
|
|
50
|
+
catch (error) {
|
|
51
|
+
await event('error');
|
|
52
|
+
throw error;
|
|
53
|
+
}
|
|
54
|
+
const executionPlan = previewSource
|
|
55
|
+
? {
|
|
56
|
+
prompt: job.action.prompt,
|
|
57
|
+
tools: result.audit.toolsResolved.length ? result.audit.toolsResolved : undefined,
|
|
58
|
+
skills: result.audit.skillsResolved?.length ? result.audit.skillsResolved : undefined,
|
|
59
|
+
previewSample: result.output || undefined,
|
|
60
|
+
previewedAt: Date.now(),
|
|
61
|
+
confirmed: false,
|
|
70
62
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
63
|
+
: job.executionPlan;
|
|
64
|
+
if (!result.success) {
|
|
65
|
+
await event('error');
|
|
66
|
+
logger.error(`[TaskExecutor] 执行失败: ${result.error ?? 'unknown error'}`);
|
|
67
|
+
}
|
|
68
|
+
else if (previewSource) {
|
|
69
|
+
await event('finish');
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
if (result.output) {
|
|
73
|
+
try {
|
|
74
|
+
await deliverScheduleToAdapter({
|
|
75
|
+
notify: effectiveNotify,
|
|
76
|
+
content: result.output,
|
|
77
|
+
router,
|
|
78
|
+
source: 'scheduled',
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
await event('error');
|
|
83
|
+
throw error;
|
|
84
|
+
}
|
|
74
85
|
}
|
|
86
|
+
await event('finish');
|
|
75
87
|
}
|
|
76
|
-
|
|
77
|
-
}
|
|
78
|
-
return { ...result, responseText: result.output, executionPlan };
|
|
88
|
+
return { ...result, responseText: result.output, executionPlan };
|
|
89
|
+
}), options.signal);
|
|
79
90
|
}
|
|
80
91
|
async function preview(prompt, source, options = {}) {
|
|
81
92
|
const now = Date.now();
|
|
@@ -94,7 +105,17 @@ export function createTaskExecutor(deps) {
|
|
|
94
105
|
};
|
|
95
106
|
return execute(job, { previewSource: source });
|
|
96
107
|
}
|
|
97
|
-
|
|
108
|
+
function dispose() {
|
|
109
|
+
if (executionContext.getStore()) {
|
|
110
|
+
return Promise.reject(new Error('TaskExecutor cannot dispose from inside its own execution callback; dispose it from the owning lifecycle'));
|
|
111
|
+
}
|
|
112
|
+
if (disposal)
|
|
113
|
+
return disposal;
|
|
114
|
+
disposed = true;
|
|
115
|
+
disposal = sceneLocks.drain();
|
|
116
|
+
return disposal;
|
|
117
|
+
}
|
|
118
|
+
return { execute, preview, resolveAdapter: deps.resolveAdapter, dispose };
|
|
98
119
|
}
|
|
99
120
|
function missingScheduleTurnPort() {
|
|
100
121
|
return Object.freeze({
|
|
@@ -109,7 +130,12 @@ function scheduleLockKey(job, notify) {
|
|
|
109
130
|
const scene = notify.target.scene;
|
|
110
131
|
return `im:${scene.platform}:${scene.endpointKey}:${scene.kind}:${scene.sceneId}`;
|
|
111
132
|
}
|
|
112
|
-
|
|
113
|
-
|
|
133
|
+
/**
|
|
134
|
+
* @deprecated Task executors now own and drain their own scene locks through
|
|
135
|
+
* `executor.dispose()`. Retained only to provide explicit migration guidance;
|
|
136
|
+
* calling it now rejects because no process-global lock owner exists.
|
|
137
|
+
*/
|
|
138
|
+
export async function drainTaskExecutorLocks(_timeoutMs) {
|
|
139
|
+
throw new Error('Global TaskExecutor lock draining is no longer supported; retain the executor and await executor.dispose()');
|
|
114
140
|
}
|
|
115
141
|
//# sourceMappingURL=task-executor.js.map
|
package/lib/task-executor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAA2B,MAAM,oCAAoC,CAAC;AAEvG,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAE7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EACL,2BAA2B,GAI5B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"task-executor.js","sourceRoot":"","sources":["../src/task-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-queue-runtime.d.ts","sourceRoot":"","sources":["../../src/turn/inbound-queue-runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EACjC,OAAO,EAAE,qBAAqB,GAC7B;IAAE,MAAM,EAAE,0BAA0B,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"inbound-queue-runtime.d.ts","sourceRoot":"","sources":["../../src/turn/inbound-queue-runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EACjC,OAAO,EAAE,qBAAqB,GAC7B;IAAE,MAAM,EAAE,0BAA0B,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAA;CAAE,CAqBjE;AAED,wBAAsB,mBAAmB,CAAC,CAAC,EACzC,WAAW,EAAE,OAAO,EACpB,kBAAkB,EAAE,0BAA0B,EAC9C,KAAK,EAAE,gBAAgB,EACvB,IAAI,EAAE;IACJ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,GAAG,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CAC5C,GACA,OAAO,CAAC,CAAC,CAAC,CAaZ"}
|
|
@@ -5,10 +5,14 @@ export function createInboundTurnQueue(config, emitter) {
|
|
|
5
5
|
const inboundQueueConfig = normalizeInboundQueueConfig(config.inboundQueue);
|
|
6
6
|
const queue = new InboundTurnQueue(inboundQueueConfig, {
|
|
7
7
|
emitQueuedStart: (commMessage, sessionKey) => {
|
|
8
|
-
emitter.emit('ai.activity.queued.start', emitter.createPayload(sessionKey, commMessage, 'text'
|
|
8
|
+
emitter.emit('ai.activity.queued.start', emitter.createPayload(sessionKey, commMessage, 'text', {
|
|
9
|
+
hookContext: { activityFeedbackEligible: true },
|
|
10
|
+
}));
|
|
9
11
|
},
|
|
10
12
|
emitQueuedClear: (commMessage, sessionKey) => {
|
|
11
|
-
emitter.emit('ai.activity.queued.clear', emitter.createPayload(sessionKey, commMessage, 'text'
|
|
13
|
+
emitter.emit('ai.activity.queued.clear', emitter.createPayload(sessionKey, commMessage, 'text', {
|
|
14
|
+
hookContext: { activityFeedbackEligible: true },
|
|
15
|
+
}));
|
|
12
16
|
},
|
|
13
17
|
});
|
|
14
18
|
return { config: inboundQueueConfig, queue };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-queue-runtime.js","sourceRoot":"","sources":["../../src/turn/inbound-queue-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,GAExB,MAAM,2BAA2B,CAAC;AAGnC,MAAM,UAAU,sBAAsB,CACpC,MAAiC,EACjC,OAA8B;IAE9B,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,kBAAkB,EAAE;QACrD,eAAe,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;YAC3C,OAAO,CAAC,IAAI,CACV,0BAA0B,EAC1B,OAAO,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"inbound-queue-runtime.js","sourceRoot":"","sources":["../../src/turn/inbound-queue-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,GAExB,MAAM,2BAA2B,CAAC;AAGnC,MAAM,UAAU,sBAAsB,CACpC,MAAiC,EACjC,OAA8B;IAE9B,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,kBAAkB,EAAE;QACrD,eAAe,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;YAC3C,OAAO,CAAC,IAAI,CACV,0BAA0B,EAC1B,OAAO,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;gBACrD,WAAW,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE;aAChD,CAAC,CACH,CAAC;QACJ,CAAC;QACD,eAAe,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE;YAC3C,OAAO,CAAC,IAAI,CACV,0BAA0B,EAC1B,OAAO,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE;gBACrD,WAAW,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE;aAChD,CAAC,CACH,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAAoB,EACpB,kBAA8C,EAC9C,KAAuB,EACvB,IAKC;IAED,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,UAAU,GAAG,6BAA6B,CAAC,WAAW,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,QAAQ,CAAC;QACpB,UAAU;QACV,WAAW;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-turn-queue.d.ts","sourceRoot":"","sources":["../../src/turn/inbound-turn-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE5E,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,UAAU,EAAE,MAAM;CAI/B;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;CAIjD;
|
|
1
|
+
{"version":3,"file":"inbound-turn-queue.d.ts","sourceRoot":"","sources":["../../src/turn/inbound-turn-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE5E,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,UAAU,EAAE,MAAM;CAI/B;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;CAIjD;AAoBD,MAAM,WAAW,2BAA2B;IAC1C,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAChE,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACjE;AAOD,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,eAAe;IALzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;IAC1E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;gBAGnD,MAAM,EAAE,0BAA0B,EAClC,eAAe,GAAE,2BAAyC;IAGpE,YAAY,CAAC,MAAM,EAAE,0BAA0B,GAAG,IAAI;IAItD,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,OAAO,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,GAAG,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;KAC5C,GAAG,OAAO,CAAC,CAAC,CAAC;IAyEd,OAAO,IAAI,IAAI;IAYf,OAAO,CAAC,SAAS;YAIH,cAAc;YAiBd,IAAI;IAyClB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,mBAAmB;CAM5B"}
|
|
@@ -47,6 +47,8 @@ export class InboundTurnQueue {
|
|
|
47
47
|
tail.lastEnqueuedAt = now;
|
|
48
48
|
tail.commMessage = commMessage;
|
|
49
49
|
tail.run = run;
|
|
50
|
+
this.activityEmitter.emitQueuedStart(commMessage, sessionKey);
|
|
51
|
+
tail.queuedFeedbackMessages.push(commMessage);
|
|
50
52
|
void this.pump(sessionKey);
|
|
51
53
|
return tail.promise;
|
|
52
54
|
}
|
|
@@ -61,6 +63,7 @@ export class InboundTurnQueue {
|
|
|
61
63
|
sessionKey,
|
|
62
64
|
senderId,
|
|
63
65
|
commMessage,
|
|
66
|
+
queuedFeedbackMessages: [],
|
|
64
67
|
textParts: content ? [content] : [],
|
|
65
68
|
enqueuedAt: now,
|
|
66
69
|
lastEnqueuedAt: now,
|
|
@@ -81,6 +84,7 @@ export class InboundTurnQueue {
|
|
|
81
84
|
const shouldShowPending = this.inFlight.has(sessionKey) || queue.length > 1;
|
|
82
85
|
if (shouldShowPending) {
|
|
83
86
|
this.activityEmitter.emitQueuedStart(commMessage, sessionKey);
|
|
87
|
+
entry.queuedFeedbackMessages.push(commMessage);
|
|
84
88
|
}
|
|
85
89
|
void this.pump(sessionKey);
|
|
86
90
|
return promise;
|
|
@@ -89,7 +93,7 @@ export class InboundTurnQueue {
|
|
|
89
93
|
for (const queue of this.queues.values()) {
|
|
90
94
|
for (const entry of queue) {
|
|
91
95
|
entry.disposeAbortListener?.();
|
|
92
|
-
this.
|
|
96
|
+
this.clearQueuedFeedback(entry);
|
|
93
97
|
entry.reject(new Error('InboundTurnQueue disposed'));
|
|
94
98
|
}
|
|
95
99
|
}
|
|
@@ -107,7 +111,7 @@ export class InboundTurnQueue {
|
|
|
107
111
|
while (queue.length > 0 && this.isExpired(queue[0], now)) {
|
|
108
112
|
const expired = queue.shift();
|
|
109
113
|
expired.disposeAbortListener?.();
|
|
110
|
-
this.
|
|
114
|
+
this.clearQueuedFeedback(expired);
|
|
111
115
|
expired.reject(new InboundTurnExpiredError(sessionKey));
|
|
112
116
|
}
|
|
113
117
|
if (!queue.length) {
|
|
@@ -129,7 +133,7 @@ export class InboundTurnQueue {
|
|
|
129
133
|
if (!queue.length) {
|
|
130
134
|
this.queues.delete(sessionKey);
|
|
131
135
|
}
|
|
132
|
-
this.
|
|
136
|
+
this.clearQueuedFeedback(entry);
|
|
133
137
|
entry.started = true;
|
|
134
138
|
try {
|
|
135
139
|
const merged = entry.textParts.filter(Boolean).join('\n');
|
|
@@ -165,9 +169,15 @@ export class InboundTurnQueue {
|
|
|
165
169
|
if (queue.length === 0)
|
|
166
170
|
this.queues.delete(entry.sessionKey);
|
|
167
171
|
entry.disposeAbortListener?.();
|
|
168
|
-
this.
|
|
172
|
+
this.clearQueuedFeedback(entry);
|
|
169
173
|
entry.reject(inboundAbortReason(entry.sessionKey, entry.signal?.reason));
|
|
170
174
|
}
|
|
175
|
+
clearQueuedFeedback(entry) {
|
|
176
|
+
for (const commMessage of entry.queuedFeedbackMessages) {
|
|
177
|
+
this.activityEmitter.emitQueuedClear(commMessage, entry.sessionKey);
|
|
178
|
+
}
|
|
179
|
+
entry.queuedFeedbackMessages.length = 0;
|
|
180
|
+
}
|
|
171
181
|
}
|
|
172
182
|
function inboundAbortReason(sessionKey, reason) {
|
|
173
183
|
if (reason instanceof Error && reason.name !== 'AbortError')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-turn-queue.js","sourceRoot":"","sources":["../../src/turn/inbound-turn-queue.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAChD,YAAY,UAAkB;QAC5B,KAAK,CAAC,6CAA6C,UAAU,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IAClD,YAAY,UAAkB,EAAE,MAAgB;QAC9C,KAAK,CAAC,+CAA+C,UAAU,EAAE,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACzH,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC1C,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"inbound-turn-queue.js","sourceRoot":"","sources":["../../src/turn/inbound-turn-queue.ts"],"names":[],"mappings":"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"}
|
package/lib/turn/index.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export { persistDeferredWorkerResultToContext } from './persist-deferred-context
|
|
|
35
35
|
export { persistSubagentResultToContext } from './persist-subagent-context.js';
|
|
36
36
|
export { computeDeferredDelta } from './turn-deferred-delta.js';
|
|
37
37
|
export { DeferredTurnState } from './deferred-turn-state.js';
|
|
38
|
-
export {
|
|
38
|
+
export { getTurnActiveSkills, runInTurnContext, appendActiveSkills, } from './turn-context-bridge.js';
|
|
39
39
|
export type { TurnContextBridgeState } from './turn-context-bridge.js';
|
|
40
40
|
export { TaskContinuationManager, decomposeTask, getContinuationManager, initContinuationManager, } from './task-continuation.js';
|
|
41
41
|
export type { TaskStatus, TaskProgress, TaskDecomposition, } from './task-continuation.js';
|
package/lib/turn/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,YAAY,EACZ,cAAc,EACd,eAAe,EACf,YAAY,EACZ,uBAAuB,EACvB,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,eAAe,EACf,SAAS,EACT,SAAS,EACT,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEjF,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"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"}
|
package/lib/turn/index.js
CHANGED
|
@@ -26,6 +26,6 @@ export { persistDeferredWorkerResultToContext } from './persist-deferred-context
|
|
|
26
26
|
export { persistSubagentResultToContext } from './persist-subagent-context.js';
|
|
27
27
|
export { computeDeferredDelta } from './turn-deferred-delta.js';
|
|
28
28
|
export { DeferredTurnState } from './deferred-turn-state.js';
|
|
29
|
-
export {
|
|
29
|
+
export { getTurnActiveSkills, runInTurnContext, appendActiveSkills, } from './turn-context-bridge.js';
|
|
30
30
|
export { TaskContinuationManager, decomposeTask, getContinuationManager, initContinuationManager, } from './task-continuation.js';
|
|
31
31
|
//# sourceMappingURL=index.js.map
|
package/lib/turn/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AA4B3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/turn/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,mBAAmB,CAAC;AA4B3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,QAAQ,EACR,WAAW,EACX,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,4BAA4B,EAC5B,2BAA2B,EAC3B,0BAA0B,EAC1B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEzF,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,aAAa,EACb,YAAY,EACZ,eAAe,EACf,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAE5H,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import type { ZhinAgentConfig } from '../config/index.js';
|
|
2
2
|
export interface TurnContextBridgeState {
|
|
3
|
-
pendingActivityFeedbackEligible?: boolean;
|
|
4
3
|
alwaysSkillsBaseline: string;
|
|
5
4
|
}
|
|
6
5
|
/** Explicit turn state used by concurrency-safe entry points. */
|
|
7
6
|
export interface TurnContextRunOptions {
|
|
8
7
|
readonly activityFeedbackEligible?: boolean;
|
|
9
8
|
}
|
|
10
|
-
export declare function initInboundTurnContext(state: TurnContextBridgeState): void;
|
|
11
9
|
export declare function getTurnActiveSkills(state: TurnContextBridgeState): string;
|
|
12
10
|
export declare function runInTurnContext<T>(state: TurnContextBridgeState, config: Required<ZhinAgentConfig>, turnId: string, fn: () => Promise<T>, options?: TurnContextRunOptions): Promise<T>;
|
|
13
11
|
export declare function appendActiveSkills(fragment: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-context-bridge.d.ts","sourceRoot":"","sources":["../../src/turn/turn-context-bridge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,MAAM,WAAW,sBAAsB;IACrC
|
|
1
|
+
{"version":3,"file":"turn-context-bridge.d.ts","sourceRoot":"","sources":["../../src/turn/turn-context-bridge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,MAAM,WAAW,sBAAsB;IACrC,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,iEAAiE;AACjE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CAC7C;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM,CAIzE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,KAAK,EAAE,sBAAsB,EAC7B,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,EACjC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,CAAC,CAAC,CAKZ;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAEzD"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { appendTurnActiveSkills, getTurnActiveSkillsFromContext, runInTurnContext as runInTurnContextAls } from '../internal/turn-context.js';
|
|
2
2
|
import { TurnTracker } from './turn-tracker.js';
|
|
3
|
-
export function initInboundTurnContext(state) {
|
|
4
|
-
state.pendingActivityFeedbackEligible = true;
|
|
5
|
-
}
|
|
6
3
|
export function getTurnActiveSkills(state) {
|
|
7
4
|
const fromTurn = getTurnActiveSkillsFromContext();
|
|
8
5
|
if (fromTurn)
|
|
@@ -11,12 +8,8 @@ export function getTurnActiveSkills(state) {
|
|
|
11
8
|
}
|
|
12
9
|
export function runInTurnContext(state, config, turnId, fn, options) {
|
|
13
10
|
const tracker = new TurnTracker(config.subagentTurnWaitMs);
|
|
14
|
-
const activityFeedbackEligible = options?.activityFeedbackEligible
|
|
15
|
-
?? state.pendingActivityFeedbackEligible;
|
|
16
|
-
if (options?.activityFeedbackEligible === undefined)
|
|
17
|
-
state.pendingActivityFeedbackEligible = undefined;
|
|
18
11
|
const init = {};
|
|
19
|
-
if (activityFeedbackEligible)
|
|
12
|
+
if (options?.activityFeedbackEligible === true)
|
|
20
13
|
init.activityFeedbackEligible = true;
|
|
21
14
|
return runInTurnContextAls(turnId, tracker, fn, Object.keys(init).length ? init : undefined);
|
|
22
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-context-bridge.js","sourceRoot":"","sources":["../../src/turn/turn-context-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,gBAAgB,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC9I,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"turn-context-bridge.js","sourceRoot":"","sources":["../../src/turn/turn-context-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,8BAA8B,EAAE,gBAAgB,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAC9I,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAWhD,MAAM,UAAU,mBAAmB,CAAC,KAA6B;IAC/D,MAAM,QAAQ,GAAG,8BAA8B,EAAE,CAAC;IAClD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,OAAO,KAAK,CAAC,oBAAoB,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,KAA6B,EAC7B,MAAiC,EACjC,MAAc,EACd,EAAoB,EACpB,OAA+B;IAE/B,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAsG,EAAE,CAAC;IACnH,IAAI,OAAO,EAAE,wBAAwB,KAAK,IAAI;QAAE,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;IACrF,OAAO,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC/F,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB;IACjD,sBAAsB,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { OutputElement, Usage } from '@zhin.js/ai';
|
|
2
2
|
import type { ApprovalPort } from '../session/approval-port.js';
|
|
3
3
|
import type { PermissionSubject } from '@zhin.js/permission';
|
|
4
|
-
import type { ToolInvocationOrigin, ToolQuestionPort } from '@zhin.js/tool';
|
|
4
|
+
import type { ToolInvocationContext, ToolInvocationOrigin, ToolQuestionPort } from '@zhin.js/tool';
|
|
5
5
|
import type { ScheduleJobCreator, ScheduleJobExecutionPlan } from '../assistant/types.js';
|
|
6
6
|
import type { ConversationContextBlock } from '@zhin.js/im-contract';
|
|
7
7
|
export type TurnScope = 'private' | 'group' | 'channel';
|
|
@@ -165,6 +165,8 @@ export interface TurnPorts {
|
|
|
165
165
|
readonly question?: ToolQuestionPort;
|
|
166
166
|
readonly references?: ReferencePort;
|
|
167
167
|
readonly conversationContext?: ConversationContextPort;
|
|
168
|
+
/** Runtime-only native Client capability; absent for detached/scheduled turns. */
|
|
169
|
+
readonly client?: NonNullable<ToolInvocationContext['client']>;
|
|
168
170
|
}
|
|
169
171
|
/** Ports supplied by an ingress adapter; Journal authority is injected by AgentRuntime. */
|
|
170
172
|
export type TurnRequestPorts = Omit<TurnPorts, 'journal'>;
|