funolio-agent 1.0.7 → 1.0.48
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/dist/agent-config.d.ts +9 -1
- package/dist/agent-config.d.ts.map +1 -1
- package/dist/agent-config.js +4 -1
- package/dist/agent-config.js.map +1 -1
- package/dist/approval.d.ts +1 -0
- package/dist/approval.d.ts.map +1 -1
- package/dist/approval.js +12 -0
- package/dist/approval.js.map +1 -1
- package/dist/auth/auto-detect.d.ts +11 -3
- package/dist/auth/auto-detect.d.ts.map +1 -1
- package/dist/auth/auto-detect.js +136 -168
- package/dist/auth/auto-detect.js.map +1 -1
- package/dist/auth/subscription-runtime.js +1 -1
- package/dist/auth/subscription-runtime.js.map +1 -1
- package/dist/auto-organizer.d.ts.map +1 -1
- package/dist/auto-organizer.js +4 -3
- package/dist/auto-organizer.js.map +1 -1
- package/dist/backfill.d.ts.map +1 -1
- package/dist/backfill.js +34 -30
- package/dist/backfill.js.map +1 -1
- package/dist/bot-manager.d.ts +4 -8
- package/dist/bot-manager.d.ts.map +1 -1
- package/dist/bot-manager.js +31 -160
- package/dist/bot-manager.js.map +1 -1
- package/dist/clerk-model.d.ts +15 -7
- package/dist/clerk-model.d.ts.map +1 -1
- package/dist/clerk-model.js +78 -43
- package/dist/clerk-model.js.map +1 -1
- package/dist/cli-session-epoch.d.ts +10 -0
- package/dist/cli-session-epoch.d.ts.map +1 -0
- package/dist/cli-session-epoch.js +61 -0
- package/dist/cli-session-epoch.js.map +1 -0
- package/dist/cli.js +7 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/import-history.js +5 -1
- package/dist/commands/import-history.js.map +1 -1
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +30 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/pool.js +1 -1
- package/dist/commands/pool.js.map +1 -1
- package/dist/commands/setup.d.ts +37 -0
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +146 -43
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +117 -255
- package/dist/commands/start.js.map +1 -1
- package/dist/config-cleanup.d.ts.map +1 -1
- package/dist/config-cleanup.js +2 -1
- package/dist/config-cleanup.js.map +1 -1
- package/dist/config.d.ts +6 -9
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +7 -18
- package/dist/config.js.map +1 -1
- package/dist/context-window.d.ts +33 -5
- package/dist/context-window.d.ts.map +1 -1
- package/dist/context-window.js +122 -21
- package/dist/context-window.js.map +1 -1
- package/dist/eval/orchestrator-front-door-replay.js +1 -1
- package/dist/eval/orchestrator-front-door-replay.js.map +1 -1
- package/dist/eval/policy-detection-replay.js +1 -1
- package/dist/eval/policy-detection-replay.js.map +1 -1
- package/dist/import-parser-core.d.ts.map +1 -1
- package/dist/import-parser-core.js +74 -8
- package/dist/import-parser-core.js.map +1 -1
- package/dist/integration-tokens.d.ts +1 -6
- package/dist/integration-tokens.d.ts.map +1 -1
- package/dist/integration-tokens.js +38 -40
- package/dist/integration-tokens.js.map +1 -1
- package/dist/local-cli-pty-manager.d.ts +50 -0
- package/dist/local-cli-pty-manager.d.ts.map +1 -0
- package/dist/local-cli-pty-manager.js +645 -0
- package/dist/local-cli-pty-manager.js.map +1 -0
- package/dist/local-data.d.ts +89 -6
- package/dist/local-data.d.ts.map +1 -1
- package/dist/local-data.js +600 -63
- package/dist/local-data.js.map +1 -1
- package/dist/local-db.d.ts.map +1 -1
- package/dist/local-db.js +74 -1
- package/dist/local-db.js.map +1 -1
- package/dist/local-funnel.d.ts +0 -7
- package/dist/local-funnel.d.ts.map +1 -1
- package/dist/local-funnel.js +22 -30
- package/dist/local-funnel.js.map +1 -1
- package/dist/local-import-worker.d.ts.map +1 -1
- package/dist/local-import-worker.js +49 -4
- package/dist/local-import-worker.js.map +1 -1
- package/dist/local-memory-search.d.ts +1 -0
- package/dist/local-memory-search.d.ts.map +1 -1
- package/dist/local-memory-search.js +107 -21
- package/dist/local-memory-search.js.map +1 -1
- package/dist/local-server.d.ts +21 -0
- package/dist/local-server.d.ts.map +1 -1
- package/dist/local-server.js +1057 -501
- package/dist/local-server.js.map +1 -1
- package/dist/mcp/bridge-server.d.ts.map +1 -1
- package/dist/mcp/bridge-server.js +2 -1
- package/dist/mcp/bridge-server.js.map +1 -1
- package/dist/mcp/local-memory-server.d.ts +6 -1
- package/dist/mcp/local-memory-server.d.ts.map +1 -1
- package/dist/mcp/local-memory-server.js +38 -13
- package/dist/mcp/local-memory-server.js.map +1 -1
- package/dist/mcp/manager.d.ts +3 -22
- package/dist/mcp/manager.d.ts.map +1 -1
- package/dist/mcp/manager.js +66 -320
- package/dist/mcp/manager.js.map +1 -1
- package/dist/memory-extraction.d.ts +2 -0
- package/dist/memory-extraction.d.ts.map +1 -1
- package/dist/memory-extraction.js +3 -1
- package/dist/memory-extraction.js.map +1 -1
- package/dist/message-loop.d.ts +1 -3
- package/dist/message-loop.d.ts.map +1 -1
- package/dist/message-loop.js +220 -437
- package/dist/message-loop.js.map +1 -1
- package/dist/mqtt-client.d.ts +2 -28
- package/dist/mqtt-client.d.ts.map +1 -1
- package/dist/mqtt-client.js +2 -2
- package/dist/mqtt-client.js.map +1 -1
- package/dist/oauth.d.ts +6 -0
- package/dist/oauth.d.ts.map +1 -1
- package/dist/oauth.js +91 -0
- package/dist/oauth.js.map +1 -1
- package/dist/orchestration/front-door-policy.d.ts +5 -2
- package/dist/orchestration/front-door-policy.d.ts.map +1 -1
- package/dist/orchestration/front-door-policy.js +25 -28
- package/dist/orchestration/front-door-policy.js.map +1 -1
- package/dist/orchestration/orchestrator-blocked-prompt.d.ts +2 -1
- package/dist/orchestration/orchestrator-blocked-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-blocked-prompt.js +12 -1
- package/dist/orchestration/orchestrator-blocked-prompt.js.map +1 -1
- package/dist/orchestration/orchestrator-final-response-prompt.d.ts +4 -1
- package/dist/orchestration/orchestrator-final-response-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-final-response-prompt.js +9 -7
- package/dist/orchestration/orchestrator-final-response-prompt.js.map +1 -1
- package/dist/orchestration/orchestrator-operating-prompt.d.ts +11 -0
- package/dist/orchestration/orchestrator-operating-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-operating-prompt.js +67 -44
- package/dist/orchestration/orchestrator-operating-prompt.js.map +1 -1
- package/dist/orchestration/worker-operating-prompt.d.ts +2 -0
- package/dist/orchestration/worker-operating-prompt.d.ts.map +1 -1
- package/dist/orchestration/worker-operating-prompt.js +41 -2
- package/dist/orchestration/worker-operating-prompt.js.map +1 -1
- package/dist/orchestrator.d.ts +17 -0
- package/dist/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator.js +328 -166
- package/dist/orchestrator.js.map +1 -1
- package/dist/prompt-template.js +3 -3
- package/dist/prompt-template.js.map +1 -1
- package/dist/providers/anthropic.d.ts +0 -5
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +29 -75
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/claude-cli-prompt.d.ts.map +1 -1
- package/dist/providers/claude-cli-prompt.js +22 -6
- package/dist/providers/claude-cli-prompt.js.map +1 -1
- package/dist/providers/claude-cli.d.ts.map +1 -1
- package/dist/providers/claude-cli.js +36 -142
- package/dist/providers/claude-cli.js.map +1 -1
- package/dist/providers/codex-cli.d.ts.map +1 -1
- package/dist/providers/codex-cli.js +148 -74
- package/dist/providers/codex-cli.js.map +1 -1
- package/dist/providers/google.d.ts.map +1 -1
- package/dist/providers/google.js +4 -2
- package/dist/providers/google.js.map +1 -1
- package/dist/providers/index.d.ts +13 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +27 -2
- package/dist/providers/openai.js.map +1 -1
- package/dist/runtime-context.d.ts +10 -0
- package/dist/runtime-context.d.ts.map +1 -0
- package/dist/runtime-context.js +30 -0
- package/dist/runtime-context.js.map +1 -0
- package/dist/storage-mode.d.ts +5 -0
- package/dist/storage-mode.d.ts.map +1 -0
- package/dist/storage-mode.js +21 -0
- package/dist/storage-mode.js.map +1 -0
- package/dist/subagent/queue.d.ts.map +1 -1
- package/dist/subagent/queue.js +1 -0
- package/dist/subagent/queue.js.map +1 -1
- package/dist/summarization-pipeline.d.ts +10 -0
- package/dist/summarization-pipeline.d.ts.map +1 -1
- package/dist/summarization-pipeline.js +147 -34
- package/dist/summarization-pipeline.js.map +1 -1
- package/dist/tool-permissions.d.ts +2 -0
- package/dist/tool-permissions.d.ts.map +1 -0
- package/dist/tool-permissions.js +25 -0
- package/dist/tool-permissions.js.map +1 -0
- package/dist/tools/analyze-image.js +2 -2
- package/dist/tools/analyze-image.js.map +1 -1
- package/dist/tools/edit-file.js +3 -3
- package/dist/tools/edit-file.js.map +1 -1
- package/dist/tools/index.d.ts +7 -8
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +106 -60
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/list-directory.js +7 -4
- package/dist/tools/list-directory.js.map +1 -1
- package/dist/tools/read-file.js +3 -3
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/run-command.js +3 -3
- package/dist/tools/run-command.js.map +1 -1
- package/dist/tools/sandbox.d.ts +10 -5
- package/dist/tools/sandbox.d.ts.map +1 -1
- package/dist/tools/sandbox.js +41 -13
- package/dist/tools/sandbox.js.map +1 -1
- package/dist/tools/search-codebase.js +2 -2
- package/dist/tools/search-codebase.js.map +1 -1
- package/dist/tools/search-local-memory.d.ts.map +1 -1
- package/dist/tools/search-local-memory.js +19 -8
- package/dist/tools/search-local-memory.js.map +1 -1
- package/dist/tools/search-memory.d.ts.map +1 -1
- package/dist/tools/search-memory.js +9 -3
- package/dist/tools/search-memory.js.map +1 -1
- package/dist/tools/spawn-subagent.d.ts.map +1 -1
- package/dist/tools/spawn-subagent.js +1 -0
- package/dist/tools/spawn-subagent.js.map +1 -1
- package/dist/tools/write-file.js +3 -3
- package/dist/tools/write-file.js.map +1 -1
- package/dist/types.d.ts +5 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +0 -3
- package/dist/types.js.map +1 -1
- package/dist/verification/index.js +2 -2
- package/dist/verification/index.js.map +1 -1
- package/dist/wizard-state.d.ts.map +1 -1
- package/dist/wizard-state.js +16 -2
- package/dist/wizard-state.js.map +1 -1
- package/dist/wizard-support.d.ts +2 -2
- package/dist/wizard-support.d.ts.map +1 -1
- package/dist/wizard-support.js +88 -99
- package/dist/wizard-support.js.map +1 -1
- package/dist/workflow-engine.d.ts +9 -3
- package/dist/workflow-engine.d.ts.map +1 -1
- package/dist/workflow-engine.js +378 -82
- package/dist/workflow-engine.js.map +1 -1
- package/package.json +2 -1
|
@@ -38,12 +38,10 @@ const child_process_1 = require("child_process");
|
|
|
38
38
|
const fs = __importStar(require("fs"));
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
40
|
const sync_cli_config_1 = require("../mcp/sync-cli-config");
|
|
41
|
+
const runtime_context_1 = require("../runtime-context");
|
|
41
42
|
// Windows STATUS_DLL_INIT_FAILED — benign crash during process cleanup
|
|
42
43
|
const WIN_DLL_INIT_FAILED = 3221225794; // 0xC0000142
|
|
43
44
|
const MAX_RETRIES = 2;
|
|
44
|
-
const INITIAL_TIMEOUT_MS = 90_000;
|
|
45
|
-
const INACTIVITY_TIMEOUT_MS = 45_000;
|
|
46
|
-
const HARD_TIMEOUT_MS = 180_000;
|
|
47
45
|
let codexConfigPatchDepth = 0;
|
|
48
46
|
let codexConfigPatchOriginal = '';
|
|
49
47
|
let codexConfigPatchHadFile = false;
|
|
@@ -143,12 +141,23 @@ class CodexCliProvider {
|
|
|
143
141
|
}
|
|
144
142
|
buildPrompt(options) {
|
|
145
143
|
let fullPrompt = '';
|
|
146
|
-
|
|
144
|
+
const isResumedSession = (0, runtime_context_1.isLocalDesktopRuntime)(options.runtimeMode ?? this.config.runtimeMode) && !!options.resumeSessionId;
|
|
145
|
+
if (!isResumedSession && options.system) {
|
|
147
146
|
fullPrompt += `[System Instructions]\n${options.system}\n\n`;
|
|
148
147
|
}
|
|
149
148
|
const messages = options.messages || [];
|
|
150
149
|
const lastMessage = messages.length > 0 ? messages[messages.length - 1] : null;
|
|
151
|
-
|
|
150
|
+
const trailingToolMessages = (() => {
|
|
151
|
+
const tools = [];
|
|
152
|
+
for (let idx = messages.length - 1; idx >= 0; idx--) {
|
|
153
|
+
const msg = messages[idx];
|
|
154
|
+
if (msg.role !== 'tool')
|
|
155
|
+
break;
|
|
156
|
+
tools.unshift(msg);
|
|
157
|
+
}
|
|
158
|
+
return tools;
|
|
159
|
+
})();
|
|
160
|
+
if (!isResumedSession && messages.length > 0) {
|
|
152
161
|
const transcriptMessages = lastMessage?.role === 'user' ? messages.slice(0, -1) : messages;
|
|
153
162
|
if (transcriptMessages.length > 0) {
|
|
154
163
|
fullPrompt += '[Recent Transcript]\n';
|
|
@@ -167,8 +176,13 @@ class CodexCliProvider {
|
|
|
167
176
|
fullPrompt += `[User Request]\n${prompt}`;
|
|
168
177
|
}
|
|
169
178
|
else if (lastMessage?.role === 'tool') {
|
|
170
|
-
const
|
|
171
|
-
|
|
179
|
+
const toolBlocks = (trailingToolMessages.length > 0 ? trailingToolMessages : [lastMessage])
|
|
180
|
+
.map((msg) => {
|
|
181
|
+
const content = typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content);
|
|
182
|
+
return `[${msg.toolName || 'tool'}]\n${content}`;
|
|
183
|
+
})
|
|
184
|
+
.join('\n\n');
|
|
185
|
+
fullPrompt += `[Latest Tool Result${trailingToolMessages.length > 1 ? 's' : ''}]\n${toolBlocks}\n\nContinue from the transcript above. If the work is complete, return the final answer with the required footer.`;
|
|
172
186
|
}
|
|
173
187
|
else if (lastMessage) {
|
|
174
188
|
const content = typeof lastMessage.content === 'string' ? lastMessage.content : JSON.stringify(lastMessage.content);
|
|
@@ -181,17 +195,33 @@ class CodexCliProvider {
|
|
|
181
195
|
}
|
|
182
196
|
spawnCodex(prompt, options) {
|
|
183
197
|
return new Promise((resolve, reject) => {
|
|
198
|
+
const isLocalDesktop = (0, runtime_context_1.isLocalDesktopRuntime)(options.runtimeMode ?? this.config.runtimeMode);
|
|
199
|
+
const resumeSessionId = isLocalDesktop ? options.resumeSessionId : null;
|
|
200
|
+
const persistSession = isLocalDesktop ? options.persistSession : false;
|
|
184
201
|
// The `-` argument tells codex exec to read prompt from stdin.
|
|
185
202
|
// --skip-git-repo-check is required because sidecar cwd may not be a git repo.
|
|
186
|
-
const args =
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
203
|
+
const args = resumeSessionId
|
|
204
|
+
? [
|
|
205
|
+
'exec',
|
|
206
|
+
'resume',
|
|
207
|
+
resumeSessionId,
|
|
208
|
+
'--skip-git-repo-check',
|
|
209
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
210
|
+
'-c',
|
|
211
|
+
'shell_environment_policy.inherit=all',
|
|
212
|
+
'--json',
|
|
213
|
+
'-',
|
|
214
|
+
]
|
|
215
|
+
: [
|
|
216
|
+
'exec',
|
|
217
|
+
'--skip-git-repo-check',
|
|
218
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
219
|
+
'-c',
|
|
220
|
+
'shell_environment_policy.inherit=all',
|
|
221
|
+
...(persistSession ? [] : (isLocalDesktop ? ['--ephemeral'] : [])),
|
|
222
|
+
'--json',
|
|
223
|
+
'-',
|
|
224
|
+
];
|
|
195
225
|
const useShell = process.platform === 'win32';
|
|
196
226
|
const codexBin = 'codex';
|
|
197
227
|
const spawnCwd = options.cwd || process.cwd();
|
|
@@ -209,60 +239,73 @@ class CodexCliProvider {
|
|
|
209
239
|
},
|
|
210
240
|
cwd: spawnCwd,
|
|
211
241
|
});
|
|
242
|
+
const abortHandler = () => {
|
|
243
|
+
if (settled)
|
|
244
|
+
return;
|
|
245
|
+
settled = true;
|
|
246
|
+
clearTimers();
|
|
247
|
+
proc.kill();
|
|
248
|
+
const abortError = new Error('aborted');
|
|
249
|
+
abortError.name = 'AbortError';
|
|
250
|
+
reject(abortError);
|
|
251
|
+
};
|
|
252
|
+
options.abortSignal?.addEventListener('abort', abortHandler, { once: true });
|
|
212
253
|
let content = '';
|
|
254
|
+
let lastAssistantText = '';
|
|
213
255
|
let stderr = '';
|
|
214
256
|
let settled = false;
|
|
215
257
|
let gotOutput = false;
|
|
216
258
|
let buffer = '';
|
|
217
259
|
let usage;
|
|
218
|
-
let
|
|
219
|
-
let
|
|
220
|
-
let hardTimeoutTimer = null;
|
|
260
|
+
let sawResultEvent = false;
|
|
261
|
+
let sessionId;
|
|
221
262
|
const clearTimers = () => {
|
|
222
|
-
|
|
223
|
-
clearTimeout(firstOutputTimer);
|
|
224
|
-
if (inactivityTimer)
|
|
225
|
-
clearTimeout(inactivityTimer);
|
|
226
|
-
if (hardTimeoutTimer)
|
|
227
|
-
clearTimeout(hardTimeoutTimer);
|
|
228
|
-
firstOutputTimer = null;
|
|
229
|
-
inactivityTimer = null;
|
|
230
|
-
hardTimeoutTimer = null;
|
|
263
|
+
options.abortSignal?.removeEventListener('abort', abortHandler);
|
|
231
264
|
restoreCodexConfig();
|
|
232
265
|
};
|
|
233
|
-
const
|
|
234
|
-
if (
|
|
235
|
-
return;
|
|
236
|
-
if (
|
|
237
|
-
|
|
238
|
-
inactivityTimer = setTimeout(() => {
|
|
239
|
-
if (settled)
|
|
240
|
-
return;
|
|
241
|
-
console.warn('[codex-cli] stalled after output - killing process and using captured content');
|
|
242
|
-
proc.kill();
|
|
243
|
-
}, INACTIVITY_TIMEOUT_MS);
|
|
244
|
-
};
|
|
245
|
-
firstOutputTimer = setTimeout(() => {
|
|
246
|
-
if (!gotOutput && !settled) {
|
|
247
|
-
settled = true;
|
|
248
|
-
console.error('[codex-cli] produced no output before timeout');
|
|
249
|
-
proc.kill();
|
|
250
|
-
reject(new Error('codex CLI produced no output'));
|
|
266
|
+
const extractAssistantText = (obj) => {
|
|
267
|
+
if (!obj || typeof obj !== 'object')
|
|
268
|
+
return '';
|
|
269
|
+
if (obj.type === 'item.completed' && obj.item?.type === 'agent_message') {
|
|
270
|
+
return typeof obj.item.text === 'string' ? obj.item.text : '';
|
|
251
271
|
}
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
272
|
+
if (obj.type === 'event_msg') {
|
|
273
|
+
if (obj.payload?.type === 'agent_message' && typeof obj.payload?.message === 'string') {
|
|
274
|
+
return obj.payload.message;
|
|
275
|
+
}
|
|
276
|
+
if (obj.payload?.type === 'task_complete' && typeof obj.payload?.last_agent_message === 'string') {
|
|
277
|
+
return obj.payload.last_agent_message;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
if (obj.type === 'response_item' && obj.payload?.type === 'message' && obj.payload?.role === 'assistant') {
|
|
281
|
+
const blocks = Array.isArray(obj.payload?.content) ? obj.payload.content : [];
|
|
282
|
+
return blocks
|
|
283
|
+
.map((block) => {
|
|
284
|
+
if (!block || typeof block !== 'object')
|
|
285
|
+
return '';
|
|
286
|
+
if (block.type === 'output_text' && typeof block.text === 'string')
|
|
287
|
+
return block.text;
|
|
288
|
+
if (block.type === 'text' && typeof block.text === 'string')
|
|
289
|
+
return block.text;
|
|
290
|
+
return '';
|
|
291
|
+
})
|
|
292
|
+
.join('');
|
|
293
|
+
}
|
|
294
|
+
return '';
|
|
295
|
+
};
|
|
296
|
+
const applyAssistantSnapshot = async (assistantText) => {
|
|
297
|
+
if (!assistantText)
|
|
255
298
|
return;
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
299
|
+
const delta = assistantText.startsWith(lastAssistantText)
|
|
300
|
+
? assistantText.slice(lastAssistantText.length)
|
|
301
|
+
: assistantText;
|
|
302
|
+
lastAssistantText = assistantText;
|
|
303
|
+
if (!delta)
|
|
259
304
|
return;
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
reject(new Error('codex CLI timed out'));
|
|
265
|
-
}, HARD_TIMEOUT_MS);
|
|
305
|
+
content += delta;
|
|
306
|
+
if (options.onChunk)
|
|
307
|
+
await options.onChunk(delta);
|
|
308
|
+
};
|
|
266
309
|
proc.stdout.on('data', async (data) => {
|
|
267
310
|
buffer += data.toString();
|
|
268
311
|
const lines = buffer.split('\n');
|
|
@@ -274,10 +317,7 @@ class CodexCliProvider {
|
|
|
274
317
|
if (!gotOutput) {
|
|
275
318
|
gotOutput = true;
|
|
276
319
|
console.log('[codex-cli] first output received');
|
|
277
|
-
if (firstOutputTimer)
|
|
278
|
-
clearTimeout(firstOutputTimer);
|
|
279
320
|
}
|
|
280
|
-
resetInactivityTimer();
|
|
281
321
|
let obj;
|
|
282
322
|
try {
|
|
283
323
|
obj = JSON.parse(text);
|
|
@@ -289,13 +329,12 @@ class CodexCliProvider {
|
|
|
289
329
|
await options.onChunk(text);
|
|
290
330
|
continue;
|
|
291
331
|
}
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
}
|
|
332
|
+
const assistantText = extractAssistantText(obj);
|
|
333
|
+
if (obj.type === 'thread.started' && typeof obj.thread_id === 'string' && obj.thread_id.trim()) {
|
|
334
|
+
sessionId = obj.thread_id.trim();
|
|
335
|
+
}
|
|
336
|
+
if (assistantText) {
|
|
337
|
+
await applyAssistantSnapshot(assistantText);
|
|
299
338
|
continue;
|
|
300
339
|
}
|
|
301
340
|
if (obj.type === 'turn.completed' && obj.usage) {
|
|
@@ -303,6 +342,7 @@ class CodexCliProvider {
|
|
|
303
342
|
inputTokens: (obj.usage.input_tokens || 0) + (obj.usage.cached_input_tokens || 0),
|
|
304
343
|
outputTokens: obj.usage.output_tokens || 0,
|
|
305
344
|
};
|
|
345
|
+
sawResultEvent = true;
|
|
306
346
|
}
|
|
307
347
|
}
|
|
308
348
|
});
|
|
@@ -327,29 +367,45 @@ class CodexCliProvider {
|
|
|
327
367
|
const text = buffer.trim();
|
|
328
368
|
try {
|
|
329
369
|
const obj = JSON.parse(text);
|
|
330
|
-
if (obj.type === '
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
370
|
+
if (obj.type === 'thread.started' && typeof obj.thread_id === 'string' && obj.thread_id.trim()) {
|
|
371
|
+
sessionId = obj.thread_id.trim();
|
|
372
|
+
}
|
|
373
|
+
const assistantText = extractAssistantText(obj);
|
|
374
|
+
if (assistantText) {
|
|
375
|
+
const delta = assistantText.startsWith(lastAssistantText)
|
|
376
|
+
? assistantText.slice(lastAssistantText.length)
|
|
377
|
+
: assistantText;
|
|
378
|
+
lastAssistantText = assistantText;
|
|
379
|
+
if (delta)
|
|
380
|
+
content += delta;
|
|
334
381
|
}
|
|
335
382
|
else if (obj.type === 'turn.completed' && obj.usage) {
|
|
336
383
|
usage = {
|
|
337
384
|
inputTokens: (obj.usage.input_tokens || 0) + (obj.usage.cached_input_tokens || 0),
|
|
338
385
|
outputTokens: obj.usage.output_tokens || 0,
|
|
339
386
|
};
|
|
387
|
+
sawResultEvent = true;
|
|
340
388
|
}
|
|
341
389
|
}
|
|
342
390
|
catch {
|
|
343
391
|
content += (content ? '\n' : '') + text;
|
|
344
392
|
}
|
|
345
393
|
}
|
|
394
|
+
if (!content && lastAssistantText) {
|
|
395
|
+
content = lastAssistantText;
|
|
396
|
+
}
|
|
346
397
|
// If we got content, treat as success regardless of exit code
|
|
347
398
|
if (content.trim()) {
|
|
348
399
|
if (code !== 0) {
|
|
349
400
|
console.warn(`[codex-cli] exited with code ${code} but had output - treating as success`);
|
|
350
401
|
}
|
|
351
402
|
console.log(`[codex-cli] done (${content.length} chars)`);
|
|
352
|
-
resolve({
|
|
403
|
+
resolve({
|
|
404
|
+
content: content.trim(),
|
|
405
|
+
usage,
|
|
406
|
+
finishReason: 'end_turn',
|
|
407
|
+
session: sessionId ? { id: sessionId } : undefined,
|
|
408
|
+
});
|
|
353
409
|
return;
|
|
354
410
|
}
|
|
355
411
|
if (code !== 0) {
|
|
@@ -359,8 +415,26 @@ class CodexCliProvider {
|
|
|
359
415
|
reject(err);
|
|
360
416
|
return;
|
|
361
417
|
}
|
|
418
|
+
if (stderr.trim()) {
|
|
419
|
+
reject(new Error(`codex CLI returned no content. stderr: ${stderr.trim()}`));
|
|
420
|
+
return;
|
|
421
|
+
}
|
|
422
|
+
if (sawResultEvent && lastAssistantText) {
|
|
423
|
+
resolve({
|
|
424
|
+
content: lastAssistantText.trim(),
|
|
425
|
+
usage,
|
|
426
|
+
finishReason: 'end_turn',
|
|
427
|
+
session: sessionId ? { id: sessionId } : undefined,
|
|
428
|
+
});
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
362
431
|
console.log('[codex-cli] done (empty response)');
|
|
363
|
-
resolve({
|
|
432
|
+
resolve({
|
|
433
|
+
content: '',
|
|
434
|
+
usage,
|
|
435
|
+
finishReason: 'end_turn',
|
|
436
|
+
session: sessionId ? { id: sessionId } : undefined,
|
|
437
|
+
});
|
|
364
438
|
});
|
|
365
439
|
proc.on('error', (err) => {
|
|
366
440
|
clearTimers();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-cli.js","sourceRoot":"","sources":["../../src/providers/codex-cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-cli.js","sourceRoot":"","sources":["../../src/providers/codex-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAsD;gBAEzD,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAsD;gBAEzD,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;YA8F3C,UAAU;IA0ExB,OAAO,CAAC,aAAa;CA+BtB"}
|
package/dist/providers/google.js
CHANGED
|
@@ -77,11 +77,12 @@ class GoogleProvider {
|
|
|
77
77
|
const model = this.config.model;
|
|
78
78
|
const url = `${this.baseUrl}/models/${model}:${options.stream ? 'streamGenerateContent' : 'generateContent'}?key=${this.config.apiKey}`;
|
|
79
79
|
if (options.stream && options.onChunk) {
|
|
80
|
-
return this.chatStream(url, body, options.onChunk);
|
|
80
|
+
return this.chatStream(url, body, options.onChunk, options.abortSignal);
|
|
81
81
|
}
|
|
82
82
|
const response = await fetch(url, {
|
|
83
83
|
method: 'POST',
|
|
84
84
|
headers: { 'Content-Type': 'application/json' },
|
|
85
|
+
signal: options.abortSignal,
|
|
85
86
|
body: JSON.stringify(body),
|
|
86
87
|
});
|
|
87
88
|
if (!response.ok) {
|
|
@@ -93,12 +94,13 @@ class GoogleProvider {
|
|
|
93
94
|
return this.parseResponse(data);
|
|
94
95
|
}, this.config.maxRetries, this.config.baseDelay);
|
|
95
96
|
}
|
|
96
|
-
async chatStream(url, body, onChunk) {
|
|
97
|
+
async chatStream(url, body, onChunk, abortSignal) {
|
|
97
98
|
// Google streaming returns newline-delimited JSON array
|
|
98
99
|
url += '&alt=sse';
|
|
99
100
|
const response = await fetch(url, {
|
|
100
101
|
method: 'POST',
|
|
101
102
|
headers: { 'Content-Type': 'application/json' },
|
|
103
|
+
signal: abortSignal,
|
|
102
104
|
body: JSON.stringify(body),
|
|
103
105
|
});
|
|
104
106
|
if (!response.ok) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { AgentRuntimeMode } from '../runtime-context';
|
|
1
2
|
export interface LLMToolCall {
|
|
2
3
|
id: string;
|
|
3
4
|
name: string;
|
|
@@ -26,6 +27,14 @@ export interface LLMChatOptions {
|
|
|
26
27
|
cwd?: string;
|
|
27
28
|
/** Whether to enable extended thinking (Anthropic) or surface reasoning (OpenAI o-series) */
|
|
28
29
|
thinkingEnabled?: boolean;
|
|
30
|
+
/** Optional abort signal for cancellation */
|
|
31
|
+
abortSignal?: AbortSignal;
|
|
32
|
+
/** Resume a previously persisted CLI session/thread when supported */
|
|
33
|
+
resumeSessionId?: string | null;
|
|
34
|
+
/** Persist CLI session state so future turns can resume it */
|
|
35
|
+
persistSession?: boolean;
|
|
36
|
+
/** Explicit runtime split so shared providers can branch safely */
|
|
37
|
+
runtimeMode?: AgentRuntimeMode;
|
|
29
38
|
}
|
|
30
39
|
export interface LLMToolDefinition {
|
|
31
40
|
name: string;
|
|
@@ -44,6 +53,9 @@ export interface LLMResponse {
|
|
|
44
53
|
cacheCreationTokens?: number;
|
|
45
54
|
};
|
|
46
55
|
finishReason?: string;
|
|
56
|
+
session?: {
|
|
57
|
+
id: string;
|
|
58
|
+
};
|
|
47
59
|
}
|
|
48
60
|
export interface LLMProviderConfig {
|
|
49
61
|
apiKey: string;
|
|
@@ -60,6 +72,7 @@ export interface LLMProviderConfig {
|
|
|
60
72
|
toolActorId?: string;
|
|
61
73
|
toolProjectId?: string | null;
|
|
62
74
|
currentTodoTaskId?: number;
|
|
75
|
+
runtimeMode?: AgentRuntimeMode;
|
|
63
76
|
}
|
|
64
77
|
export interface LLMProvider {
|
|
65
78
|
chat(options: LLMChatOptions): Promise<LLMResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,oEAAoE;IACpE,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC5B,mDAAmD;IACnD,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACjC,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6FAA6F;IAC7F,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,sEAAsE;IACtE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,8DAA8D;IAC9D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mEAAmE;IACnE,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,sDAAsD;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,yBAAyB,GAAG,yBAAyB,CAAC;IACjE,QAAQ,CAAC,EAAE,SAAS,GAAG,cAAc,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,SAAS,GAAG,iBAAiB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACrD;AAED,gEAAgE;AAChE,eAAO,MAAM,aAAa,aAAuC,CAAC;AAElE,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,aAa9B,CAAC;AAaH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,WAAW,CA6B3F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":";;;AA0HA,wCA6BC;AAvJD,2CAAgD;AAChD,qCAA0C;AAC1C,qCAA0C;AAC1C,6CAAiD;AACjD,2CAA+C;AAwF/C,gEAAgE;AACnD,QAAA,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;AAElE,6CAA6C;AAChC,QAAA,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACzC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,WAAW,EAAI,4BAA4B;IAC3C,SAAS,EAAM,wBAAwB;IACvC,QAAQ,EAAO,wBAAwB;IACvC,UAAU,EAAK,wBAAwB;IACvC,MAAM,EAAS,wBAAwB;IACvC,UAAU,EAAK,wBAAwB;IACvC,YAAY,EAAG,wBAAwB;IACvC,KAAK,EAAU,wBAAwB;CACxC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,MAAM,2BAA2B,GAA2B;IAC1D,SAAS,EAAK,2BAA2B;IACzC,QAAQ,EAAM,yCAAyC;IACvD,UAAU,EAAI,6BAA6B;IAC3C,MAAM,EAAQ,gCAAgC;IAC9C,UAAU,EAAI,6BAA6B;IAC3C,YAAY,EAAE,2BAA2B;IACzC,KAAK,EAAS,qBAAqB;CACpC,CAAC;AAEF,SAAgB,cAAc,CAAC,YAAoB,EAAE,MAAyB;IAC5E,iCAAiC;IACjC,IAAI,CAAC,2BAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,qBAAqB,YAAY,8BAA8B,CAAC,CAAC;QAC9E,OAAO,IAAI,6BAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,WAAW;YACd,OAAO,IAAI,6BAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,KAAK,QAAQ;YACX,OAAO,IAAI,uBAAc,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,QAAQ;YACX,OAAO,IAAI,uBAAc,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,YAAY;YACf,OAAO,IAAI,8BAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,KAAK,WAAW;YACd,OAAO,IAAI,4BAAgB,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO,CAAC,CAAC,CAAC;YACR,oEAAoE;YACpE,MAAM,OAAO,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,IAAI,uBAAc,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,4EAA4E;YAC5E,OAAO,CAAC,IAAI,CAAC,6BAA6B,YAAY,8BAA8B,CAAC,CAAC;YACtF,OAAO,IAAI,6BAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAmBnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAA6C;gBAEjD,MAAM,EAAE,iBAAiB,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAStD,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;IAgGzD,OAAO,CAAC,eAAe;IA0CvB,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,oBAAoB;YAQd,kBAAkB;YA6DlB,yBAAyB;YAyLzB,UAAU;IAuGxB,wDAAwD;IACxD,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,aAAa;CA+BtB"}
|
package/dist/providers/openai.js
CHANGED
|
@@ -2,6 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.OpenAIProvider = void 0;
|
|
4
4
|
const retry_1 = require("./retry");
|
|
5
|
+
/**
|
|
6
|
+
* Models available via ChatGPT subscription (Codex Responses API).
|
|
7
|
+
* Keep in sync with src/lib/models.ts CODEX_COMPATIBLE_MODELS.
|
|
8
|
+
* These are the models supported at chatgpt.com/backend-api/codex.
|
|
9
|
+
* GPT-4.1 series is NOT supported — API key only.
|
|
10
|
+
*/
|
|
11
|
+
const CODEX_COMPATIBLE_MODELS = [
|
|
12
|
+
// GPT-5.x family ONLY — these are the models available via ChatGPT subscription.
|
|
13
|
+
// API-platform models (gpt-4.1, o3, o4-mini, gpt-4o, etc.) require an API key.
|
|
14
|
+
'gpt-5.4', 'gpt-5.4-mini',
|
|
15
|
+
'gpt-5.3-codex', 'gpt-5.3-codex-spark',
|
|
16
|
+
'gpt-5.2', 'gpt-5.2-codex',
|
|
17
|
+
'gpt-5.1', 'gpt-5.1-codex', 'gpt-5.1-codex-max',
|
|
18
|
+
'gpt-5', 'gpt-5-codex',
|
|
19
|
+
];
|
|
5
20
|
class OpenAIProvider {
|
|
6
21
|
config;
|
|
7
22
|
baseUrl;
|
|
@@ -77,7 +92,7 @@ class OpenAIProvider {
|
|
|
77
92
|
body.tool_choice = options.toolChoice === 'required' ? 'required' : 'auto';
|
|
78
93
|
}
|
|
79
94
|
if (options.stream && options.onChunk) {
|
|
80
|
-
return this.chatStream(body, options.onChunk);
|
|
95
|
+
return this.chatStream(body, options.onChunk, options.abortSignal);
|
|
81
96
|
}
|
|
82
97
|
const response = await fetch(`${this.baseUrl}/chat/completions`, {
|
|
83
98
|
method: 'POST',
|
|
@@ -85,6 +100,7 @@ class OpenAIProvider {
|
|
|
85
100
|
'Content-Type': 'application/json',
|
|
86
101
|
'Authorization': `Bearer ${this.config.apiKey}`,
|
|
87
102
|
},
|
|
103
|
+
signal: options.abortSignal,
|
|
88
104
|
body: JSON.stringify(body),
|
|
89
105
|
});
|
|
90
106
|
if (!response.ok) {
|
|
@@ -178,6 +194,13 @@ class OpenAIProvider {
|
|
|
178
194
|
return `${current}\n${trimmed}`;
|
|
179
195
|
}
|
|
180
196
|
async chatCodexResponses(options) {
|
|
197
|
+
// Validate model is supported on the Codex ChatGPT subscription backend
|
|
198
|
+
const model = this.config.model || '';
|
|
199
|
+
if (model && !CODEX_COMPATIBLE_MODELS.some(m => model.startsWith(m))) {
|
|
200
|
+
throw new Error(`Model "${model}" is not supported with ChatGPT subscription. ` +
|
|
201
|
+
`ChatGPT subscription supports: ${CODEX_COMPATIBLE_MODELS.filter(m => !m.includes('.')).concat(['gpt-5.x series']).join(', ')}. ` +
|
|
202
|
+
`Change this bot's model in Settings → Bots, or switch to an API key connection.`);
|
|
203
|
+
}
|
|
181
204
|
const includeReasoning = !!options.thinkingEnabled && this.isReasoningModel();
|
|
182
205
|
const body = {
|
|
183
206
|
model: this.config.model,
|
|
@@ -200,6 +223,7 @@ class OpenAIProvider {
|
|
|
200
223
|
'Content-Type': 'application/json',
|
|
201
224
|
'Authorization': `Bearer ${this.config.apiKey}`,
|
|
202
225
|
},
|
|
226
|
+
signal: options.abortSignal,
|
|
203
227
|
body: JSON.stringify(body),
|
|
204
228
|
});
|
|
205
229
|
if (!response.ok) {
|
|
@@ -405,7 +429,7 @@ class OpenAIProvider {
|
|
|
405
429
|
finishReason,
|
|
406
430
|
};
|
|
407
431
|
}
|
|
408
|
-
async chatStream(body, onChunk) {
|
|
432
|
+
async chatStream(body, onChunk, abortSignal) {
|
|
409
433
|
body.stream = true;
|
|
410
434
|
const response = await fetch(`${this.baseUrl}/chat/completions`, {
|
|
411
435
|
method: 'POST',
|
|
@@ -413,6 +437,7 @@ class OpenAIProvider {
|
|
|
413
437
|
'Content-Type': 'application/json',
|
|
414
438
|
'Authorization': `Bearer ${this.config.apiKey}`,
|
|
415
439
|
},
|
|
440
|
+
signal: abortSignal,
|
|
416
441
|
body: JSON.stringify(body),
|
|
417
442
|
});
|
|
418
443
|
if (!response.ok) {
|