@coralai/sps-cli 0.65.33 → 0.65.35

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.
Files changed (67) hide show
  1. package/dist/chat-protocol/events.d.ts +131 -0
  2. package/dist/chat-protocol/events.d.ts.map +1 -0
  3. package/dist/chat-protocol/events.js +134 -0
  4. package/dist/chat-protocol/events.js.map +1 -0
  5. package/dist/chat-protocol/form.d.ts +66 -0
  6. package/dist/chat-protocol/form.d.ts.map +1 -0
  7. package/dist/chat-protocol/form.js +25 -0
  8. package/dist/chat-protocol/form.js.map +1 -0
  9. package/dist/chat-protocol/formValues.d.ts +60 -0
  10. package/dist/chat-protocol/formValues.d.ts.map +1 -0
  11. package/dist/chat-protocol/formValues.js +114 -0
  12. package/dist/chat-protocol/formValues.js.map +1 -0
  13. package/dist/chat-protocol/index.d.ts +25 -0
  14. package/dist/chat-protocol/index.d.ts.map +1 -0
  15. package/dist/chat-protocol/index.js +19 -0
  16. package/dist/chat-protocol/index.js.map +1 -0
  17. package/dist/chat-protocol/reduce.d.ts +33 -0
  18. package/dist/chat-protocol/reduce.d.ts.map +1 -0
  19. package/dist/chat-protocol/reduce.js +204 -0
  20. package/dist/chat-protocol/reduce.js.map +1 -0
  21. package/dist/chat-protocol/selectors.d.ts +31 -0
  22. package/dist/chat-protocol/selectors.d.ts.map +1 -0
  23. package/dist/chat-protocol/selectors.js +40 -0
  24. package/dist/chat-protocol/selectors.js.map +1 -0
  25. package/dist/chat-protocol/types.d.ts +85 -0
  26. package/dist/chat-protocol/types.d.ts.map +1 -0
  27. package/dist/chat-protocol/types.js +9 -0
  28. package/dist/chat-protocol/types.js.map +1 -0
  29. package/dist/chat-protocol/typewriter.d.ts +25 -0
  30. package/dist/chat-protocol/typewriter.d.ts.map +1 -0
  31. package/dist/chat-protocol/typewriter.js +36 -0
  32. package/dist/chat-protocol/typewriter.js.map +1 -0
  33. package/dist/console/chatEventLog.d.ts +47 -0
  34. package/dist/console/chatEventLog.d.ts.map +1 -0
  35. package/dist/console/chatEventLog.js +79 -0
  36. package/dist/console/chatEventLog.js.map +1 -0
  37. package/dist/console/routes/chat.d.ts +3 -0
  38. package/dist/console/routes/chat.d.ts.map +1 -1
  39. package/dist/console/routes/chat.js +178 -114
  40. package/dist/console/routes/chat.js.map +1 -1
  41. package/dist/console-assets/assets/{ShowcasePage-NmXybDqC.js → ShowcasePage-DYxYvjDm.js} +1 -1
  42. package/dist/console-assets/assets/{index-DCAnGMiQ.js → index-DoXihmot.js} +219 -219
  43. package/dist/console-assets/assets/index-Q5jKI6ZL.css +1 -0
  44. package/dist/console-assets/index.html +2 -2
  45. package/dist/core/activityStream.d.ts +1 -1
  46. package/dist/core/activityStream.d.ts.map +1 -1
  47. package/dist/core/activityStream.js +7 -2
  48. package/dist/core/activityStream.js.map +1 -1
  49. package/dist/core/agents/AgentBackend.d.ts +11 -1
  50. package/dist/core/agents/AgentBackend.d.ts.map +1 -1
  51. package/dist/core/agents/AgentBackend.js.map +1 -1
  52. package/dist/core/interactions/formSpec.d.ts +57 -0
  53. package/dist/core/interactions/formSpec.d.ts.map +1 -0
  54. package/dist/core/interactions/formSpec.js +123 -0
  55. package/dist/core/interactions/formSpec.js.map +1 -0
  56. package/dist/openai-agent/interactions/broker.d.ts +13 -10
  57. package/dist/openai-agent/interactions/broker.d.ts.map +1 -1
  58. package/dist/openai-agent/interactions/broker.js +48 -154
  59. package/dist/openai-agent/interactions/broker.js.map +1 -1
  60. package/dist/openai-agent/runWorker.d.ts.map +1 -1
  61. package/dist/openai-agent/runWorker.js +0 -6
  62. package/dist/openai-agent/runWorker.js.map +1 -1
  63. package/dist/providers/mcp/spsMcpServer.d.ts.map +1 -1
  64. package/dist/providers/mcp/spsMcpServer.js +6 -4
  65. package/dist/providers/mcp/spsMcpServer.js.map +1 -1
  66. package/package.json +1 -1
  67. package/dist/console-assets/assets/index-cxN7rD-p.css +0 -1
@@ -0,0 +1,123 @@
1
+ /**
2
+ * 内置生图表单模板(快路径):agent 只需 `present_form({template:'image', defaults:{…}})`,
3
+ * 不必手写整份 fields(省几百 token、面板弹得快)。
4
+ *
5
+ * **这是这份模板在全仓的唯一定义。**
6
+ */
7
+ export const IMAGE_FORM_SPEC = {
8
+ title: '生图配置',
9
+ description: '填好点「开始生成」;懒得填就点「让 AI 来填」,我按你说的补全。',
10
+ submitLabel: '开始生成',
11
+ fields: [
12
+ {
13
+ id: 'prompt',
14
+ label: '画面描述',
15
+ type: 'textarea',
16
+ required: true,
17
+ placeholder: '主体 + 场景 + 动作 + 细节,越具体越好',
18
+ hint: '想画什么',
19
+ },
20
+ {
21
+ id: 'style',
22
+ label: '风格',
23
+ type: 'select',
24
+ default: 'realistic',
25
+ options: [
26
+ { value: 'realistic', label: '写实' },
27
+ { value: '3d-render', label: '3D 渲染' },
28
+ { value: 'anime', label: '动漫/二次元' },
29
+ { value: 'oil-painting', label: '油画' },
30
+ { value: 'watercolor', label: '水彩' },
31
+ { value: 'cyberpunk', label: '赛博朋克' },
32
+ { value: 'flat-illustration', label: '扁平插画' },
33
+ { value: 'cinematic', label: '电影感' },
34
+ ],
35
+ },
36
+ {
37
+ id: 'aspect',
38
+ label: '画幅',
39
+ type: 'select',
40
+ default: '1:1',
41
+ options: [
42
+ { value: '1:1', label: '正方形 1:1' },
43
+ { value: '16:9', label: '横屏 16:9' },
44
+ { value: '9:16', label: '竖屏 9:16' },
45
+ { value: '4:3', label: '4:3' },
46
+ { value: '3:4', label: '3:4' },
47
+ ],
48
+ },
49
+ // 生图一次一张(单 outPath 契约,不走并行);要多张让用户再说一句、agent 按需再生。
50
+ {
51
+ id: 'lighting',
52
+ label: '光线 / 氛围',
53
+ type: 'text',
54
+ advanced: true,
55
+ placeholder: '如 柔和逆光、霓虹夜色、清晨薄雾',
56
+ },
57
+ { id: 'mood', label: '情绪基调', type: 'text', advanced: true, placeholder: '如 宁静、孤独、热烈' },
58
+ {
59
+ id: 'reference',
60
+ label: '参考图',
61
+ type: 'image-ref',
62
+ advanced: true,
63
+ hint: '可选:上传或贴 URL,做 img2img 风格参考',
64
+ },
65
+ ],
66
+ };
67
+ const TEMPLATES = { image: IMAGE_FORM_SPEC };
68
+ /**
69
+ * 把原始入参展开成完整 `FormSpec`。
70
+ * - 给了 `fields` → 用它;否则按 `template` 取内置模板;两者都没有 → null(工具会让模型重试)。
71
+ * - `defaults` 按字段 id 覆盖各字段的 `default`。
72
+ * - `title` 等文案:入参优先,回落模板。
73
+ */
74
+ export function expandFormSpec(input) {
75
+ if (!input)
76
+ return null;
77
+ const template = input.template ? TEMPLATES[input.template] : undefined;
78
+ const fields = input.fields?.length ? input.fields : template?.fields;
79
+ if (!fields?.length)
80
+ return null;
81
+ const defaults = input.defaults;
82
+ const merged = defaults && typeof defaults === 'object'
83
+ ? fields.map((f) => (f.id in defaults ? { ...f, default: defaults[f.id] } : f))
84
+ : fields.map((f) => ({ ...f }));
85
+ return {
86
+ title: input.title || template?.title || '配置',
87
+ ...(input.description ?? template?.description
88
+ ? { description: input.description ?? template?.description }
89
+ : {}),
90
+ ...(input.submitLabel ?? template?.submitLabel
91
+ ? { submitLabel: input.submitLabel ?? template?.submitLabel }
92
+ : {}),
93
+ ...(input.skipLabel ?? template?.skipLabel
94
+ ? { skipLabel: input.skipLabel ?? template?.skipLabel }
95
+ : {}),
96
+ fields: merged,
97
+ };
98
+ }
99
+ /**
100
+ * 把选择器归一成 `FormSpec` —— **选择器本质就是一张只有 radio 的表单**。
101
+ * 两种交互共用一套 schema 语言,产品只需要一个渲染器;要不要把它画成"一键选项"
102
+ * 而不是"表单 + 提交",按交互块的 `kind` 决定,那是展示,不进契约。
103
+ *
104
+ * 字段 id 与 openai broker 既有约定一致(单组 `choice`,多组 `choice_1..n`),
105
+ * 免得同一个交互在两条路上回流的键名不同。
106
+ */
107
+ export function expandChoicesSpec(input) {
108
+ const groups = input?.groups?.filter((g) => (g.options?.length ?? 0) > 0);
109
+ if (!groups?.length)
110
+ return null;
111
+ const question = input?.question?.trim() || '请选择';
112
+ return {
113
+ title: question,
114
+ fields: groups.map((g, i) => ({
115
+ id: groups.length === 1 ? 'choice' : `choice_${i + 1}`,
116
+ label: g.label ?? question,
117
+ type: 'radio',
118
+ required: true,
119
+ options: (g.options ?? []).map((o) => ({ value: o, label: o })),
120
+ })),
121
+ };
122
+ }
123
+ //# sourceMappingURL=formSpec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"formSpec.js","sourceRoot":"","sources":["../../../src/core/interactions/formSpec.ts"],"names":[],"mappings":"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"}
@@ -8,16 +8,22 @@ export interface ResolvedInteraction {
8
8
  export declare class InteractionBroker {
9
9
  private readonly start;
10
10
  readonly store: InteractionStore;
11
- /** 见 setFollowUpReply:交互已答但恢复未跑时,同一启动还带着一条新用户消息 → 随答案一并交给模型。 */
12
- private followUpReply?;
13
11
  constructor(start: AgentProcessStartCommandV1, store: InteractionStore);
14
12
  /**
15
- * 记录"随行的新用户消息":表单答案已提交但恢复 run 没跑成(如 daemon 重启),用户又发了
16
- * 新消息 → 这次启动既要恢复已答的旧回合,又不能丢新消息。consumeAnswer 会把它并进
17
- * tool_result 交给模型,处理完表单意图后一并回应(否则新消息被静默丢弃,曾致"输入你好
18
- * 却直接生图"的错乱)。仅 form/choices 生效。
13
+ * 收集输入类交互(表单 / 选择器)—— **不挂起 run**。
14
+ *
15
+ * 🔴 这里曾经走 `needsApproval` 把 run 挂起、等答案再恢复。拆掉的理由:
16
+ * 挂起没有换来任何东西。等答案完全可以用**对话本身**表达 —— 工具即刻返回、回合收尾、
17
+ * 用户填完后那句指令作为新的用户消息进来、agent 恢复上下文继续。claude 一直就是这么跑的。
18
+ *
19
+ * 而"挂起的 run"是一种**脆弱的中间态**:单轮进程挂起意味着要把 RunState 序列化成检查点
20
+ * 再指望还原得回来 —— 比暖进程更脆,却拿不到暖进程的任何好处。此前为它打的补丁
21
+ * (答案已提交但恢复没跑成、恢复时还带着一条新用户消息…)都是这个中间态的并发症。
22
+ * 而"回合已结束 + 之后来了条用户消息"结构上就不会坏:它就是对话历史,没有要恢复的东西。
23
+ *
24
+ * ⚠️ **审批(approval / 对账)不在此列** —— 见 configureCapabilityTools。那是**执行门槛**:
25
+ * 必须在危险工具真的跑起来之前把 run 卡住,"先执行、回头再问"不是一个选项。
19
26
  */
20
- setFollowUpReply(reply: string): void;
21
27
  tools(): FunctionTool<any, any, any>[];
22
28
  configureCapabilityTools(tools: Tool<any>[]): Tool<any>[];
23
29
  findForInterruption(interruption: RunToolApprovalItem): Promise<InteractionRecord | null>;
@@ -30,10 +36,7 @@ export declare class InteractionBroker {
30
36
  * 仅限 form/choices;approval(危险操作/对账)不适用 —— 那是安全门槛,必须显式作答。
31
37
  */
32
38
  resolveWithChatReply(state: RunState<any, any>, interactionId: string, reply: string): Promise<ResolvedInteraction | null>;
33
- private ensureChoices;
34
- private ensureForm;
35
39
  private ensureApproval;
36
40
  private ensure;
37
- private consumeAnswer;
38
41
  }
39
42
  //# sourceMappingURL=broker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"broker.d.ts","sourceRoot":"","sources":["../../../src/openai-agent/interactions/broker.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,gBAAgB,EAEhB,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AAiEnC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,mBAAmB,CAAC;CACnC;AAED,qBAAa,iBAAiB;IAK1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,QAAQ,CAAC,KAAK,EAAE,gBAAgB;IALlC,gEAAgE;IAChE,OAAO,CAAC,aAAa,CAAC,CAAS;gBAGZ,KAAK,EAAE,0BAA0B,EACzC,KAAK,EAAE,gBAAgB;IAGlC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKrC,KAAK,IAAI,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;IAoCtC,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE;IAoCnD,mBAAmB,CACvB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAI9B,qBAAqB,CACzB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,iBAAiB,CAAC;IAoBvB,eAAe,CACnB,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EACzB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAmCtC;;;;;OAKG;IACG,oBAAoB,CACxB,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EACzB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;YA8BxB,aAAa;YA8Bb,UAAU;IAqCxB,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,MAAM;YA0BA,aAAa;CAgC5B"}
1
+ {"version":3,"file":"broker.d.ts","sourceRoot":"","sources":["../../../src/openai-agent/interactions/broker.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,IAAI,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,0BAA0B,EAE3B,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EACL,gBAAgB,EAEhB,KAAK,iBAAiB,EACvB,MAAM,2BAA2B,CAAC;AAiDnC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,mBAAmB,CAAC;CACnC;AAED,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,QAAQ,CAAC,KAAK,EAAE,gBAAgB;gBADf,KAAK,EAAE,0BAA0B,EACzC,KAAK,EAAE,gBAAgB;IAGlC;;;;;;;;;;;;;;OAcG;IACH,KAAK,IAAI,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;IA6BtC,wBAAwB,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE;IAoCnD,mBAAmB,CACvB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAI9B,qBAAqB,CACzB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAAC,iBAAiB,CAAC;IAoBvB,eAAe,CACnB,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EACzB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAmCtC;;;;;OAKG;IACG,oBAAoB,CACxB,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EACzB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IA8BtC,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,MAAM;CA0Bf"}
@@ -1,6 +1,7 @@
1
1
  import { createHash } from 'node:crypto';
2
2
  import { tool, } from '@openai/agents';
3
3
  import { z } from 'zod';
4
+ import { expandChoicesSpec, expandFormSpec } from '../../core/interactions/formSpec.js';
4
5
  const presentChoicesInput = z.object({
5
6
  question: z.string().min(1).max(60),
6
7
  groups: z
@@ -41,70 +42,49 @@ const presentFormInput = z.object({
41
42
  .describe('With template: prefill values inferred from the chat (e.g. {"prompt":"..."})'),
42
43
  fields: z.array(formField).min(1).max(20).optional(),
43
44
  });
44
- // 内置生图模板(与 console 端 IMAGE_FORM_TEMPLATE 同一套字段 id,claude/openai 两路 skill 指引一致)。
45
- // 本 DSL 无 image-ref 控件,参考图降级为 URL 文本框。
46
- const IMAGE_TEMPLATE = {
47
- title: '生图配置',
48
- description: '填好提交;留空的项由 AI 按对话补全。',
49
- fields: [
50
- { name: 'prompt', label: '画面描述', type: 'textarea', required: true },
51
- { name: 'style', label: '风格', type: 'select', options: ['realistic', '3d-render', 'anime', 'oil-painting', 'watercolor', 'cyberpunk', 'flat-illustration', 'cinematic'] },
52
- { name: 'aspect', label: '画幅', type: 'select', options: ['1:1', '16:9', '9:16', '4:3', '3:4'] },
53
- { name: 'lighting', label: '光线 / 氛围', type: 'text' },
54
- { name: 'mood', label: '情绪基调', type: 'text' },
55
- { name: 'reference', label: '参考图 URL', type: 'text' },
56
- ],
57
- };
58
45
  export class InteractionBroker {
59
46
  start;
60
47
  store;
61
- /** 见 setFollowUpReply:交互已答但恢复未跑时,同一启动还带着一条新用户消息 → 随答案一并交给模型。 */
62
- followUpReply;
63
48
  constructor(start, store) {
64
49
  this.start = start;
65
50
  this.store = store;
66
51
  }
67
52
  /**
68
- * 记录"随行的新用户消息":表单答案已提交但恢复 run 没跑成(如 daemon 重启),用户又发了
69
- * 新消息 → 这次启动既要恢复已答的旧回合,又不能丢新消息。consumeAnswer 会把它并进
70
- * tool_result 交给模型,处理完表单意图后一并回应(否则新消息被静默丢弃,曾致"输入你好
71
- * 却直接生图"的错乱)。仅 form/choices 生效。
53
+ * 收集输入类交互(表单 / 选择器)—— **不挂起 run**。
54
+ *
55
+ * 🔴 这里曾经走 `needsApproval` 把 run 挂起、等答案再恢复。拆掉的理由:
56
+ * 挂起没有换来任何东西。等答案完全可以用**对话本身**表达 —— 工具即刻返回、回合收尾、
57
+ * 用户填完后那句指令作为新的用户消息进来、agent 恢复上下文继续。claude 一直就是这么跑的。
58
+ *
59
+ * 而"挂起的 run"是一种**脆弱的中间态**:单轮进程挂起意味着要把 RunState 序列化成检查点
60
+ * 再指望还原得回来 —— 比暖进程更脆,却拿不到暖进程的任何好处。此前为它打的补丁
61
+ * (答案已提交但恢复没跑成、恢复时还带着一条新用户消息…)都是这个中间态的并发症。
62
+ * 而"回合已结束 + 之后来了条用户消息"结构上就不会坏:它就是对话历史,没有要恢复的东西。
63
+ *
64
+ * ⚠️ **审批(approval / 对账)不在此列** —— 见 configureCapabilityTools。那是**执行门槛**:
65
+ * 必须在危险工具真的跑起来之前把 run 卡住,"先执行、回头再问"不是一个选项。
72
66
  */
73
- setFollowUpReply(reply) {
74
- const trimmed = reply.trim();
75
- if (trimmed)
76
- this.followUpReply = trimmed;
77
- }
78
67
  tools() {
79
68
  return [
80
69
  tool({
81
70
  name: 'present_choices',
82
- description: 'Pause and ask the user to choose one option from each structured group. Never guess the answer.',
71
+ description: 'Show the user a structured set of choices. The tool returns immediately end your turn ' +
72
+ 'briefly and wait for the user; their selection arrives as a normal user message. ' +
73
+ 'Never guess the answer and never restate the options in prose.',
83
74
  parameters: presentChoicesInput,
84
- needsApproval: async (_context, input, callId) => {
85
- await this.ensureChoices(input, requireCallId(callId));
86
- return true;
87
- },
88
- execute: async (_input, _context, details) => this.consumeAnswer(requireCallId(details?.toolCall?.callId)),
75
+ execute: async (input) => expandChoicesSpec(input)
76
+ ? 'Choices shown. End this turn briefly and wait for the user; their selection will arrive as a user message. Do not answer on their behalf.'
77
+ : 'present_choices was not shown: every group needs at least one option. Retry with valid arguments.',
89
78
  }),
90
79
  tool({
91
80
  name: 'present_form',
92
- description: 'Pause and ask the user for structured form values. Never invent missing user input. ' +
81
+ description: 'Show the user a structured form. The tool returns immediately end your turn briefly and ' +
82
+ 'wait for the user; their answer arrives as a normal user message. Never invent missing user input. ' +
93
83
  'Fast path for image generation: pass template:"image" (plus defaults inferred from the chat) instead of hand-writing fields.',
94
84
  parameters: presentFormInput,
95
- needsApproval: async (_context, input, callId) => {
96
- // 参数不完整时不挂起(needsApproval 抛错会打崩整个 run),由 execute 返回纠错提示让模型重试
97
- if (!resolveFormFields(input))
98
- return false;
99
- await this.ensureForm(input, requireCallId(callId));
100
- return true;
101
- },
102
- execute: async (input, _context, details) => {
103
- if (!resolveFormFields(input)) {
104
- return 'present_form was not shown: pass either fields or template:"image". Retry with valid arguments.';
105
- }
106
- return this.consumeAnswer(requireCallId(details?.toolCall?.callId));
107
- },
85
+ execute: async (input) => buildFormSpec(input)
86
+ ? 'Form shown. End this turn briefly and wait for the user; their answer will arrive as a user message. Do not fill it in for them.'
87
+ : 'present_form was not shown: pass either fields or template:"image". Retry with valid arguments.',
108
88
  }),
109
89
  ];
110
90
  }
@@ -214,63 +194,6 @@ export class InteractionBroker {
214
194
  });
215
195
  return { record: cancelled, interruption };
216
196
  }
217
- async ensureChoices(input, callId) {
218
- const properties = {};
219
- const required = [];
220
- input.groups.forEach((group, index) => {
221
- const key = input.groups.length === 1 ? 'choice' : `choice_${index + 1}`;
222
- required.push(key);
223
- properties[key] = {
224
- type: 'string',
225
- title: group.label ?? input.question,
226
- enum: group.options,
227
- };
228
- });
229
- return this.ensure({
230
- toolName: 'present_choices',
231
- kind: 'choices',
232
- title: input.question,
233
- input: toJsonValue(input),
234
- schema: {
235
- type: 'object',
236
- properties,
237
- required,
238
- additionalProperties: false,
239
- },
240
- callId,
241
- });
242
- }
243
- async ensureForm(input, callId) {
244
- const fields = resolveFormFields(input);
245
- if (!fields) {
246
- throw new Error('present_form requires either fields or template:"image"');
247
- }
248
- const template = input.template === 'image' ? IMAGE_TEMPLATE : null;
249
- const title = input.title ?? template?.title ?? 'Form';
250
- const description = input.description ?? template?.description;
251
- const defaults = (input.defaults ?? {});
252
- const properties = Object.fromEntries(fields.map((field) => [
253
- field.name,
254
- formFieldSchema(field, defaults[field.name] ?? field.default),
255
- ]));
256
- return this.ensure({
257
- toolName: 'present_form',
258
- kind: 'form',
259
- title,
260
- input: toJsonValue(input),
261
- schema: {
262
- type: 'object',
263
- title,
264
- ...(description ? { description } : {}),
265
- properties,
266
- required: fields
267
- .filter((field) => field.required)
268
- .map((field) => field.name),
269
- additionalProperties: false,
270
- },
271
- callId,
272
- });
273
- }
274
197
  ensureApproval(toolName, input, callId) {
275
198
  return this.ensure({
276
199
  toolName,
@@ -302,61 +225,32 @@ export class InteractionBroker {
302
225
  schema: args.schema,
303
226
  });
304
227
  }
305
- async consumeAnswer(callId) {
306
- const record = await this.store.findByToolCallId(callId);
307
- if (!record) {
308
- throw new Error(`No durable interaction exists for tool call ${callId}`);
309
- }
310
- if (record.status !== 'answered' &&
311
- record.status !== 'consumed') {
312
- throw new Error(`Interaction ${record.interactionId} has no answer`);
313
- }
314
- if (record.answer === undefined) {
315
- throw new Error(`Interaction ${record.interactionId} has no answer`);
316
- }
317
- if (record.status === 'answered') {
318
- await this.store.consume(record.interactionId);
319
- }
320
- if (this.followUpReply && record.kind !== 'approval') {
321
- const reply = this.followUpReply;
322
- this.followUpReply = undefined;
323
- return {
324
- interactionId: record.interactionId,
325
- answer: record.answer,
326
- userFollowUpMessage: reply,
327
- note: '用户在提交这份答案后又发了上面这条消息 —— 完成表单/选项的意图后,请一并回应它。',
328
- };
329
- }
330
- return {
331
- interactionId: record.interactionId,
332
- answer: record.answer,
333
- };
334
- }
335
228
  }
336
229
  /** template 快路径:显式 fields 优先,否则按模板展开;都没有 → null(调用方决定纠错方式)。 */
337
- function resolveFormFields(input) {
338
- if (input.fields?.length)
339
- return input.fields;
340
- if (input.template === 'image')
341
- return IMAGE_TEMPLATE.fields;
342
- return null;
230
+ /** broker 的受限 DSL 字段 → 规范 FormSpec 字段(本 DSL 无富控件,type 一一对应即可) */
231
+ function toCanonicalField(field) {
232
+ return {
233
+ id: field.name,
234
+ label: field.label,
235
+ type: field.type === 'boolean' ? 'toggle' : field.type,
236
+ ...(field.required ? { required: true } : {}),
237
+ ...(field.options ? { options: field.options.map((o) => ({ value: o, label: o })) } : {}),
238
+ ...(field.default !== undefined ? { default: field.default } : {}),
239
+ };
343
240
  }
344
- function formFieldSchema(field, defaultValue) {
345
- const base = { title: field.label };
346
- if (field.type === 'boolean')
347
- base.type = 'boolean';
348
- else if (field.type === 'number')
349
- base.type = 'number';
350
- else {
351
- base.type = 'string';
352
- if (field.options)
353
- base.enum = field.options;
354
- if (field.type === 'textarea')
355
- base.format = 'textarea';
356
- }
357
- if (defaultValue !== undefined)
358
- base.default = toJsonValue(defaultValue);
359
- return base;
241
+ /**
242
+ * present_form 入参展开成规范 FormSpec。模板(`template:'image'`)与 defaults 合并
243
+ * 都复用引擎侧的**唯一**实现(core/interactions/formSpec),broker 不再自带模板副本。
244
+ * 返回 null = 参数不合法(既没 fields 也没有效 template),调用方让模型重试。
245
+ */
246
+ function buildFormSpec(input) {
247
+ return expandFormSpec({
248
+ ...(input.title ? { title: input.title } : {}),
249
+ ...(input.description ? { description: input.description } : {}),
250
+ ...(input.template ? { template: input.template } : {}),
251
+ ...(input.defaults ? { defaults: input.defaults } : {}),
252
+ ...(input.fields?.length ? { fields: input.fields.map(toCanonicalField) } : {}),
253
+ });
360
254
  }
361
255
  function stableInteractionId(sessionId, toolName, callId, input) {
362
256
  return `interaction_${createHash('sha256')
@@ -1 +1 @@
1
- {"version":3,"file":"broker.js","sourceRoot":"","sources":["../../../src/openai-agent/interactions/broker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"broker.js","sourceRoot":"","sources":["../../../src/openai-agent/interactions/broker.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"runWorker.d.ts","sourceRoot":"","sources":["../../src/openai-agent/runWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,KAAK,EAEV,KAAK,OAAO,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGV,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EACL,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,kCAAkC,EACxC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,6BAA6B;IAC5C,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,0BAA0B,KAC9B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,0BAA0B,KAC9B,KAAK,CAAC;IACX,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,0BAA0B,EACjC,IAAI,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,EACtD,YAAY,CAAC,EAAE,kCAAkC,KAC9C,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,0BAA0B,EACjC,MAAM,EAAE,yBAAyB,EACjC,MAAM,EAAE,WAAW,EACnB,YAAY,GAAE,6BAAkC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAolBf"}
1
+ {"version":3,"file":"runWorker.d.ts","sourceRoot":"","sources":["../../src/openai-agent/runWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,KAAK,EAEV,KAAK,OAAO,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGV,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EACL,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,kCAAkC,EACxC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,6BAA6B;IAC5C,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,0BAA0B,KAC9B,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,CACZ,KAAK,EAAE,0BAA0B,KAC9B,KAAK,CAAC;IACX,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,0BAA0B,EACjC,IAAI,EAAE,UAAU,CAAC,OAAO,6BAA6B,CAAC,EACtD,YAAY,CAAC,EAAE,kCAAkC,KAC9C,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,0BAA0B,EACjC,MAAM,EAAE,yBAAyB,EACjC,MAAM,EAAE,WAAW,EACnB,YAAY,GAAE,6BAAkC,GAC/C,OAAO,CAAC,IAAI,CAAC,CA+kBf"}
@@ -149,12 +149,6 @@ export async function runOpenAIAgentWorker(start, writer, signal, dependencies =
149
149
  if (!resolved && start.prompt.trim() !== '') {
150
150
  resolved = await execution.interactions.resolveWithChatReply(restored, existingCheckpoint.pending.interactionId, start.prompt);
151
151
  }
152
- else if (resolved && start.prompt.trim() !== '') {
153
- // 交互已答但恢复没跑成(如 daemon 重启),这次启动又带着新消息(合法应答恢复的
154
- // prompt 恒为空):把新消息随答案并进 tool_result,恢复旧回合的同时不丢新输入
155
- // (否则曾出现"输入你好却直接生图"——新消息被静默丢弃,旧回合独走)。
156
- execution.interactions.setFollowUpReply(start.prompt);
157
- }
158
152
  if (!resolved) {
159
153
  throw checkpointResumeError(`Interaction ${existingCheckpoint.pending.interactionId} has not been answered`, true);
160
154
  }