@downcity/agent 1.1.401 → 1.1.408
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 +4 -3
- package/bin/agent/WorkspaceEntry.js +1 -1
- package/bin/agent/WorkspaceEntry.js.map +1 -1
- package/bin/city/types/PluginHostContext.d.ts +3 -0
- package/bin/city/types/PluginHostContext.d.ts.map +1 -1
- package/bin/executor/core-engine/CoreEngineError.js +8 -2
- package/bin/executor/core-engine/CoreEngineError.js.map +1 -1
- package/bin/executor/core-engine/CoreEngineRunner.d.ts.map +1 -1
- package/bin/executor/core-engine/CoreEngineRunner.js +36 -0
- package/bin/executor/core-engine/CoreEngineRunner.js.map +1 -1
- package/bin/executor/model/ModelGenerate.d.ts.map +1 -1
- package/bin/executor/model/ModelGenerate.js +2 -1
- package/bin/executor/model/ModelGenerate.js.map +1 -1
- package/bin/executor/model/ModelStepRunner.d.ts +2 -0
- package/bin/executor/model/ModelStepRunner.d.ts.map +1 -1
- package/bin/executor/model/ModelStepRunner.js +33 -7
- package/bin/executor/model/ModelStepRunner.js.map +1 -1
- package/bin/executor/model/ModelStreamFailure.d.ts +22 -0
- package/bin/executor/model/ModelStreamFailure.d.ts.map +1 -0
- package/bin/executor/model/ModelStreamFailure.js +35 -0
- package/bin/executor/model/ModelStreamFailure.js.map +1 -0
- package/bin/group/GroupDispatchSession.d.ts +36 -0
- package/bin/group/GroupDispatchSession.d.ts.map +1 -0
- package/bin/group/GroupDispatchSession.js +154 -0
- package/bin/group/GroupDispatchSession.js.map +1 -0
- package/bin/group/GroupSession.d.ts +3 -1
- package/bin/group/GroupSession.d.ts.map +1 -1
- package/bin/group/GroupSession.js +65 -28
- package/bin/group/GroupSession.js.map +1 -1
- package/bin/index.d.ts +2 -0
- package/bin/index.d.ts.map +1 -1
- package/bin/index.js.map +1 -1
- package/bin/session/messages/SessionAssistantMessageWriter.d.ts.map +1 -1
- package/bin/session/messages/SessionAssistantMessageWriter.js +10 -6
- package/bin/session/messages/SessionAssistantMessageWriter.js.map +1 -1
- package/bin/types/group/DispatchStrategy.d.ts +3 -0
- package/bin/types/group/DispatchStrategy.d.ts.map +1 -1
- package/bin/types/group/DispatchStrategy.js +66 -18
- package/bin/types/group/DispatchStrategy.js.map +1 -1
- package/bin/types/group/GroupDispatchSession.d.ts +65 -0
- package/bin/types/group/GroupDispatchSession.d.ts.map +1 -0
- package/bin/types/group/GroupDispatchSession.js +8 -0
- package/bin/types/group/GroupDispatchSession.js.map +1 -0
- package/bin/types/group/GroupSession.d.ts +2 -0
- package/bin/types/group/GroupSession.d.ts.map +1 -1
- package/bin/types/group/GroupSessionStore.d.ts +6 -1
- package/bin/types/group/GroupSessionStore.d.ts.map +1 -1
- package/bin/types/plugin/PluginNotification.d.ts +31 -0
- package/bin/types/plugin/PluginNotification.d.ts.map +1 -0
- package/bin/types/plugin/PluginNotification.js +8 -0
- package/bin/types/plugin/PluginNotification.js.map +1 -0
- package/bin/workspace/store/LocalGroupDispatchSessionDataStore.d.ts +28 -0
- package/bin/workspace/store/LocalGroupDispatchSessionDataStore.d.ts.map +1 -0
- package/bin/workspace/store/LocalGroupDispatchSessionDataStore.js +102 -0
- package/bin/workspace/store/LocalGroupDispatchSessionDataStore.js.map +1 -0
- package/bin/workspace/store/LocalGroupSessionDataStore.d.ts +2 -0
- package/bin/workspace/store/LocalGroupSessionDataStore.d.ts.map +1 -1
- package/bin/workspace/store/LocalGroupSessionDataStore.js +25 -8
- package/bin/workspace/store/LocalGroupSessionDataStore.js.map +1 -1
- package/city-test/group.test.mjs +252 -1
- package/package.json +4 -4
- package/scripts/agent-multi-workspace.test.mjs +67 -0
- package/scripts/core-engine-context-compaction.test.mjs +49 -0
- package/scripts/core-engine-model-stream.test.mjs +69 -0
- package/src/agent/WorkspaceEntry.ts +1 -1
- package/src/city/types/PluginHostContext.ts +4 -0
- package/src/executor/core-engine/CoreEngineError.ts +8 -2
- package/src/executor/core-engine/CoreEngineRunner.ts +44 -0
- package/src/executor/model/ModelGenerate.ts +3 -1
- package/src/executor/model/ModelStepRunner.ts +36 -5
- package/src/executor/model/ModelStreamFailure.ts +44 -0
- package/src/group/GroupDispatchSession.ts +175 -0
- package/src/group/GroupSession.ts +83 -28
- package/src/index.ts +10 -0
- package/src/session/messages/SessionAssistantMessageWriter.ts +9 -5
- package/src/types/group/DispatchStrategy.ts +79 -19
- package/src/types/group/GroupDispatchSession.ts +80 -0
- package/src/types/group/GroupSession.ts +2 -0
- package/src/types/group/GroupSessionStore.ts +6 -1
- package/src/types/plugin/PluginNotification.ts +38 -0
- package/src/workspace/store/LocalGroupDispatchSessionDataStore.ts +118 -0
- package/src/workspace/store/LocalGroupSessionDataStore.ts +35 -9
- package/tsconfig.tsbuildinfo +1 -1
package/README.md
CHANGED
|
@@ -36,14 +36,15 @@ Session ID 由 `agent.sessions.create()` 内部生成;创建接口不接受调
|
|
|
36
36
|
`session_id`。恢复已有 Session 时使用 `agent.sessions.get(session_id)`,如果该
|
|
37
37
|
Session 创建时绑定了 Workspace,恢复时必须传入同一个 Workspace。
|
|
38
38
|
|
|
39
|
-
Group 是和 Agent 并列的可联系主体。Group 持有自己的模型,默认通过 AI 调度器识别消息意图、选择成员和生成当前最佳响应图;没有模型或模型调用失败时,GroupSession 会记录明确的调度失败,不会静默使用另一套规则。需要自定义行为时可显式提供 `dispatch_strategy`。普通群聊消息是否投递给一个或多个成员完全由 Group.model
|
|
39
|
+
Group 是和 Agent 并列的可联系主体。Group 持有自己的模型,默认通过 AI 调度器识别消息意图、选择成员和生成当前最佳响应图;没有模型或模型调用失败时,GroupSession 会记录明确的调度失败,不会静默使用另一套规则。需要自定义行为时可显式提供 `dispatch_strategy`,异步策略应响应输入中的 `abort_signal`。普通群聊消息是否投递给一个或多个成员完全由 Group.model 决定。每个 GroupSession 拥有唯一的内部 Dispatch Session,调度 Turn 会排队并持久化;AI 调度在同一 Turn 内通过强制的 `dispatch_group` tool call 提交 `steps` 和 `next`,协议输出无效时会先要求模型纠正,再由 SDK 编译为内部执行图。
|
|
40
40
|
|
|
41
41
|
`steps` 是二维数组:外层阶段按顺序执行,同一阶段数组内的成员并行执行;同一个成员可以出现在不同阶段,表示它在拓扑中再次参与。例如 `[["architect"], ["developer"], ["architect"], ["reviewer"]]` 表示 architect 的回复先交给 developer,再交回 architect,最后交给 reviewer。空数组配合 `next: "stop"` 表示本次不投递成员。
|
|
42
42
|
并通过 `group.sessions.create()` 创建独立的群聊上下文。消息和传播属于 GroupSession;
|
|
43
43
|
成员执行仍通过成员 Agent 的 `AgentSessions` 完成。`prompt()` 立即返回消息回执并异步启动 user dispatch;GroupSession 只运行一个全局 auto dispatch,在当前成员执行完成后统一决定是否扩展响应图。成员运行态可通过
|
|
44
44
|
`subscribe()` 统一订阅共享消息和 Group/成员运行态;Session metadata 会记录 Group 与
|
|
45
|
-
GroupSession
|
|
46
|
-
|
|
45
|
+
GroupSession 来源。Dispatch Session 的 Turn 日志与传播检查点都会写入 City Storage;
|
|
46
|
+
进程中断后可以根据调度阶段重新执行尚未完成的 user dispatch 或继续 auto dispatch。
|
|
47
|
+
`GroupSession.stop()` 会同时中断调度模型和成员 Session。`group.sessions.list()` 返回轻量摘要,
|
|
47
48
|
`group.sessions.get(id)` 恢复完整上下文。
|
|
48
49
|
|
|
49
50
|
## 根目录结构
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkspaceEntry.js","sourceRoot":"","sources":["../../src/agent/WorkspaceEntry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WorkspaceEntry.js","sourceRoot":"","sources":["../../src/agent/WorkspaceEntry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAM5E,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EACL,+BAA+B,GAEhC,MAAM,oDAAoD,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAE/I,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;AAE3E,2CAA2C;AAC3C,SAAS,+BAA+B,CACtC,MAA4B,EAC5B,WAAmB;IAEnB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5C,IAAI,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,8BAA8B,SAAS,qCAAqC,WAAW,GAAG,CAAC,CAAC;QAC9G,CAAC;IACH,CAAC;AACH,CAAC;AAED,+BAA+B;AAC/B,SAAS,cAAc,CACrB,MAA4B,EAC5B,MAA4B,EAC5B,WAAmB;IAEnB,KAAK,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClE,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,8BAA8B,SAAS,UAAU,WAAW,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,CAAC,SAAS,CAAC,GAAG,eAAe,CAAC;IACtC,CAAC;AACH,CAAC;AAED,qCAAqC;AACrC,MAAM,OAAO,cAAc;IACzB,sBAAsB;IACb,KAAK,CAAiC;IAC/C,oBAAoB;IACX,SAAS,CAAqC;IACvD,uBAAuB;IACd,YAAY,CAAS;IAC9B,+BAA+B;IACtB,KAAK,CAAuB;IACrC,iDAAiD;IACxC,OAAO,CAAe;IAC/B;;;OAGG;IACM,QAAQ,CAAyB;IAC1C,yCAAyC;IAChC,SAAS,CAAS;IAEV,OAAO,CAAgB;IACvB,MAAM,CAAS;IACf,eAAe,CAAa;IAC5B,mBAAmB,CAAa;IAChC,OAAO,CAAe;IACtB,eAAe,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC5D,aAAa,CAAiB;IAEtC,YAAY,OAA8B;QACxC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,OAAO,GAAiB,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC;gBACzB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;gBAC9B,8CAA8C;gBAC9C,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;aAC/B,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE;YACzD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACvB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;QAEH,IAAI,kBAA4C,CAAC;QACjD,MAAM,aAAa,GAAG;YACpB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACvB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACnC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK;YAC3B,UAAU,EAAE,OAAO,CAAC,KAAK;YACzB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;YAClC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YACjD,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;YACrD,WAAW,EAAE,GAAG,EAAE;gBAChB,IAAI,CAAC,kBAAkB;oBAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;gBACvF,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YACD,YAAY,EAAE,GAAG,EAAE;gBACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;YACvB,CAAC;SACoD,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,sBAAsB,CAC/C,IAAI,CAAC,OAAO,EACZ,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,aAAa,CAAC,CACrE,CAAC;QACF,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAC;QAElC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,+BAA+B,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QACxE,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAC/E,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QACnE,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC7F,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAE1E,IAAI,CAAC,QAAQ,GAAG;YACd,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;YAC1G,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5H,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5G,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACvB,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBACvE,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAClD,CAAC;YACD,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;YACpH,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE;YACpE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;YAChE,0BAA0B,EAAE,GAAG,EAAE,CAAE,IAAI,CAAC,KAAK,CAAC,QAA0B,CAAC,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC;YACtH,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBAC3B,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBACzE,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACtD,CAAC;YACD,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACnC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;gBACzE,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC9D,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,EAAE;YACzD,IAAI,CAAC,KAAK,CAAC,QAA0B,CAAC,aAAa,CAClD,EAAE,GAAG,GAAG,EAAE,EACV,WAAW,EAAE,EACb,IAAI,CAAC,YAAY,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,EAAE;YAChF,KAAK,MAAM,SAAS,IAAI,0BAA0B;gBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACjF,cAAc,CACZ,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAC9C,gBAAgB,CACjB,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,QAA0B,CAAC,iBAAiB,CAAC;gBACvD,UAAU,EAAE,WAAW,EAAE;gBACzB,KAAK,EAAE,gBAAgB,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE;gBACnD,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;gBAChE,YAAY,EAAE,IAAI,CAAC,YAAY;aAChC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB;IACnB,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IACvB,CAAC;IAED,8BAA8B;IAC9B,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;IAC9B,CAAC;IAED,2BAA2B;IAC3B,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,gCAAgC;IAChC,kBAAkB;QAChB,OAAO,kBAAkB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,+CAA+C;IAC/C,2BAA2B,CAAC,GAAS;QACnC,2BAA2B,CAAC;YAC1B,GAAG;YACH,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC;YAClG,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,EAAE;iBAC5C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;iBAChE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC;SACvC,CAAC,CAAC;IACL,CAAC;IAED,4CAA4C;IAC5C,KAAK,CAAC,uBAAuB,CAAC,KAG7B;QACC,OAAO,MAAM,+BAA+B,CAAC;YAC3C,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACjC,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,MAAM;YAChC,qBAAqB,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YACzD,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;IACL,CAAC;IAED,wCAAwC;IACxC,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,aAAa,KAAK,CAAC,KAAK,IAAI,EAAE;YACjC,MAAM,MAAM,GAAc,EAAE,CAAC;YAC7B,MAAM,aAAa,GAAsC;gBACvD,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;gBAC5B,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAChC,KAAK,IAAI,EAAE,CAAC,MAAO,IAAI,CAAC,KAAK,CAAC,QAA0B,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC;gBACnG,GAAG,EAAE,CAAE,IAAI,CAAC,KAAK,CAAC,QAA0B,CAAC,wBAAwB,CAAC,IAAI,CAAC,YAAY,CAAC;gBACxF,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;gBAC7C,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;aACtF,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE,CAAC;gBACpC,IAAI,CAAC;oBACH,MAAM,OAAO,EAAE,CAAC;gBAClB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;YACD,uBAAuB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YAC7D,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,cAAc,CAAC,MAAM,EAAE,kCAAkC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAED,0DAA0D;IAC1D,WAAW;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,0CAA0C;IAC1C,mBAAmB;QASjB,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACnC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;YACjD,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;YAChF,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAC7B,CAAC;IACJ,CAAC;IAED,wCAAwC;IAChC,kBAAkB,CACxB,WAAmB,EACnB,KAAkD;QAElD,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,MAAM,YAAY,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC;QACxC,MAAM,OAAO,GAAG,qBAAqB,CAAC;YACpC,GAAG,KAAK;YACR,SAAS,EAAE,YAAY,CAAC,SAAS;YACjC,UAAU,EAAE,YAAY;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* - Agent 不反向依赖 City,也不读取 Plugin 安装目录。
|
|
9
9
|
*/
|
|
10
10
|
import type { JsonObject, Logger } from "../../index.js";
|
|
11
|
+
import type { PluginNotificationPublisher } from "../../types/plugin/PluginNotification.js";
|
|
11
12
|
/** City 可以为未来宿主能力增加的显式扩展集合。 */
|
|
12
13
|
export type PluginHostExtensions = Readonly<Record<string, unknown>>;
|
|
13
14
|
/** Agent Plugin factory 的宿主装配上下文。 */
|
|
@@ -20,6 +21,8 @@ export interface PluginHostContext {
|
|
|
20
21
|
readonly data_path: string;
|
|
21
22
|
/** City 提供的宿主日志器。 */
|
|
22
23
|
readonly logger: Logger;
|
|
24
|
+
/** 宿主可选提供的通知发布能力;不支持通知的宿主省略。 */
|
|
25
|
+
readonly notifications?: PluginNotificationPublisher;
|
|
23
26
|
/** City 为未来宿主能力保留的显式扩展区。 */
|
|
24
27
|
readonly extensions: PluginHostExtensions;
|
|
25
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginHostContext.d.ts","sourceRoot":"","sources":["../../../src/city/types/PluginHostContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"PluginHostContext.d.ts","sourceRoot":"","sources":["../../../src/city/types/PluginHostContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAExF,+BAA+B;AAC/B,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAErE,qCAAqC;AACrC,MAAM,WAAW,iBAAiB;IAChC,wBAAwB;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,mCAAmC;IACnC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAE7B,kDAAkD;IAClD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,qBAAqB;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,gCAAgC;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,2BAA2B,CAAC;IAErD,4BAA4B;IAC5B,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;CAC3C;AAED,+CAA+C;AAC/C,MAAM,WAAW,iBAAiB,CAAC,MAAM,GAAG,OAAO;IACjD,2CAA2C;IAC3C,QAAQ,CAAC,OAAO,EAAE,CAChB,OAAO,EAAE,iBAAiB,KACvB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B"}
|
|
@@ -24,11 +24,17 @@ export function summarize_stream_error(error) {
|
|
|
24
24
|
* 提取实际应返回给上层的错误文本。
|
|
25
25
|
*/
|
|
26
26
|
export function resolve_effective_core_engine_error(params) {
|
|
27
|
-
const outerError =
|
|
28
|
-
const innerError =
|
|
27
|
+
const outerError = read_error_message(params.error);
|
|
28
|
+
const innerError = read_error_message(params.streamError);
|
|
29
29
|
if (/AI_NoOutputGeneratedError|No output generated/i.test(outerError) && innerError) {
|
|
30
30
|
return innerError;
|
|
31
31
|
}
|
|
32
32
|
return outerError || innerError || "Unknown execution error";
|
|
33
33
|
}
|
|
34
|
+
/** 读取适合向上层展示的错误正文,避免泄漏内部 Error class 名称。 */
|
|
35
|
+
function read_error_message(error) {
|
|
36
|
+
if (error instanceof Error)
|
|
37
|
+
return error.message.trim();
|
|
38
|
+
return String(error ?? "").trim();
|
|
39
|
+
}
|
|
34
40
|
//# sourceMappingURL=CoreEngineError.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineError.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineError.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,MAAM,MAAM,GACV,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzD,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;QACpB,IAAI,EAAE,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;QAC1D,OAAO,EAAE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACnE,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;KAClD,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mCAAmC,CAAC,MASnD;IACC,MAAM,UAAU,GAAG,
|
|
1
|
+
{"version":3,"file":"CoreEngineError.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineError.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,MAAM,MAAM,GACV,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzD,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;QACpB,IAAI,EAAE,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;QAC1D,OAAO,EAAE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACnE,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;KAClD,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mCAAmC,CAAC,MASnD;IACC,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1D,IAAI,gDAAgD,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,EAAE,CAAC;QACpF,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,OAAO,UAAU,IAAI,UAAU,IAAI,yBAAyB,CAAC;AAC/D,CAAC;AAED,4CAA4C;AAC5C,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,KAAK,YAAY,KAAK;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACxD,OAAO,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"CoreEngineRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAkChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,qCAAqC,CAAC;AAgB7C,UAAU,uBAAuB;IAC/B,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,uBAAuB,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CACtD;AAED,UAAU,mBAAmB;IAC3B;;OAEG;IACH,aAAa,EAAE,yBAAyB,CAAC;IAEzC;;OAEG;IACH,KAAK,EAAE,WAAW,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,kBAAkB,CAAC;IAEjC;;OAEG;IACH,mBAAmB,EAAE,MAAM,OAAO,CAAC;QACjC,6BAA6B;QAC7B,KAAK,EAAE,WAAW,CAAC;QACnB,2CAA2C;QAC3C,MAAM,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAC5C,+BAA+B;QAC/B,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAC1C,qCAAqC;QACrC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC,CAAC;IAEH,sDAAsD;IACtD,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,4BAA4B;QAC5B,QAAQ,EAAE,YAAY,EAAE,CAAC;QACzB,iCAAiC;QACjC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAqD;IAE7F,0CAA0C;IAC1C,OAAO,CAAC,+BAA+B,CAAM;gBAEjC,OAAO,EAAE,uBAAuB;IAS5C;;OAEG;IACG,OAAO,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,0BAA0B,CAAC;CA+Z/E"}
|
|
@@ -11,12 +11,17 @@ import { MAX_INCOMPLETE_RESPONSE_RECOVERIES, MAX_TOOL_LOOP_STEPS, build_incomple
|
|
|
11
11
|
import { evaluate_core_engine_loop_decision, should_continue_for_tail_merged_user_messages, } from "./CoreEngineLoopDecision.js";
|
|
12
12
|
import { resolve_effective_core_engine_error, summarize_stream_error, } from "./CoreEngineError.js";
|
|
13
13
|
import { run_model_step, } from "../model/ModelStepRunner.js";
|
|
14
|
+
import { is_retryable_empty_model_stream_failure } from "../model/ModelStreamFailure.js";
|
|
14
15
|
import { CoreEngineMessageState } from "./CoreEngineMessageState.js";
|
|
15
16
|
import { deep_compact_model_messages, resolve_model_usage_ratio, should_compact_after_usage, } from "./CoreEngineContextCompaction.js";
|
|
16
17
|
import { to_session_json_value } from "../../session/messages/SessionJsonValue.js";
|
|
17
18
|
const TURN_STOPPED_MESSAGE = "Turn stopped";
|
|
18
19
|
/** Provider context-length error 在当前 step 内最多压缩重试三次。 */
|
|
19
20
|
const MAX_CONTEXT_ERROR_COMPACTION_RETRIES = 3;
|
|
21
|
+
/** 无任何可见输出时,临时 Provider 流错误的最大自动重试次数。 */
|
|
22
|
+
const MAX_EMPTY_STREAM_RETRIES = 2;
|
|
23
|
+
/** 无输出流错误的重试退避,避免立即重复冲击同一 Provider。 */
|
|
24
|
+
const EMPTY_STREAM_RETRY_DELAYS_MS = [300, 1_000];
|
|
20
25
|
/**
|
|
21
26
|
* 模型与 tool-loop 主循环执行器。
|
|
22
27
|
*/
|
|
@@ -74,6 +79,7 @@ export class CoreEngineRunner {
|
|
|
74
79
|
};
|
|
75
80
|
let incomplete_response_recovery_count = 0;
|
|
76
81
|
let context_error_compaction_retries = 0;
|
|
82
|
+
let empty_stream_retry_count = 0;
|
|
77
83
|
let compact_pending = false;
|
|
78
84
|
let compact_validation_pending = Boolean(persisted_compaction_summary_id &&
|
|
79
85
|
persisted_compaction_summary_id !==
|
|
@@ -159,6 +165,19 @@ export class CoreEngineRunner {
|
|
|
159
165
|
input.turn_context.output.assistant) {
|
|
160
166
|
await input.turn_context.output.assistant.abort_step();
|
|
161
167
|
}
|
|
168
|
+
if (is_retryable_empty_model_stream_failure(error) &&
|
|
169
|
+
empty_stream_retry_count < MAX_EMPTY_STREAM_RETRIES) {
|
|
170
|
+
empty_stream_retry_count += 1;
|
|
171
|
+
await this.logger.log("warn", "[agent] model_stream.retry", {
|
|
172
|
+
session_id,
|
|
173
|
+
retry_count: empty_stream_retry_count,
|
|
174
|
+
error_code: error.code,
|
|
175
|
+
error: error.message,
|
|
176
|
+
provider_request_id: error.provider_request_id ?? null,
|
|
177
|
+
});
|
|
178
|
+
await wait_for_stream_retry(EMPTY_STREAM_RETRY_DELAYS_MS[empty_stream_retry_count - 1] ?? 1_000, input.turn_context.lifecycle.abort_signal);
|
|
179
|
+
continue;
|
|
180
|
+
}
|
|
162
181
|
const compact_error = this.should_compact_on_error(error)
|
|
163
182
|
? error
|
|
164
183
|
: last_observed_stream_error;
|
|
@@ -186,6 +205,7 @@ export class CoreEngineRunner {
|
|
|
186
205
|
throw error;
|
|
187
206
|
}
|
|
188
207
|
context_error_compaction_retries = 0;
|
|
208
|
+
empty_stream_retry_count = 0;
|
|
189
209
|
const last_step = executed_steps[executed_steps.length - 1];
|
|
190
210
|
if (!last_step)
|
|
191
211
|
break;
|
|
@@ -360,6 +380,22 @@ export class CoreEngineRunner {
|
|
|
360
380
|
}
|
|
361
381
|
}
|
|
362
382
|
}
|
|
383
|
+
/** 等待下一次模型流重试,并在 Turn 停止时立即结束等待。 */
|
|
384
|
+
async function wait_for_stream_retry(delay_ms, abort_signal) {
|
|
385
|
+
if (abort_signal.aborted)
|
|
386
|
+
throw abort_signal.reason;
|
|
387
|
+
await new Promise((resolve, reject) => {
|
|
388
|
+
const timer = setTimeout(() => {
|
|
389
|
+
abort_signal.removeEventListener("abort", on_abort);
|
|
390
|
+
resolve();
|
|
391
|
+
}, delay_ms);
|
|
392
|
+
const on_abort = () => {
|
|
393
|
+
clearTimeout(timer);
|
|
394
|
+
reject(abort_signal.reason);
|
|
395
|
+
};
|
|
396
|
+
abort_signal.addEventListener("abort", on_abort, { once: true });
|
|
397
|
+
});
|
|
398
|
+
}
|
|
363
399
|
/** 在工具执行前接入 Session canonical Interaction 生命周期。 */
|
|
364
400
|
async function resolve_tool_approval(input) {
|
|
365
401
|
const needs_approval = input.tool.needs_approval;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEngineRunner.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CoreEngineRunner.js","sourceRoot":"","sources":["../../../src/executor/core-engine/CoreEngineRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelGenerate.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAGxB,mBAAmB;AACnB,MAAM,WAAW,mBAAmB;IAClC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,+BAA+B;AAC/B,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"ModelGenerate.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAGxB,mBAAmB;AACnB,MAAM,WAAW,mBAAmB;IAClC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,+BAA+B;AAC/B,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,mBAAmB,CAAC,CA6B9B;AAED,+BAA+B;AAC/B,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAOxF"}
|
|
@@ -29,8 +29,9 @@ export async function generate_model(model, call, signal) {
|
|
|
29
29
|
}
|
|
30
30
|
else if (event.type === "tool_call_finish") {
|
|
31
31
|
const tool = tools.get(event.content_id);
|
|
32
|
-
if (tool)
|
|
32
|
+
if (tool && !event.input_error) {
|
|
33
33
|
tool_calls.push({ type: "tool_call", ...tool, input: event.input });
|
|
34
|
+
}
|
|
34
35
|
}
|
|
35
36
|
else if (event.type === "model_usage")
|
|
36
37
|
usage = event.usage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelGenerate.js","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AActD,+BAA+B;AAC/B,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAkB,EAClB,IAAe,EACf,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuD,CAAC;IAC7E,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,aAA4C,CAAC;IACjD,IAAI,KAA6B,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAC7C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvE,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY;YAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;aACjE,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACrC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YACzF,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC;QACtB,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAC5C,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QAChG,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"ModelGenerate.js","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelStepRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAGL,KAAK,WAAW,EAEhB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,UAAU,EACf,KAAK,WAAW,IAAI,IAAI,EAEzB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EACV,2BAA2B,EAE5B,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"ModelStepRunner.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAGL,KAAK,WAAW,EAEhB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,YAAY,EAGjB,KAAK,UAAU,EACf,KAAK,WAAW,IAAI,IAAI,EAEzB,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EACV,2BAA2B,EAE5B,MAAM,mCAAmC,CAAC;AAG3C,mBAAmB;AACnB,MAAM,WAAW,iBAAiB;IAChC,eAAe;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,KAAK,EAAE,cAAc,CAAC;IACtB,2BAA2B;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,mBAAmB;AACnB,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,gBAAgB;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,+BAA+B;AAC/B,MAAM,WAAW,eAAe;IAC9B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,qBAAqB;IACrB,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,qBAAqB;IACrB,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,uBAAuB;IACvB,QAAQ,EAAE;QAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;KAAE,CAAC;IACvC,oBAAoB;IACpB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACzC;AAED,uBAAuB;AACvB,MAAM,WAAW,iBAAiB;IAChC,sBAAsB;IACtB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB;IACpB,MAAM,EAAE,oBAAoB,EAAE,CAAC;IAC/B,eAAe;IACf,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,cAAc;IACd,YAAY,EAAE,WAAW,CAAC;IAC1B,gCAAgC;IAChC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,kBAAkB;IAClB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAED,qCAAqC;AACrC,wBAAsB,cAAc,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC;IACtE,2CAA2C;IAC3C,eAAe,EAAE,2BAA2B,EAAE,CAAC;IAC/C,qBAAqB;IACrB,WAAW,EAAE,eAAe,CAAC;CAC9B,CAAC,CA4DD"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { ModelStreamValidator, } from "@downcity/type";
|
|
8
8
|
import { z } from "zod";
|
|
9
|
+
import { ModelStreamFailure } from "./ModelStreamFailure.js";
|
|
9
10
|
/** 执行一个 Downcity 模型 Step 并收敛工具结果。 */
|
|
10
11
|
export async function run_model_step(input) {
|
|
11
12
|
const call = {
|
|
@@ -73,8 +74,11 @@ class StepEventCollector {
|
|
|
73
74
|
text = "";
|
|
74
75
|
/** 消费单个标准模型事件。 */
|
|
75
76
|
accept(event) {
|
|
76
|
-
if (event.type === "model_error")
|
|
77
|
-
throw new
|
|
77
|
+
if (event.type === "model_error") {
|
|
78
|
+
throw new ModelStreamFailure(event.error, this.text.length > 0 ||
|
|
79
|
+
this.reasoning_by_id.size > 0 ||
|
|
80
|
+
this.tool_by_content_id.size > 0);
|
|
81
|
+
}
|
|
78
82
|
if (event.type === "text_start") {
|
|
79
83
|
this.text_by_id.set(event.content_id, "");
|
|
80
84
|
}
|
|
@@ -126,6 +130,8 @@ class StepEventCollector {
|
|
|
126
130
|
const tool = this.tool_by_content_id.get(event.content_id);
|
|
127
131
|
if (tool) {
|
|
128
132
|
tool.input = event.input;
|
|
133
|
+
if (event.input_error)
|
|
134
|
+
tool.input_error = event.input_error;
|
|
129
135
|
this.model_content.push({
|
|
130
136
|
type: "tool_call",
|
|
131
137
|
tool_call_id: tool.tool_call_id,
|
|
@@ -168,6 +174,14 @@ class StepEventCollector {
|
|
|
168
174
|
async function execute_tools(calls, input, messages) {
|
|
169
175
|
const results = [];
|
|
170
176
|
for (const call of calls) {
|
|
177
|
+
if (call.input_error) {
|
|
178
|
+
results.push({
|
|
179
|
+
...call,
|
|
180
|
+
success: false,
|
|
181
|
+
output: { error: call.input_error },
|
|
182
|
+
});
|
|
183
|
+
continue;
|
|
184
|
+
}
|
|
171
185
|
const tool = input.tools[call.tool_name];
|
|
172
186
|
if (!tool || typeof tool.execute !== "function") {
|
|
173
187
|
results.push({
|
|
@@ -195,7 +209,11 @@ async function execute_tools(calls, input, messages) {
|
|
|
195
209
|
abort_signal: input.abort_signal,
|
|
196
210
|
};
|
|
197
211
|
const output = await tool.execute(call.input, options);
|
|
198
|
-
results.push({
|
|
212
|
+
results.push({
|
|
213
|
+
...call,
|
|
214
|
+
success: !is_structured_tool_failure(output),
|
|
215
|
+
output,
|
|
216
|
+
});
|
|
199
217
|
}
|
|
200
218
|
catch (error) {
|
|
201
219
|
results.push({
|
|
@@ -207,6 +225,12 @@ async function execute_tools(calls, input, messages) {
|
|
|
207
225
|
}
|
|
208
226
|
return results;
|
|
209
227
|
}
|
|
228
|
+
/** 识别 Tool 正常返回的结构化失败,避免把业务失败标记成执行成功。 */
|
|
229
|
+
function is_structured_tool_failure(output) {
|
|
230
|
+
if (!output || typeof output !== "object" || Array.isArray(output))
|
|
231
|
+
return false;
|
|
232
|
+
return output.success === false;
|
|
233
|
+
}
|
|
210
234
|
/** 把 System 快照转换成标准 ModelMessage。 */
|
|
211
235
|
function convert_system_messages(messages) {
|
|
212
236
|
return messages.map((message) => ({
|
|
@@ -274,10 +298,12 @@ function append_tool_results(parts, results) {
|
|
|
274
298
|
}
|
|
275
299
|
/** 从结构化工具失败结果中提取可展示错误文本。 */
|
|
276
300
|
function read_tool_error(value) {
|
|
277
|
-
if (value && typeof value === "object"
|
|
278
|
-
const
|
|
279
|
-
|
|
280
|
-
|
|
301
|
+
if (value && typeof value === "object") {
|
|
302
|
+
const result = value;
|
|
303
|
+
for (const candidate of [result.error, result.message, result.output]) {
|
|
304
|
+
if (typeof candidate === "string" && candidate.trim())
|
|
305
|
+
return candidate;
|
|
306
|
+
}
|
|
281
307
|
}
|
|
282
308
|
return "Tool execution failed";
|
|
283
309
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelStepRunner.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ModelStepRunner.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStepRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 模型流失败对象。
|
|
3
|
+
*
|
|
4
|
+
* 该对象完整保留 Model Protocol 的错误分类,避免 Executor 只能依赖错误文本
|
|
5
|
+
* 判断是否可以重试。它只描述一次模型流失败,不负责决定恢复策略。
|
|
6
|
+
*/
|
|
7
|
+
import type { ModelError } from "@downcity/type";
|
|
8
|
+
/** 一次具有稳定协议语义的模型流失败。 */
|
|
9
|
+
export declare class ModelStreamFailure extends Error {
|
|
10
|
+
/** Downcity 稳定模型错误码。 */
|
|
11
|
+
readonly code: ModelError["code"];
|
|
12
|
+
/** 当前模型调用是否可以安全重试。 */
|
|
13
|
+
readonly retryable: boolean;
|
|
14
|
+
/** 失败前是否已经向用户发布正文或工具输入。 */
|
|
15
|
+
readonly has_partial_output: boolean;
|
|
16
|
+
/** Provider 返回的可观测请求标识。 */
|
|
17
|
+
readonly provider_request_id?: string;
|
|
18
|
+
constructor(error: ModelError, has_partial_output: boolean);
|
|
19
|
+
}
|
|
20
|
+
/** 判断未知错误是否为可安全自动重试的无输出模型流失败。 */
|
|
21
|
+
export declare function is_retryable_empty_model_stream_failure(error: unknown): error is ModelStreamFailure;
|
|
22
|
+
//# sourceMappingURL=ModelStreamFailure.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ModelStreamFailure.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamFailure.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAwB;AACxB,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,wBAAwB;IACxB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAElC,sBAAsB;IACtB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B,2BAA2B;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAErC,2BAA2B;IAC3B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;gBAE1B,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO;CAU3D;AAED,iCAAiC;AACjC,wBAAgB,uCAAuC,CACrD,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,kBAAkB,CAK7B"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 模型流失败对象。
|
|
3
|
+
*
|
|
4
|
+
* 该对象完整保留 Model Protocol 的错误分类,避免 Executor 只能依赖错误文本
|
|
5
|
+
* 判断是否可以重试。它只描述一次模型流失败,不负责决定恢复策略。
|
|
6
|
+
*/
|
|
7
|
+
/** 一次具有稳定协议语义的模型流失败。 */
|
|
8
|
+
export class ModelStreamFailure extends Error {
|
|
9
|
+
/** Downcity 稳定模型错误码。 */
|
|
10
|
+
code;
|
|
11
|
+
/** 当前模型调用是否可以安全重试。 */
|
|
12
|
+
retryable;
|
|
13
|
+
/** 失败前是否已经向用户发布正文或工具输入。 */
|
|
14
|
+
has_partial_output;
|
|
15
|
+
/** Provider 返回的可观测请求标识。 */
|
|
16
|
+
provider_request_id;
|
|
17
|
+
constructor(error, has_partial_output) {
|
|
18
|
+
super(error.message);
|
|
19
|
+
this.name = "ModelStreamFailure";
|
|
20
|
+
this.code = error.code;
|
|
21
|
+
this.retryable = error.retryable;
|
|
22
|
+
this.has_partial_output = has_partial_output;
|
|
23
|
+
if (error.provider_request_id) {
|
|
24
|
+
this.provider_request_id = error.provider_request_id;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
/** 判断未知错误是否为可安全自动重试的无输出模型流失败。 */
|
|
29
|
+
export function is_retryable_empty_model_stream_failure(error) {
|
|
30
|
+
return error instanceof ModelStreamFailure &&
|
|
31
|
+
error.retryable &&
|
|
32
|
+
!error.has_partial_output &&
|
|
33
|
+
error.code !== "cancelled";
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=ModelStreamFailure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ModelStreamFailure.js","sourceRoot":"","sources":["../../../src/executor/model/ModelStreamFailure.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,wBAAwB;AACxB,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,wBAAwB;IACf,IAAI,CAAqB;IAElC,sBAAsB;IACb,SAAS,CAAU;IAE5B,2BAA2B;IAClB,kBAAkB,CAAU;IAErC,2BAA2B;IAClB,mBAAmB,CAAU;IAEtC,YAAY,KAAiB,EAAE,kBAA2B;QACxD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACvD,CAAC;IACH,CAAC;CACF;AAED,iCAAiC;AACjC,MAAM,UAAU,uCAAuC,CACrD,KAAc;IAEd,OAAO,KAAK,YAAY,kBAAkB;QACxC,KAAK,CAAC,SAAS;QACf,CAAC,KAAK,CAAC,kBAAkB;QACzB,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;AAC/B,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* GroupDispatchSession:单个 GroupSession 独享的持久化调度执行边界。
|
|
3
|
+
*
|
|
4
|
+
* 本对象统一拥有调度队列、当前模型取消信号和调度 Turn 状态。调度策略只负责决策,
|
|
5
|
+
* 不再自行拥有跨 GroupSession 的运行状态或停止语义。
|
|
6
|
+
*/
|
|
7
|
+
import type { GroupDispatchSessionDataStore, GroupDispatchSessionInput, GroupDispatchSessionOptions, GroupDispatchSessionResult } from "../types/group/GroupDispatchSession.js";
|
|
8
|
+
/** 主动停止 Dispatch Session 时使用的内部错误。 */
|
|
9
|
+
export declare class GroupDispatchStoppedError extends Error {
|
|
10
|
+
constructor();
|
|
11
|
+
}
|
|
12
|
+
/** GroupSession 私有的调度 Session。 */
|
|
13
|
+
export declare class GroupDispatchSession {
|
|
14
|
+
private readonly dispatch_strategy;
|
|
15
|
+
private store?;
|
|
16
|
+
private queue_tail;
|
|
17
|
+
private active_abort_controller?;
|
|
18
|
+
private stopping;
|
|
19
|
+
private disposed;
|
|
20
|
+
constructor(options: GroupDispatchSessionOptions);
|
|
21
|
+
/** 绑定持久化视图,并把进程中断留下的运行态明确收口为 stopped。 */
|
|
22
|
+
initialize(store: GroupDispatchSessionDataStore): Promise<this>;
|
|
23
|
+
/** 按提交顺序执行一次调度,并在返回前持久化最终决定。 */
|
|
24
|
+
decide(input: GroupDispatchSessionInput): Promise<GroupDispatchSessionResult>;
|
|
25
|
+
/** 中断当前模型调用,并让尚未开始的调度 Turn 按队列顺序收口。 */
|
|
26
|
+
stop(): Promise<void>;
|
|
27
|
+
/** 永久释放当前 Dispatch Session。 */
|
|
28
|
+
dispose(): Promise<void>;
|
|
29
|
+
/** 执行队首调度 Turn,确保成功、失败和停止都形成持久化终态。 */
|
|
30
|
+
private execute_turn;
|
|
31
|
+
/** 提交没有 decision 的失败或停止终态。 */
|
|
32
|
+
private persist_terminal_turn;
|
|
33
|
+
private require_store;
|
|
34
|
+
private assert_available;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=GroupDispatchSession.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GroupDispatchSession.d.ts","sourceRoot":"","sources":["../../src/group/GroupDispatchSession.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EACV,6BAA6B,EAC7B,yBAAyB,EACzB,2BAA2B,EAC3B,0BAA0B,EAE3B,MAAM,uCAAuC,CAAC;AAE/C,sCAAsC;AACtC,qBAAa,yBAA0B,SAAQ,KAAK;;CAKnD;AAED,kCAAkC;AAClC,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmD;IACrF,OAAO,CAAC,KAAK,CAAC,CAAgC;IAC9C,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,uBAAuB,CAAC,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;gBAEb,OAAO,EAAE,2BAA2B;IAIhD,yCAAyC;IACnC,UAAU,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBrE,gCAAgC;IAChC,MAAM,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAsB7E,uCAAuC;IACjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B,+BAA+B;IACzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,sCAAsC;YACxB,YAAY;IAmD1B,8BAA8B;YAChB,qBAAqB;IAanC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,gBAAgB;CAIzB"}
|