neoctl 0.2.55 → 0.2.56

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 (45) hide show
  1. package/README.md +58 -58
  2. package/dist/context/compaction.js +2 -1
  3. package/dist/context/compaction.js.map +1 -1
  4. package/dist/context/context-manager.d.ts +7 -1
  5. package/dist/context/context-manager.js +0 -1
  6. package/dist/context/context-manager.js.map +1 -1
  7. package/dist/context/system.md +16 -16
  8. package/dist/core/execution-state.js +3 -3
  9. package/dist/core/execution-state.js.map +1 -1
  10. package/dist/core/message-pipeline.d.ts +3 -0
  11. package/dist/core/message-pipeline.js +31 -23
  12. package/dist/core/message-pipeline.js.map +1 -1
  13. package/dist/core/query-engine.js +31 -23
  14. package/dist/core/query-engine.js.map +1 -1
  15. package/dist/core/query.d.ts +3 -1
  16. package/dist/core/query.js +29 -7
  17. package/dist/core/query.js.map +1 -1
  18. package/dist/core/run-agent.d.ts +1 -0
  19. package/dist/core/run-agent.js +1 -0
  20. package/dist/core/run-agent.js.map +1 -1
  21. package/dist/execution/filesystem.js +22 -22
  22. package/dist/execution/process.js +44 -44
  23. package/dist/model/anthropic-mapper.d.ts +4 -0
  24. package/dist/model/anthropic-mapper.js +84 -9
  25. package/dist/model/anthropic-mapper.js.map +1 -1
  26. package/dist/model/model-gateway.d.ts +4 -0
  27. package/dist/model/model-gateway.js +1 -0
  28. package/dist/model/model-gateway.js.map +1 -1
  29. package/dist/model/model-metadata.json +144 -144
  30. package/dist/model/openai-chat-mapper.js +45 -12
  31. package/dist/model/openai-chat-mapper.js.map +1 -1
  32. package/dist/model/openai-responses-mapper.js +70 -17
  33. package/dist/model/openai-responses-mapper.js.map +1 -1
  34. package/dist/model/thinking-lifecycle.d.ts +5 -0
  35. package/dist/model/thinking-lifecycle.js +43 -0
  36. package/dist/model/thinking-lifecycle.js.map +1 -0
  37. package/dist/repl/index.js +4 -0
  38. package/dist/repl/index.js.map +1 -1
  39. package/dist/types/events.d.ts +2 -0
  40. package/dist/web/index.d.ts +2 -0
  41. package/dist/web/index.js +31 -2
  42. package/dist/web/index.js.map +1 -1
  43. package/docs/prompt-config.md +86 -86
  44. package/package.json +96 -96
  45. package/scripts/copy-prompt-resources.mjs +5 -5
package/dist/model/openai-chat-mapper.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import { createTextMessage, createThinkingMessage } from "../types/messages.js";
2
2
  import { buildPromptCacheIdentity } from "../core/prompt-cache-key.js";
3
3
  import { decodeSSE } from "./sse-decoder.js";
4
+ import { withThinkingLifecycle } from "./thinking-lifecycle.js";
4
5
  import { asNumber, asString, buildChatMessages, buildChatTools, dropUndefined, normalizeOpenAIStreamError, normalizeUsage, toToolUse, } from "./openai-mappers.js";
5
6
  export function buildChatRequest(request, options) {
6
7
  const tools = buildChatTools(request.tools);
@@ -29,7 +30,11 @@ function chatThinkingOption(_model, _reasoning, _reasoningDisabled) {
29
30
  return undefined;
30
31
  }
31
32
  export async function* normalizeChatStream(stream, options) {
32
- const textParts = [];
33
+ yield* withThinkingLifecycle(normalizeChatStreamEvents(stream, options));
34
+ }
35
+ async function* normalizeChatStreamEvents(stream, options) {
36
+ const textBlocks = [];
37
+ const choiceScopes = new Map();
33
38
  const thinkingParts = [];
34
39
  const toolBuffers = new Map();
35
40
  const announcedToolCalls = new Set();
@@ -50,16 +55,27 @@ export async function* normalizeChatStream(stream, options) {
50
55
  const choices = Array.isArray(event.choices) ? event.choices : [];
51
56
  for (const choice of choices) {
52
57
  const delta = choice.delta;
53
- const content = asString(delta?.content);
54
- if (content) {
55
- textParts.push(content);
56
- yield { type: "assistant_delta", text: content };
58
+ const choiceIndex = asNumber(choice.index) ?? 0;
59
+ const scope = { ...choiceScopes.get(choiceIndex) };
60
+ for (const key of ["role", "channel", "phase"]) {
61
+ const value = delta?.[key] ?? choice[key] ?? event[key];
62
+ if (value !== undefined)
63
+ scope[key] = value;
57
64
  }
58
- const reasoningContent = asString(delta?.reasoning_content);
65
+ choiceScopes.set(choiceIndex, scope);
66
+ // Some compatible chunks include the last reasoning text and first answer
67
+ // together. Publish thinking first so the answer boundary really ends it.
68
+ const reasoningContent = asString(delta?.reasoning_content) ?? asString(delta?.reasoning);
59
69
  if (reasoningContent) {
60
70
  thinkingParts.push(reasoningContent);
61
71
  yield { type: "thinking_delta", text: reasoningContent };
62
72
  }
73
+ const content = asString(delta?.content);
74
+ if (content) {
75
+ const visible = allowsVisibleChatContent(event, choice, scope);
76
+ appendChatText(textBlocks, content, visible);
77
+ yield { type: "assistant_delta", text: content, ...(visible ? { displayChannel: "visible" } : {}) };
78
+ }
63
79
  const toolCalls = Array.isArray(delta?.tool_calls) ? delta?.tool_calls : [];
64
80
  for (const toolCall of toolCalls) {
65
81
  const index = asNumber(toolCall.index) ?? toolBuffers.size;
@@ -94,9 +110,8 @@ export async function* normalizeChatStream(stream, options) {
94
110
  const thinking = thinkingParts.join("").trim();
95
111
  if (thinking)
96
112
  yield { type: "assistant_message", message: createThinkingMessage(thinking) };
97
- const text = textParts.join("");
98
- if (text)
99
- yield { type: "assistant_message", message: createTextMessage("assistant", text) };
113
+ if (textBlocks.length)
114
+ yield { type: "assistant_message", message: { ...createTextMessage("assistant", ""), blocks: textBlocks } };
100
115
  yield { type: "response_completed", responseId, stopReason: "completed", usage };
101
116
  }
102
117
  export function* normalizeChatObject(response) {
@@ -107,12 +122,15 @@ export function* normalizeChatObject(response) {
107
122
  const choices = Array.isArray(body.choices) ? body.choices : [];
108
123
  for (const choice of choices) {
109
124
  const message = choice.message;
110
- const reasoningContent = asString(message?.reasoning_content);
125
+ const reasoningContent = asString(message?.reasoning_content) ?? asString(message?.reasoning);
111
126
  if (reasoningContent)
112
127
  yield { type: "assistant_message", message: createThinkingMessage(reasoningContent) };
113
128
  const content = asString(message?.content);
114
- if (content)
115
- yield { type: "assistant_message", message: createTextMessage("assistant", content) };
129
+ if (content) {
130
+ const blocks = [];
131
+ appendChatText(blocks, content, allowsVisibleChatContent(body, choice, message));
132
+ yield { type: "assistant_message", message: { ...createTextMessage("assistant", ""), blocks } };
133
+ }
116
134
  const toolCalls = Array.isArray(message?.tool_calls) ? message?.tool_calls : [];
117
135
  for (const toolCall of toolCalls) {
118
136
  const fn = toolCall.function;
@@ -131,4 +149,19 @@ export function* normalizeChatObject(response) {
131
149
  yield { type: "usage", usage };
132
150
  yield { type: "response_completed", responseId, stopReason: "completed", usage };
133
151
  }
152
+ // Chat content is public by contract, but compatible servers may explicitly
153
+ // label private channels. Never authorize reasoning fields or an analysis channel.
154
+ function allowsVisibleChatContent(...scopes) {
155
+ return scopes.every(scope => !scope || ((scope.role === undefined || scope.role === "assistant") &&
156
+ (scope.channel === undefined || ["commentary", "answer", "final"].includes(String(scope.channel))) &&
157
+ (scope.phase === undefined || ["commentary", "answer", "final", "final_answer"].includes(String(scope.phase)))));
158
+ }
159
+ function appendChatText(blocks, text, visible) {
160
+ const displayChannel = visible ? "visible" : undefined;
161
+ const last = blocks.at(-1);
162
+ if (last && last.displayChannel === displayChannel)
163
+ last.text += text;
164
+ else
165
+ blocks.push({ type: "text", text, ...(visible ? { displayChannel: "visible" } : {}) });
166
+ }
134
167
  //# sourceMappingURL=openai-chat-mapper.js.map
package/dist/model/openai-chat-mapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"openai-chat-mapper.js","sourceRoot":"","sources":["../../src/model/openai-chat-mapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openai-chat-mapper.js","sourceRoot":"","sources":["../../src/model/openai-chat-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAqB,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAGvE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,0BAA0B,EAC1B,cAAc,EACd,SAAS,GAEV,MAAM,qBAAqB,CAAC;AAW7B,MAAM,UAAU,gBAAgB,CAAC,OAAqB,EAAE,OAAgC;IACtF,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IAC7C,MAAM,WAAW,GAAG,wBAAwB,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnI,MAAM,iBAAiB,GAAG,OAAO,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC;IAC/H,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,gBAAgB,IAAI,SAAS,CAAC,CAAC;IAC/G,OAAO,aAAa,CAAC;QACnB,KAAK;QACL,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC;QACpC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;QACvC,WAAW,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,UAAU,EAAE,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,sBAAsB;QACrE,gBAAgB,EAAE,yBAAyB,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC;QACtF,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,iBAAiB,CAAC;QAC1F,QAAQ,EAAE,OAAO,CAAC,eAAe,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ;QAC1E,YAAY,EAAE,OAAO,CAAC,WAAW;QACjC,gBAAgB,EAAE,WAAW,CAAC,GAAG;QACjC,GAAG,CAAE,OAAO,CAAC,eAAe,EAAE,IAA4C,IAAI,EAAE,CAAC;KAClF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAc,EAAE,SAAsC;IACvF,OAAO,SAAS,EAAE,MAAM,CAAC;AAC3B,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc,EAAE,UAAuC,EAAE,kBAA2B;IAC9G,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,mBAAmB,CACxC,MAAkC,EAClC,OAAgC;IAEhC,KAAK,CAAC,CAAC,qBAAqB,CAAC,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,yBAAyB,CACvC,MAAkC,EAClC,OAAgC;IAEhC,MAAM,UAAU,GAA8C,EAAE,CAAC;IACjE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAmC,CAAC;IAChE,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAC;IAClD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7C,IAAI,UAA8B,CAAC;IACnC,IAAI,KAAK,GAAG,SAA8C,CAAC;IAE3D,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,mBAAmB,IAAI,MAAM,CAAC,EAAE,CAAC;QACjF,MAAM,KAAK,GAAG,GAAG,CAAC,IAA+B,CAAC;QAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;QACxC,IAAI,IAAI,KAAK,OAAO;YAAE,MAAM,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,CAAC;QAChG,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC;QAC9C,MAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,GAAG,UAAU,CAAC;YACnB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAElE,KAAK,MAAM,MAAM,IAAI,OAAoC,EAAE,CAAC;YAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,KAA4C,CAAC;YAClE,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YACnD,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC;gBAC/C,MAAM,KAAK,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBACxD,IAAI,KAAK,KAAK,SAAS;oBAAE,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC9C,CAAC;YACD,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YACrC,0EAA0E;YAC1E,0EAA0E;YAC1E,MAAM,gBAAgB,GAAG,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC1F,IAAI,gBAAgB,EAAE,CAAC;gBACrB,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBACrC,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;YAC3D,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACzC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,OAAO,GAAG,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAC/D,cAAc,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,SAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/G,CAAC;YAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5E,KAAK,MAAM,QAAQ,IAAI,SAAsC,EAAE,CAAC;gBAC9D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;gBAC3D,MAAM,EAAE,GAAG,QAAQ,CAAC,QAA+C,CAAC;gBACpE,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI;oBACvC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,KAAK,EAAE;oBAChD,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,cAAc;oBAC1C,eAAe,EAAE,EAAE;iBACpB,CAAC;gBACF,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC;gBACvD,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC;gBAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;gBAChD,MAAM,CAAC,eAAe,IAAI,SAAS,CAAC;gBACpC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAC/B,4EAA4E;gBAC5E,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;oBACzD,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBAC9B,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChF,CAAC;gBACD,IAAI,SAAS;oBAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC;YACxH,CAAC;YAED,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACpD,IAAI,YAAY;gBAAE,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;YACxD,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;gBAClC,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,MAAM,EAAE;oBAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACpG,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/C,IAAI,QAAQ;QAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC5F,IAAI,UAAU,CAAC,MAAM;QAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,EAAE,GAAG,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;IACnI,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;AACnF,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,mBAAmB,CAAC,QAAmD;IACtF,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC3B,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,UAAU;QAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,KAAK,MAAM,MAAM,IAAI,OAAoC,EAAE,CAAC;QAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,OAA8C,CAAC;QACtE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9F,IAAI,gBAAgB;YAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC5G,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,MAAM,GAA8C,EAAE,CAAC;YAC7D,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;YACjF,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,EAAE,GAAG,iBAAiB,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;QAClG,CAAC;QACD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,KAAK,MAAM,QAAQ,IAAI,SAAsC,EAAE,CAAC;YAC9D,MAAM,EAAE,GAAG,QAAQ,CAAC,QAA+C,CAAC;YACpE,MAAM;gBACJ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,SAAS,CAAC;oBACjB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,cAAc;oBAC/C,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,cAAc;oBAC1C,eAAe,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,IAAI;iBACjD,CAAC;aACH,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,KAAK;QAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC1C,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;AACnF,CAAC;AAED,4EAA4E;AAC5E,mFAAmF;AACnF,SAAS,wBAAwB,CAAC,GAAG,MAA+C;IAClF,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CACrC,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC;QACxD,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAClG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAC/G,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,MAAiD,EAAE,IAAY,EAAE,OAAgB;IACvG,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,IAAI,IAAI,IAAI,CAAC,cAAc,KAAK,cAAc;QAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;;QACjE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,SAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACvG,CAAC"}
package/dist/model/openai-responses-mapper.js CHANGED
@@ -1,6 +1,8 @@
1
1
  import { createTextMessage, createThinkingMessage } from "../types/messages.js";
2
2
  import { buildPromptCacheIdentity } from "../core/prompt-cache-key.js";
3
3
  import { decodeSSE } from "./sse-decoder.js";
4
+ import { withThinkingLifecycle } from "./thinking-lifecycle.js";
5
+ import { findModelMetadata } from "./context-window.js";
4
6
  import { ModelAPIError } from "./errors.js";
5
7
  import { asNumber, asString, buildResponsesInput, buildResponsesTools, dropUndefined, ensureToolBuffer, normalizeOpenAIStreamError, normalizeUsage, toToolUse, } from "./openai-mappers.js";
6
8
  export function buildResponsesRequest(request, options) {
@@ -18,6 +20,10 @@ export function buildResponsesRequest(request, options) {
18
20
  const instructions = [promptCache.stableSystemPrompt, promptCache.dynamicSystemPrompt].filter(Boolean).join("\n\n") || undefined;
19
21
  const input = [...stableRuntimeInput, ...conversationInput];
20
22
  const reasoningDisabled = request.reasoning === null || (request.reasoning === undefined && options.defaultReasoning === null);
23
+ const reasoning = request.reasoning ?? options.defaultReasoning ?? undefined;
24
+ const supportsReasoning = findModelMetadata(model)?.reasoning ?? (!!reasoning || /^(?:o[134](?:-|$)|gpt-[5-9](?:[.-]|$))/i.test(model));
25
+ const visibleReasoning = !reasoningDisabled && reasoning?.effort !== "none" && supportsReasoning
26
+ ? { ...reasoning, summary: reasoning?.summary ?? "auto" } : reasoning;
21
27
  const toolChoice = constrainedResponsesToolChoice(request.toolChoice, tools);
22
28
  const body = dropUndefined({
23
29
  model,
@@ -25,7 +31,7 @@ export function buildResponsesRequest(request, options) {
25
31
  input,
26
32
  previous_response_id: request.previousResponseId,
27
33
  max_output_tokens: request.maxOutputTokens ?? options.defaultMaxOutputTokens,
28
- reasoning: reasoningDisabled ? undefined : (request.reasoning ?? options.defaultReasoning ?? undefined),
34
+ reasoning: reasoningDisabled ? undefined : visibleReasoning,
29
35
  text: request.textFormat ? { format: request.textFormat } : undefined,
30
36
  metadata: request.metadata,
31
37
  service_tier: request.serviceTier,
@@ -49,6 +55,9 @@ function supportsExplicitPromptCaching(model) {
49
55
  return major > 5 || (major === 5 && minor >= 6);
50
56
  }
51
57
  export async function* normalizeResponsesStream(stream, options) {
58
+ yield* withThinkingLifecycle(normalizeResponsesStreamEvents(stream, options));
59
+ }
60
+ async function* normalizeResponsesStreamEvents(stream, options) {
52
61
  const textBlocks = [];
53
62
  const thinkingParts = [];
54
63
  const toolBuffers = new Map();
@@ -57,6 +66,38 @@ export async function* normalizeResponsesStream(stream, options) {
57
66
  let reasoningPartKey;
58
67
  const outputItems = new Map();
59
68
  const contentParts = new Map();
69
+ const reasoningTextByPart = new Map();
70
+ const completedReasoning = new Map();
71
+ function* publishReasoning(text, key, snapshot = false) {
72
+ if (!text)
73
+ return;
74
+ const previous = reasoningTextByPart.get(key) ?? "";
75
+ const delta = snapshot ? (text.startsWith(previous) ? text.slice(previous.length) : previous ? "" : text) : text;
76
+ reasoningTextByPart.set(key, snapshot ? text : previous + text);
77
+ if (!delta)
78
+ return;
79
+ const separated = reasoningPartKey !== undefined && reasoningPartKey !== key ? `\n\n${delta}` : delta;
80
+ reasoningPartKey = key;
81
+ thinkingParts.push(separated);
82
+ yield { type: "thinking_delta", text: separated };
83
+ }
84
+ function* publishReasoningItem(item, fallback) {
85
+ const id = asString(item.id) ?? String(fallback);
86
+ completedReasoning.set(id, item);
87
+ let structured = false;
88
+ for (const field of ["summary", "content"]) {
89
+ const parts = Array.isArray(item[field]) ? item[field] : [];
90
+ for (const [index, part] of parts.entries()) {
91
+ const text = typeof part === "string" ? part : part && typeof part === "object" ? extractReasoningText(part) : "";
92
+ if (text) {
93
+ structured = true;
94
+ yield* publishReasoning(text, `${id}:${field}:${index}`, true);
95
+ }
96
+ }
97
+ }
98
+ if (!structured)
99
+ yield* publishReasoning(extractReasoningText(item), `${id}:content:0`, true);
100
+ }
60
101
  for await (const sse of decodeSSE(stream, options.streamIdleTimeoutMs ?? 120000)) {
61
102
  const event = sse.data;
62
103
  const type = asString(event.type ?? sse.event);
@@ -69,7 +110,7 @@ export async function* normalizeResponsesStream(stream, options) {
69
110
  yield { type: "response_started", responseId };
70
111
  }
71
112
  const itemKey = asString(event.item_id) ?? asNumber(event.output_index) ?? 0;
72
- if (type === "response.output_item.added") {
113
+ if (type === "response.output_item.added" || type === "response.output_item.done") {
73
114
  const item = event.item;
74
115
  if (item) {
75
116
  outputItems.set(asNumber(event.output_index) ?? 0, item);
@@ -94,17 +135,19 @@ export async function* normalizeResponsesStream(stream, options) {
94
135
  if (type === "response.output_text.done" || (type === "response.output_item.done" && event.item?.type === "message")) {
95
136
  yield { type: "assistant_text_done" };
96
137
  }
138
+ const reasoningEvent = { ...event, item_id: event.item_id ?? outputItems.get(asNumber(event.output_index) ?? 0)?.id };
97
139
  if (isReasoningDeltaEvent(type)) {
98
- const delta = extractThinkingDelta(event);
99
- if (delta) {
100
- const nextPartKey = reasoningPartKeyForEvent(type, event);
101
- const text = reasoningPartKey !== undefined && nextPartKey !== undefined && reasoningPartKey !== nextPartKey
102
- ? `\n\n${delta}`
103
- : delta;
104
- reasoningPartKey = nextPartKey ?? reasoningPartKey;
105
- thinkingParts.push(text);
106
- yield { type: "thinking_delta", text };
107
- }
140
+ yield* publishReasoning(extractThinkingDelta(event), reasoningPartKeyForEvent(type, reasoningEvent));
141
+ }
142
+ if (type?.startsWith("response.reasoning") && (type.endsWith(".done") || type.endsWith(".added"))) {
143
+ const part = event.part && typeof event.part === "object" ? event.part : event;
144
+ yield* publishReasoning(extractReasoningText(part), reasoningPartKeyForEvent(type, reasoningEvent), true);
145
+ if (type.endsWith(".done"))
146
+ yield { type: "thinking_done" };
147
+ }
148
+ if (type === "response.output_item.done" && event.item?.type === "reasoning") {
149
+ yield* publishReasoningItem(event.item, itemKey);
150
+ yield { type: "thinking_done" };
108
151
  }
109
152
  if (type === "response.output_item.added") {
110
153
  const item = event.item;
@@ -149,7 +192,12 @@ export async function* normalizeResponsesStream(stream, options) {
149
192
  if (type === "response.completed") {
150
193
  const response = event.response;
151
194
  responseId = asString(response?.id) ?? responseId;
152
- const thinking = collectThinkingFromResponse(response, thinkingParts);
195
+ for (const [index, item] of (Array.isArray(response?.output) ? response.output : []).entries()) {
196
+ if (item.type === "reasoning")
197
+ yield* publishReasoningItem(item, index);
198
+ }
199
+ yield { type: "thinking_done" };
200
+ const thinking = collectThinkingFromResponse({ output: [...completedReasoning.values()] }, thinkingParts);
153
201
  if (thinking)
154
202
  yield { type: "assistant_message", message: createThinkingMessage(thinking) };
155
203
  if (textBlocks.length)
@@ -161,7 +209,12 @@ export async function* normalizeResponsesStream(stream, options) {
161
209
  }
162
210
  if (type === "response.incomplete") {
163
211
  const response = event.response;
164
- const thinking = collectThinkingFromResponse(response, thinkingParts);
212
+ for (const [index, item] of (Array.isArray(response?.output) ? response.output : []).entries()) {
213
+ if (item.type === "reasoning")
214
+ yield* publishReasoningItem(item, index);
215
+ }
216
+ yield { type: "thinking_done" };
217
+ const thinking = collectThinkingFromResponse({ output: [...completedReasoning.values()] }, thinkingParts);
165
218
  if (thinking)
166
219
  yield { type: "assistant_message", message: createThinkingMessage(thinking) };
167
220
  const usage = normalizeUsage(response?.usage);
@@ -282,11 +335,11 @@ function collectThinkingFromResponse(response, streamedParts) {
282
335
  return (fromOutput || streamed).trim();
283
336
  }
284
337
  function reasoningPartKeyForEvent(type, event) {
285
- const itemId = asString(event.item_id) ?? "reasoning";
286
- if (type === "response.reasoning_summary.delta" || type === "response.reasoning_summary_text.delta") {
338
+ const itemId = asString(event.item_id) ?? String(asNumber(event.output_index) ?? 0);
339
+ if (type?.startsWith("response.reasoning_summary")) {
287
340
  return `${itemId}:summary:${asNumber(event.summary_index) ?? 0}`;
288
341
  }
289
- if (type === "response.reasoning_text.delta" || type === "response.reasoning.delta") {
342
+ if (type?.startsWith("response.reasoning")) {
290
343
  return `${itemId}:content:${asNumber(event.content_index) ?? 0}`;
291
344
  }
292
345
  return undefined;
package/dist/model/openai-responses-mapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"openai-responses-mapper.js","sourceRoot":"","sources":["../../src/model/openai-responses-mapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openai-responses-mapper.js","sourceRoot":"","sources":["../../src/model/openai-responses-mapper.ts"],"names":[],"mappings":"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"}
package/dist/model/thinking-lifecycle.d.ts ADDED
@@ -0,0 +1,5 @@
1
+ import type { ModelStreamEvent } from "./model-gateway.js";
2
+ /** Normalize provider boundaries and defend against compatible streams omitting them.
3
+ * Wrap outside cancellation races too: EOF/abort/errors must stop the UI immediately.
4
+ */
5
+ export declare function withThinkingLifecycle(source: AsyncIterable<ModelStreamEvent>): AsyncGenerator<ModelStreamEvent>;
package/dist/model/thinking-lifecycle.js ADDED
@@ -0,0 +1,43 @@
1
+ /** Normalize provider boundaries and defend against compatible streams omitting them.
2
+ * Wrap outside cancellation races too: EOF/abort/errors must stop the UI immediately.
3
+ */
4
+ export async function* withThinkingLifecycle(source) {
5
+ let active = false;
6
+ try {
7
+ for await (const event of source) {
8
+ if (event.type === "thinking_delta") {
9
+ if (!event.text)
10
+ continue;
11
+ active = true;
12
+ }
13
+ else if (event.type === "thinking_done") {
14
+ if (!active)
15
+ continue;
16
+ active = false;
17
+ }
18
+ else if (active && endsThinking(event)) {
19
+ active = false;
20
+ yield { type: "thinking_done" };
21
+ }
22
+ yield event;
23
+ }
24
+ }
25
+ catch (error) {
26
+ if (active) {
27
+ active = false;
28
+ yield { type: "thinking_done" };
29
+ }
30
+ throw error;
31
+ }
32
+ if (active)
33
+ yield { type: "thinking_done" };
34
+ }
35
+ function endsThinking(event) {
36
+ return (event.type === "assistant_delta" && !!event.text)
37
+ || event.type === "assistant_text_done"
38
+ || event.type === "assistant_message"
39
+ || event.type === "tool_call_started" || event.type === "tool_call_delta" || event.type === "tool_use"
40
+ || event.type === "response_completed" || event.type === "response_incomplete"
41
+ || event.type === "error" || event.type === "retrying" || event.type === "retry";
42
+ }
43
+ //# sourceMappingURL=thinking-lifecycle.js.map
package/dist/model/thinking-lifecycle.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"thinking-lifecycle.js","sourceRoot":"","sources":["../../src/model/thinking-lifecycle.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,qBAAqB,CAAC,MAAuC;IAClF,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,SAAS;gBAC1B,MAAM,GAAG,IAAI,CAAC;YAChB,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBAC1C,IAAI,CAAC,MAAM;oBAAE,SAAS;gBACtB,MAAM,GAAG,KAAK,CAAC;YACjB,CAAC;iBAAM,IAAI,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,MAAM,GAAG,KAAK,CAAC;gBACf,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;YAClC,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,MAAM,EAAE,CAAC;YAAC,MAAM,GAAG,KAAK,CAAC;YAAC,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;QAAC,CAAC;QAChE,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,MAAM;QAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,YAAY,CAAC,KAAuB;IAC3C,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;WACpD,KAAK,CAAC,IAAI,KAAK,qBAAqB;WACpC,KAAK,CAAC,IAAI,KAAK,mBAAmB;WAClC,KAAK,CAAC,IAAI,KAAK,mBAAmB,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;WACnG,KAAK,CAAC,IAAI,KAAK,oBAAoB,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB;WAC3E,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC;AACrF,CAAC"}
package/dist/repl/index.js CHANGED
@@ -2927,7 +2927,11 @@ function reduceStatus(status, event) {
2927
2927
  activityTick: status.activityTick + 1,
2928
2928
  };
2929
2929
  }
2930
+ if (event.type === "thinking.done")
2931
+ return status.phase === "thinking" ? { ...status, phase: "calling_model", activityTick: status.activityTick + 1 } : status;
2930
2932
  if (event.type === "thinking.delta") {
2933
+ if (!event.text)
2934
+ return status;
2931
2935
  return {
2932
2936
  ...status,
2933
2937
  phase: "thinking",