funolio-agent 1.0.53 → 1.1.65
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/approval.d.ts +1 -6
- package/dist/approval.d.ts.map +1 -1
- package/dist/approval.js +2 -7
- package/dist/approval.js.map +1 -1
- package/dist/auth/credential-reader.d.ts.map +1 -1
- package/dist/auth/credential-reader.js +4 -3
- package/dist/auth/credential-reader.js.map +1 -1
- package/dist/auth/token-refresh.d.ts +8 -0
- package/dist/auth/token-refresh.d.ts.map +1 -1
- package/dist/auth/token-refresh.js +82 -52
- package/dist/auth/token-refresh.js.map +1 -1
- package/dist/auto-organizer.d.ts.map +1 -1
- package/dist/auto-organizer.js +6 -7
- package/dist/auto-organizer.js.map +1 -1
- package/dist/bench-prefix.d.ts +16 -0
- package/dist/bench-prefix.d.ts.map +1 -0
- package/dist/bench-prefix.js +25 -0
- package/dist/bench-prefix.js.map +1 -0
- package/dist/bot-manager.d.ts +5 -1
- package/dist/bot-manager.d.ts.map +1 -1
- package/dist/bot-manager.js +46 -27
- package/dist/bot-manager.js.map +1 -1
- package/dist/chat-sync.d.ts +42 -0
- package/dist/chat-sync.d.ts.map +1 -0
- package/dist/chat-sync.js +95 -0
- package/dist/chat-sync.js.map +1 -0
- package/dist/clerk-model.d.ts +7 -0
- package/dist/clerk-model.d.ts.map +1 -1
- package/dist/clerk-model.js +42 -8
- package/dist/clerk-model.js.map +1 -1
- package/dist/cli-bootstrap-history.d.ts +10 -0
- package/dist/cli-bootstrap-history.d.ts.map +1 -0
- package/dist/cli-bootstrap-history.js +112 -0
- package/dist/cli-bootstrap-history.js.map +1 -0
- package/dist/cli-models.d.ts +8 -0
- package/dist/cli-models.d.ts.map +1 -0
- package/dist/cli-models.js +91 -0
- package/dist/cli-models.js.map +1 -0
- package/dist/cli-session-epoch.d.ts +13 -3
- package/dist/cli-session-epoch.d.ts.map +1 -1
- package/dist/cli-session-epoch.js +53 -4
- package/dist/cli-session-epoch.js.map +1 -1
- package/dist/cli-session-registry.d.ts +35 -0
- package/dist/cli-session-registry.d.ts.map +1 -0
- package/dist/cli-session-registry.js +177 -0
- package/dist/cli-session-registry.js.map +1 -0
- package/dist/cli.js +62 -0
- package/dist/cli.js.map +1 -1
- package/dist/codex-app-server-manager.d.ts +189 -0
- package/dist/codex-app-server-manager.d.ts.map +1 -0
- package/dist/codex-app-server-manager.js +1468 -0
- package/dist/codex-app-server-manager.js.map +1 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +8 -30
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/pool.d.ts +32 -0
- package/dist/commands/pool.d.ts.map +1 -1
- package/dist/commands/pool.js +145 -66
- package/dist/commands/pool.js.map +1 -1
- package/dist/commands/setup.d.ts +4 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +9 -25
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/start.d.ts +21 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +559 -63
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +5 -2
- package/dist/commands/status.js.map +1 -1
- package/dist/completion-marker.d.ts +7 -0
- package/dist/completion-marker.d.ts.map +1 -0
- package/dist/completion-marker.js +28 -0
- package/dist/completion-marker.js.map +1 -0
- package/dist/config.d.ts +7 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +184 -60
- package/dist/config.js.map +1 -1
- package/dist/context-window.d.ts +37 -1
- package/dist/context-window.d.ts.map +1 -1
- package/dist/context-window.js +210 -17
- package/dist/context-window.js.map +1 -1
- package/dist/live-activity.d.ts +31 -0
- package/dist/live-activity.d.ts.map +1 -0
- package/dist/live-activity.js +36 -0
- package/dist/live-activity.js.map +1 -0
- package/dist/local-chat-execution.d.ts +114 -0
- package/dist/local-chat-execution.d.ts.map +1 -0
- package/dist/local-chat-execution.js +349 -0
- package/dist/local-chat-execution.js.map +1 -0
- package/dist/local-cli-pty-manager.d.ts +186 -0
- package/dist/local-cli-pty-manager.d.ts.map +1 -1
- package/dist/local-cli-pty-manager.js +2581 -164
- package/dist/local-cli-pty-manager.js.map +1 -1
- package/dist/local-conversation-gateway.d.ts +110 -0
- package/dist/local-conversation-gateway.d.ts.map +1 -0
- package/dist/local-conversation-gateway.js +175 -0
- package/dist/local-conversation-gateway.js.map +1 -0
- package/dist/local-data.d.ts +276 -5
- package/dist/local-data.d.ts.map +1 -1
- package/dist/local-data.js +1201 -86
- package/dist/local-data.js.map +1 -1
- package/dist/local-db.d.ts +6 -0
- package/dist/local-db.d.ts.map +1 -1
- package/dist/local-db.js +428 -2
- package/dist/local-db.js.map +1 -1
- package/dist/local-funnel.d.ts.map +1 -1
- package/dist/local-funnel.js +6 -5
- package/dist/local-funnel.js.map +1 -1
- package/dist/local-server.d.ts +55 -0
- package/dist/local-server.d.ts.map +1 -1
- package/dist/local-server.js +3281 -441
- package/dist/local-server.js.map +1 -1
- package/dist/managed-process-registry.d.ts +59 -0
- package/dist/managed-process-registry.d.ts.map +1 -0
- package/dist/managed-process-registry.js +390 -0
- package/dist/managed-process-registry.js.map +1 -0
- package/dist/mcp/claude-config-writer.d.ts +5 -5
- package/dist/mcp/claude-config-writer.d.ts.map +1 -1
- package/dist/mcp/claude-config-writer.js +19 -11
- package/dist/mcp/claude-config-writer.js.map +1 -1
- package/dist/mcp/index.d.ts +4 -2
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/sync-cli-config.d.ts +42 -4
- package/dist/mcp/sync-cli-config.d.ts.map +1 -1
- package/dist/mcp/sync-cli-config.js +497 -17
- package/dist/mcp/sync-cli-config.js.map +1 -1
- package/dist/message-loop.d.ts +6 -0
- package/dist/message-loop.d.ts.map +1 -1
- package/dist/message-loop.js +281 -89
- package/dist/message-loop.js.map +1 -1
- package/dist/mqtt-client.d.ts +44 -1
- package/dist/mqtt-client.d.ts.map +1 -1
- package/dist/mqtt-client.js +284 -46
- package/dist/mqtt-client.js.map +1 -1
- package/dist/mqtt-data-relay.d.ts +44 -0
- package/dist/mqtt-data-relay.d.ts.map +1 -0
- package/dist/mqtt-data-relay.js +106 -0
- package/dist/mqtt-data-relay.js.map +1 -0
- package/dist/oauth.d.ts.map +1 -1
- package/dist/oauth.js +69 -29
- package/dist/oauth.js.map +1 -1
- package/dist/orchestration/capabilities.d.ts +13 -0
- package/dist/orchestration/capabilities.d.ts.map +1 -0
- package/dist/orchestration/capabilities.js +152 -0
- package/dist/orchestration/capabilities.js.map +1 -0
- package/dist/orchestration/dispatch-executor.d.ts +83 -0
- package/dist/orchestration/dispatch-executor.d.ts.map +1 -0
- package/dist/orchestration/dispatch-executor.js +266 -0
- package/dist/orchestration/dispatch-executor.js.map +1 -0
- package/dist/orchestration/dispatch-hint.d.ts +134 -0
- package/dist/orchestration/dispatch-hint.d.ts.map +1 -0
- package/dist/orchestration/dispatch-hint.js +247 -0
- package/dist/orchestration/dispatch-hint.js.map +1 -0
- package/dist/orchestration/dispatch-runner.d.ts +106 -0
- package/dist/orchestration/dispatch-runner.d.ts.map +1 -0
- package/dist/orchestration/dispatch-runner.js +604 -0
- package/dist/orchestration/dispatch-runner.js.map +1 -0
- package/dist/orchestration/dispatch-tools.d.ts +167 -0
- package/dist/orchestration/dispatch-tools.d.ts.map +1 -0
- package/dist/orchestration/dispatch-tools.js +328 -0
- package/dist/orchestration/dispatch-tools.js.map +1 -0
- package/dist/orchestration/front-door-policy.d.ts +35 -10
- package/dist/orchestration/front-door-policy.d.ts.map +1 -1
- package/dist/orchestration/front-door-policy.js +30 -267
- package/dist/orchestration/front-door-policy.js.map +1 -1
- package/dist/orchestration/orchestrator-dispatch-prompt.d.ts +43 -0
- package/dist/orchestration/orchestrator-dispatch-prompt.d.ts.map +1 -0
- package/dist/orchestration/orchestrator-dispatch-prompt.js +267 -0
- package/dist/orchestration/orchestrator-dispatch-prompt.js.map +1 -0
- package/dist/orchestration/orchestrator-operating-prompt.d.ts +15 -0
- package/dist/orchestration/orchestrator-operating-prompt.d.ts.map +1 -1
- package/dist/orchestration/orchestrator-operating-prompt.js +206 -20
- package/dist/orchestration/orchestrator-operating-prompt.js.map +1 -1
- package/dist/orchestration/plan-import.d.ts +39 -0
- package/dist/orchestration/plan-import.d.ts.map +1 -0
- package/dist/orchestration/plan-import.js +547 -0
- package/dist/orchestration/plan-import.js.map +1 -0
- package/dist/orchestration/validation.d.ts +40 -0
- package/dist/orchestration/validation.d.ts.map +1 -0
- package/dist/orchestration/validation.js +203 -0
- package/dist/orchestration/validation.js.map +1 -0
- 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 +36 -46
- package/dist/orchestration/worker-operating-prompt.js.map +1 -1
- package/dist/orchestrator.d.ts +214 -33
- package/dist/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator.js +2200 -1100
- package/dist/orchestrator.js.map +1 -1
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +8 -4
- 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 +49 -5
- 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 +81 -5
- package/dist/providers/claude-cli.js.map +1 -1
- package/dist/providers/codex-cli.d.ts +10 -6
- package/dist/providers/codex-cli.d.ts.map +1 -1
- package/dist/providers/codex-cli.js +204 -26
- package/dist/providers/codex-cli.js.map +1 -1
- package/dist/providers/google.d.ts.map +1 -1
- package/dist/providers/google.js +15 -5
- package/dist/providers/google.js.map +1 -1
- package/dist/providers/index.d.ts +15 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai.d.ts +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +13 -5
- package/dist/providers/openai.js.map +1 -1
- package/dist/response-guard.js +1 -1
- package/dist/response-guard.js.map +1 -1
- package/dist/server-adapter.d.ts +8 -0
- package/dist/server-adapter.d.ts.map +1 -1
- package/dist/server-adapter.js +7 -0
- package/dist/server-adapter.js.map +1 -1
- package/dist/service-mode.d.ts +1 -1
- package/dist/service-mode.d.ts.map +1 -1
- package/dist/service-mode.js +64 -1
- package/dist/service-mode.js.map +1 -1
- package/dist/service-setup-only.d.ts +8 -0
- package/dist/service-setup-only.d.ts.map +1 -0
- package/dist/service-setup-only.js +37 -0
- package/dist/service-setup-only.js.map +1 -0
- package/dist/slash-commands.d.ts +21 -0
- package/dist/slash-commands.d.ts.map +1 -0
- package/dist/slash-commands.js +99 -0
- package/dist/slash-commands.js.map +1 -0
- package/dist/subagent/index.d.ts +4 -2
- package/dist/subagent/index.d.ts.map +1 -1
- package/dist/subagent/index.js.map +1 -1
- package/dist/summarization-pipeline.d.ts.map +1 -1
- package/dist/summarization-pipeline.js +1 -9
- package/dist/summarization-pipeline.js.map +1 -1
- package/dist/token-counter.d.ts.map +1 -1
- package/dist/token-counter.js +11 -4
- package/dist/token-counter.js.map +1 -1
- package/dist/tool-filter.d.ts.map +1 -1
- package/dist/tool-filter.js +10 -6
- package/dist/tool-filter.js.map +1 -1
- package/dist/tools/admin-tools.d.ts.map +1 -1
- package/dist/tools/admin-tools.js +20 -5
- package/dist/tools/admin-tools.js.map +1 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +2 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/run-command.d.ts.map +1 -1
- package/dist/tools/run-command.js +5 -1
- package/dist/tools/run-command.js.map +1 -1
- package/dist/tools/search-conversation-history.d.ts +16 -0
- package/dist/tools/search-conversation-history.d.ts.map +1 -0
- package/dist/tools/search-conversation-history.js +334 -0
- package/dist/tools/search-conversation-history.js.map +1 -0
- package/dist/tools/todo-tasks.d.ts.map +1 -1
- package/dist/tools/todo-tasks.js +77 -5
- package/dist/tools/todo-tasks.js.map +1 -1
- package/dist/usage-log.d.ts +62 -0
- package/dist/usage-log.d.ts.map +1 -0
- package/dist/usage-log.js +98 -0
- package/dist/usage-log.js.map +1 -0
- package/dist/wizard-state.d.ts +20 -0
- package/dist/wizard-state.d.ts.map +1 -1
- package/dist/wizard-state.js +90 -3
- package/dist/wizard-state.js.map +1 -1
- package/dist/wizard-support.d.ts.map +1 -1
- package/dist/wizard-support.js +27 -1
- package/dist/wizard-support.js.map +1 -1
- package/dist/workflow-engine.d.ts +44 -2
- package/dist/workflow-engine.d.ts.map +1 -1
- package/dist/workflow-engine.js +932 -111
- package/dist/workflow-engine.js.map +1 -1
- package/package.json +2 -2
|
@@ -34,14 +34,26 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.CodexCliProvider = void 0;
|
|
37
|
+
exports.detectCodexFinalOutputContract = detectCodexFinalOutputContract;
|
|
38
|
+
exports.normalizeCodexAssistantContent = normalizeCodexAssistantContent;
|
|
37
39
|
const child_process_1 = require("child_process");
|
|
38
40
|
const fs = __importStar(require("fs"));
|
|
41
|
+
const os = __importStar(require("os"));
|
|
39
42
|
const path = __importStar(require("path"));
|
|
40
43
|
const sync_cli_config_1 = require("../mcp/sync-cli-config");
|
|
41
44
|
const runtime_context_1 = require("../runtime-context");
|
|
45
|
+
const completion_marker_1 = require("../completion-marker");
|
|
42
46
|
// Windows STATUS_DLL_INIT_FAILED — benign crash during process cleanup
|
|
43
47
|
const WIN_DLL_INIT_FAILED = 3221225794; // 0xC0000142
|
|
44
48
|
const MAX_RETRIES = 2;
|
|
49
|
+
const CODEX_TOOL_ITEM_TYPES = new Set([
|
|
50
|
+
'command_execution',
|
|
51
|
+
'file_change',
|
|
52
|
+
'mcpToolCall',
|
|
53
|
+
'mcp_tool_call',
|
|
54
|
+
'applyPatch',
|
|
55
|
+
'apply_patch',
|
|
56
|
+
]);
|
|
45
57
|
let codexConfigPatchDepth = 0;
|
|
46
58
|
let codexConfigPatchOriginal = '';
|
|
47
59
|
let codexConfigPatchHadFile = false;
|
|
@@ -55,12 +67,9 @@ function buildCodexToolEnv(config) {
|
|
|
55
67
|
envVars.FUNOLIO_TOOL_TODO_ID = String(config.currentTodoTaskId);
|
|
56
68
|
return envVars;
|
|
57
69
|
}
|
|
58
|
-
function beginCodexCliConfigPatch(config) {
|
|
70
|
+
function beginCodexCliConfigPatch(config, codexHomeDir) {
|
|
59
71
|
const dynamicEnv = buildCodexToolEnv(config);
|
|
60
|
-
|
|
61
|
-
return () => { };
|
|
62
|
-
}
|
|
63
|
-
const configPath = (0, sync_cli_config_1.codexConfigPath)();
|
|
72
|
+
const configPath = (0, sync_cli_config_1.codexConfigPath)(codexHomeDir);
|
|
64
73
|
if (codexConfigPatchDepth > 0) {
|
|
65
74
|
codexConfigPatchDepth += 1;
|
|
66
75
|
return () => endCodexCliConfigPatch(configPath);
|
|
@@ -115,6 +124,157 @@ function endCodexCliConfigPatch(configPath = (0, sync_cli_config_1.codexConfigPa
|
|
|
115
124
|
* Uses `codex exec --json` for non-interactive output (pipes prompt via stdin).
|
|
116
125
|
* Does NOT require an API key (the CLI handles auth via its own session/OAuth).
|
|
117
126
|
*/
|
|
127
|
+
function extractCodexObservedToolCall(obj) {
|
|
128
|
+
if (!obj || typeof obj !== 'object')
|
|
129
|
+
return null;
|
|
130
|
+
const candidate = (obj.type === 'item.started' || obj.type === 'item.completed') ? obj.item
|
|
131
|
+
: obj.type === 'response_item' ? obj.payload
|
|
132
|
+
: obj.type === 'event_msg' && obj.payload?.item ? obj.payload.item
|
|
133
|
+
: obj.type === 'event_msg' && CODEX_TOOL_ITEM_TYPES.has(obj.payload?.type) ? obj.payload
|
|
134
|
+
: null;
|
|
135
|
+
if (!candidate || typeof candidate !== 'object')
|
|
136
|
+
return null;
|
|
137
|
+
const itemType = typeof candidate.type === 'string' ? candidate.type : '';
|
|
138
|
+
if (!CODEX_TOOL_ITEM_TYPES.has(itemType))
|
|
139
|
+
return null;
|
|
140
|
+
const id = (typeof candidate.id === 'string' && candidate.id)
|
|
141
|
+
|| (typeof candidate.itemId === 'string' && candidate.itemId)
|
|
142
|
+
|| `${itemType}:${typeof candidate.command === 'string' ? candidate.command : typeof candidate.path === 'string' ? candidate.path : typeof candidate.name === 'string' ? candidate.name : 'unknown'}`;
|
|
143
|
+
const name = (typeof candidate.name === 'string' && candidate.name)
|
|
144
|
+
|| (typeof candidate.toolName === 'string' && candidate.toolName)
|
|
145
|
+
|| (typeof candidate.serverName === 'string' && candidate.serverName)
|
|
146
|
+
|| itemType;
|
|
147
|
+
return {
|
|
148
|
+
id,
|
|
149
|
+
name,
|
|
150
|
+
arguments: {
|
|
151
|
+
...(typeof candidate.command === 'string' ? { command: candidate.command } : {}),
|
|
152
|
+
...(typeof candidate.path === 'string' ? { path: candidate.path } : {}),
|
|
153
|
+
...(candidate.arguments && typeof candidate.arguments === 'object' ? candidate.arguments : {}),
|
|
154
|
+
},
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
function getLatestUserMessage(messages) {
|
|
158
|
+
for (let idx = messages.length - 1; idx >= 0; idx--) {
|
|
159
|
+
const msg = messages[idx];
|
|
160
|
+
if (msg.role !== 'user')
|
|
161
|
+
continue;
|
|
162
|
+
return typeof msg.content === 'string' ? msg.content : JSON.stringify(msg.content);
|
|
163
|
+
}
|
|
164
|
+
return '';
|
|
165
|
+
}
|
|
166
|
+
function detectCodexFinalOutputContract(messages) {
|
|
167
|
+
const prompt = getLatestUserMessage(messages);
|
|
168
|
+
if (!prompt)
|
|
169
|
+
return null;
|
|
170
|
+
const literalMatchers = [
|
|
171
|
+
/(?:return|reply|respond|output)\s+(?:with\s+)?exactly\s+`([^`\n]+)`/i,
|
|
172
|
+
/(?:return|reply|respond|output)\s+(?:with\s+)?exactly\s+"([^"\n]+)"/i,
|
|
173
|
+
/(?:return|reply|respond|output)\s+(?:with\s+)?exactly\s+'([^'\n]+)'/i,
|
|
174
|
+
/(?:return|reply|respond|output)\s+(?:with\s+)?exactly\s+([A-Za-z0-9_./:@%+-]{2,})\s*(?:and\s+nothing\s+else|only|$|[.!?])/i,
|
|
175
|
+
];
|
|
176
|
+
for (const matcher of literalMatchers) {
|
|
177
|
+
const match = matcher.exec(prompt);
|
|
178
|
+
const value = match?.[1]?.trim();
|
|
179
|
+
if (value)
|
|
180
|
+
return { kind: 'literal', value };
|
|
181
|
+
}
|
|
182
|
+
const jsonOnly = /\bjson\b/i.test(prompt)
|
|
183
|
+
&& /\b(only|nothing else|no markdown|no commentary|no prose|no preamble|valid json)\b/i.test(prompt);
|
|
184
|
+
if (jsonOnly) {
|
|
185
|
+
return { kind: 'json' };
|
|
186
|
+
}
|
|
187
|
+
return null;
|
|
188
|
+
}
|
|
189
|
+
function extractExactLiteral(text, expected) {
|
|
190
|
+
const normalized = text.trim();
|
|
191
|
+
if (!normalized)
|
|
192
|
+
return null;
|
|
193
|
+
if (normalized === expected)
|
|
194
|
+
return expected;
|
|
195
|
+
const exactLine = normalized
|
|
196
|
+
.split('\n')
|
|
197
|
+
.map((line) => line.trim())
|
|
198
|
+
.find((line) => line === expected);
|
|
199
|
+
if (exactLine)
|
|
200
|
+
return expected;
|
|
201
|
+
const idx = normalized.lastIndexOf(expected);
|
|
202
|
+
if (idx >= 0) {
|
|
203
|
+
const suffix = normalized.slice(idx + expected.length).trim();
|
|
204
|
+
const prefix = normalized.slice(0, idx).trim();
|
|
205
|
+
if (!suffix && prefix.length <= 200) {
|
|
206
|
+
return expected;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
return null;
|
|
210
|
+
}
|
|
211
|
+
function extractJsonPayload(text) {
|
|
212
|
+
const normalized = text.trim();
|
|
213
|
+
if (!normalized)
|
|
214
|
+
return null;
|
|
215
|
+
const fenced = normalized.match(/^```(?:json)?\s*\n([\s\S]*?)\n```$/i);
|
|
216
|
+
const candidateText = fenced ? fenced[1].trim() : normalized;
|
|
217
|
+
try {
|
|
218
|
+
JSON.parse(candidateText);
|
|
219
|
+
return candidateText;
|
|
220
|
+
}
|
|
221
|
+
catch {
|
|
222
|
+
// fall through
|
|
223
|
+
}
|
|
224
|
+
for (let start = 0; start < candidateText.length; start++) {
|
|
225
|
+
const opener = candidateText[start];
|
|
226
|
+
if (opener !== '{' && opener !== '[')
|
|
227
|
+
continue;
|
|
228
|
+
let depth = 0;
|
|
229
|
+
let inString = false;
|
|
230
|
+
let escaped = false;
|
|
231
|
+
for (let idx = start; idx < candidateText.length; idx++) {
|
|
232
|
+
const ch = candidateText[idx];
|
|
233
|
+
if (escaped) {
|
|
234
|
+
escaped = false;
|
|
235
|
+
continue;
|
|
236
|
+
}
|
|
237
|
+
if (ch === '\\') {
|
|
238
|
+
escaped = true;
|
|
239
|
+
continue;
|
|
240
|
+
}
|
|
241
|
+
if (ch === '"') {
|
|
242
|
+
inString = !inString;
|
|
243
|
+
continue;
|
|
244
|
+
}
|
|
245
|
+
if (inString)
|
|
246
|
+
continue;
|
|
247
|
+
if (ch === '{' || ch === '[')
|
|
248
|
+
depth += 1;
|
|
249
|
+
if (ch === '}' || ch === ']')
|
|
250
|
+
depth -= 1;
|
|
251
|
+
if (depth !== 0)
|
|
252
|
+
continue;
|
|
253
|
+
const candidate = candidateText.slice(start, idx + 1).trim();
|
|
254
|
+
try {
|
|
255
|
+
JSON.parse(candidate);
|
|
256
|
+
return candidate;
|
|
257
|
+
}
|
|
258
|
+
catch {
|
|
259
|
+
break;
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
return null;
|
|
264
|
+
}
|
|
265
|
+
function normalizeCodexAssistantContent(text, contract, final = false) {
|
|
266
|
+
const stripped = (0, completion_marker_1.stripCompletionSentinel)(String(text || '').replace(/^\s+/, '').replace(/\r/g, '')).text.trim();
|
|
267
|
+
if (!stripped)
|
|
268
|
+
return '';
|
|
269
|
+
if (!contract)
|
|
270
|
+
return stripped;
|
|
271
|
+
if (contract.kind === 'literal') {
|
|
272
|
+
const literal = extractExactLiteral(stripped, contract.value);
|
|
273
|
+
return literal ?? (final ? stripped : '');
|
|
274
|
+
}
|
|
275
|
+
const json = extractJsonPayload(stripped);
|
|
276
|
+
return json ?? (final ? stripped : '');
|
|
277
|
+
}
|
|
118
278
|
class CodexCliProvider {
|
|
119
279
|
config;
|
|
120
280
|
constructor(config) {
|
|
@@ -173,7 +333,7 @@ class CodexCliProvider {
|
|
|
173
333
|
}
|
|
174
334
|
if (lastMessage?.role === 'user') {
|
|
175
335
|
const prompt = typeof lastMessage.content === 'string' ? lastMessage.content : JSON.stringify(lastMessage.content);
|
|
176
|
-
fullPrompt += `[User Request]\n${prompt}`;
|
|
336
|
+
fullPrompt += `[User Request]\n${prompt}\n\n${completion_marker_1.CLI_COMPLETION_INSTRUCTION}`;
|
|
177
337
|
}
|
|
178
338
|
else if (lastMessage?.role === 'tool') {
|
|
179
339
|
const toolBlocks = (trailingToolMessages.length > 0 ? trailingToolMessages : [lastMessage])
|
|
@@ -182,19 +342,20 @@ class CodexCliProvider {
|
|
|
182
342
|
return `[${msg.toolName || 'tool'}]\n${content}`;
|
|
183
343
|
})
|
|
184
344
|
.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
|
|
345
|
+
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 and append the exact final line ${completion_marker_1.CLI_COMPLETION_SENTINEL}.`;
|
|
186
346
|
}
|
|
187
347
|
else if (lastMessage) {
|
|
188
348
|
const content = typeof lastMessage.content === 'string' ? lastMessage.content : JSON.stringify(lastMessage.content);
|
|
189
|
-
fullPrompt += `[Latest Message]\n${content}\n\nContinue from the transcript above and respond appropriately
|
|
349
|
+
fullPrompt += `[Latest Message]\n${content}\n\nContinue from the transcript above and respond appropriately. ${completion_marker_1.CLI_COMPLETION_INSTRUCTION}`;
|
|
190
350
|
}
|
|
191
351
|
else {
|
|
192
|
-
fullPrompt +=
|
|
352
|
+
fullPrompt += `[User Request]\n\n${completion_marker_1.CLI_COMPLETION_INSTRUCTION}`;
|
|
193
353
|
}
|
|
194
354
|
return fullPrompt;
|
|
195
355
|
}
|
|
196
356
|
spawnCodex(prompt, options) {
|
|
197
357
|
return new Promise((resolve, reject) => {
|
|
358
|
+
const finalOutputContract = detectCodexFinalOutputContract(options.messages || []);
|
|
198
359
|
const isLocalDesktop = (0, runtime_context_1.isLocalDesktopRuntime)(options.runtimeMode ?? this.config.runtimeMode);
|
|
199
360
|
const resumeSessionId = isLocalDesktop ? options.resumeSessionId : null;
|
|
200
361
|
const persistSession = isLocalDesktop ? options.persistSession : false;
|
|
@@ -225,18 +386,22 @@ class CodexCliProvider {
|
|
|
225
386
|
const useShell = process.platform === 'win32';
|
|
226
387
|
const codexBin = 'codex';
|
|
227
388
|
const spawnCwd = options.cwd || process.cwd();
|
|
228
|
-
const
|
|
389
|
+
const codexHomeDir = path.join(os.homedir(), '.funolio', 'cli-sessions', 'codex');
|
|
390
|
+
const restoreCodexConfig = beginCodexCliConfigPatch(this.config, codexHomeDir);
|
|
229
391
|
console.log(`[codex-cli] spawning: ${codexBin} ${args.join(' ')} (${prompt.length} char prompt, cwd=${spawnCwd})`);
|
|
392
|
+
// Isolate Funolio-spawned Codex sessions from any manually-running Codex CLI.
|
|
393
|
+
const codexEnv = {
|
|
394
|
+
...process.env,
|
|
395
|
+
CODEX_HOME: codexHomeDir,
|
|
396
|
+
...(this.config.toolActorId?.trim() ? { FUNOLIO_TOOL_ACTOR_ID: this.config.toolActorId.trim() } : {}),
|
|
397
|
+
...(this.config.toolProjectId !== undefined ? { FUNOLIO_TOOL_PROJECT_ID: String(this.config.toolProjectId || '') } : {}),
|
|
398
|
+
...(this.config.currentTodoTaskId !== undefined ? { FUNOLIO_TOOL_TODO_ID: String(this.config.currentTodoTaskId) } : {}),
|
|
399
|
+
};
|
|
230
400
|
const proc = (0, child_process_1.spawn)(codexBin, args, {
|
|
231
401
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
232
402
|
shell: useShell,
|
|
233
403
|
windowsHide: true,
|
|
234
|
-
env:
|
|
235
|
-
...process.env,
|
|
236
|
-
...(this.config.toolActorId?.trim() ? { FUNOLIO_TOOL_ACTOR_ID: this.config.toolActorId.trim() } : {}),
|
|
237
|
-
...(this.config.toolProjectId !== undefined ? { FUNOLIO_TOOL_PROJECT_ID: String(this.config.toolProjectId || '') } : {}),
|
|
238
|
-
...(this.config.currentTodoTaskId !== undefined ? { FUNOLIO_TOOL_TODO_ID: String(this.config.currentTodoTaskId) } : {}),
|
|
239
|
-
},
|
|
404
|
+
env: codexEnv,
|
|
240
405
|
cwd: spawnCwd,
|
|
241
406
|
});
|
|
242
407
|
const abortHandler = () => {
|
|
@@ -259,6 +424,7 @@ class CodexCliProvider {
|
|
|
259
424
|
let usage;
|
|
260
425
|
let sawResultEvent = false;
|
|
261
426
|
let sessionId;
|
|
427
|
+
const observedToolCalls = new Map();
|
|
262
428
|
const clearTimers = () => {
|
|
263
429
|
options.abortSignal?.removeEventListener('abort', abortHandler);
|
|
264
430
|
restoreCodexConfig();
|
|
@@ -294,12 +460,11 @@ class CodexCliProvider {
|
|
|
294
460
|
return '';
|
|
295
461
|
};
|
|
296
462
|
const applyAssistantSnapshot = async (assistantText) => {
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
lastAssistantText = assistantText;
|
|
463
|
+
const normalizedAssistantText = normalizeCodexAssistantContent(assistantText, finalOutputContract, false);
|
|
464
|
+
const delta = normalizedAssistantText.startsWith(lastAssistantText)
|
|
465
|
+
? normalizedAssistantText.slice(lastAssistantText.length)
|
|
466
|
+
: normalizedAssistantText;
|
|
467
|
+
lastAssistantText = normalizedAssistantText;
|
|
303
468
|
if (!delta)
|
|
304
469
|
return;
|
|
305
470
|
content += delta;
|
|
@@ -330,6 +495,10 @@ class CodexCliProvider {
|
|
|
330
495
|
continue;
|
|
331
496
|
}
|
|
332
497
|
const assistantText = extractAssistantText(obj);
|
|
498
|
+
const observedToolCall = extractCodexObservedToolCall(obj);
|
|
499
|
+
if (observedToolCall && !observedToolCalls.has(observedToolCall.id)) {
|
|
500
|
+
observedToolCalls.set(observedToolCall.id, observedToolCall);
|
|
501
|
+
}
|
|
333
502
|
if (obj.type === 'thread.started' && typeof obj.thread_id === 'string' && obj.thread_id.trim()) {
|
|
334
503
|
sessionId = obj.thread_id.trim();
|
|
335
504
|
}
|
|
@@ -371,11 +540,16 @@ class CodexCliProvider {
|
|
|
371
540
|
sessionId = obj.thread_id.trim();
|
|
372
541
|
}
|
|
373
542
|
const assistantText = extractAssistantText(obj);
|
|
543
|
+
const observedToolCall = extractCodexObservedToolCall(obj);
|
|
544
|
+
if (observedToolCall && !observedToolCalls.has(observedToolCall.id)) {
|
|
545
|
+
observedToolCalls.set(observedToolCall.id, observedToolCall);
|
|
546
|
+
}
|
|
374
547
|
if (assistantText) {
|
|
375
|
-
const
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
548
|
+
const normalizedAssistantText = normalizeCodexAssistantContent(assistantText, finalOutputContract, true);
|
|
549
|
+
const delta = normalizedAssistantText.startsWith(lastAssistantText)
|
|
550
|
+
? normalizedAssistantText.slice(lastAssistantText.length)
|
|
551
|
+
: normalizedAssistantText;
|
|
552
|
+
lastAssistantText = normalizedAssistantText;
|
|
379
553
|
if (delta)
|
|
380
554
|
content += delta;
|
|
381
555
|
}
|
|
@@ -394,6 +568,7 @@ class CodexCliProvider {
|
|
|
394
568
|
if (!content && lastAssistantText) {
|
|
395
569
|
content = lastAssistantText;
|
|
396
570
|
}
|
|
571
|
+
content = normalizeCodexAssistantContent(content || lastAssistantText, finalOutputContract, true);
|
|
397
572
|
// If we got content, treat as success regardless of exit code
|
|
398
573
|
if (content.trim()) {
|
|
399
574
|
if (code !== 0) {
|
|
@@ -402,6 +577,7 @@ class CodexCliProvider {
|
|
|
402
577
|
console.log(`[codex-cli] done (${content.length} chars)`);
|
|
403
578
|
resolve({
|
|
404
579
|
content: content.trim(),
|
|
580
|
+
observedToolCallCount: observedToolCalls.size,
|
|
405
581
|
usage,
|
|
406
582
|
finishReason: 'end_turn',
|
|
407
583
|
session: sessionId ? { id: sessionId } : undefined,
|
|
@@ -422,6 +598,7 @@ class CodexCliProvider {
|
|
|
422
598
|
if (sawResultEvent && lastAssistantText) {
|
|
423
599
|
resolve({
|
|
424
600
|
content: lastAssistantText.trim(),
|
|
601
|
+
observedToolCallCount: observedToolCalls.size,
|
|
425
602
|
usage,
|
|
426
603
|
finishReason: 'end_turn',
|
|
427
604
|
session: sessionId ? { id: sessionId } : undefined,
|
|
@@ -431,6 +608,7 @@ class CodexCliProvider {
|
|
|
431
608
|
console.log('[codex-cli] done (empty response)');
|
|
432
609
|
resolve({
|
|
433
610
|
content: '',
|
|
611
|
+
observedToolCallCount: observedToolCalls.size,
|
|
434
612
|
usage,
|
|
435
613
|
finishReason: 'end_turn',
|
|
436
614
|
session: sessionId ? { id: sessionId } : undefined,
|
|
@@ -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;YAuG3C,UAAU;IA6ExB,OAAO,CAAC,aAAa;CA+BtB"}
|
package/dist/providers/google.js
CHANGED
|
@@ -32,7 +32,7 @@ class GoogleProvider {
|
|
|
32
32
|
else if (m.role === 'assistant') {
|
|
33
33
|
flushFunctionResponses();
|
|
34
34
|
const parts = [];
|
|
35
|
-
if (m.content)
|
|
35
|
+
if (typeof m.content === 'string' && m.content)
|
|
36
36
|
parts.push({ text: m.content });
|
|
37
37
|
if (m.toolCalls) {
|
|
38
38
|
for (const tc of m.toolCalls) {
|
|
@@ -50,7 +50,11 @@ class GoogleProvider {
|
|
|
50
50
|
flushFunctionResponses();
|
|
51
51
|
contents.push({
|
|
52
52
|
role: 'user',
|
|
53
|
-
parts:
|
|
53
|
+
parts: Array.isArray(m.content)
|
|
54
|
+
? m.content.map((part) => (part.type === 'text'
|
|
55
|
+
? { text: part.text }
|
|
56
|
+
: { inlineData: { mimeType: part.mimeType, data: part.data } }))
|
|
57
|
+
: [{ text: m.content }],
|
|
54
58
|
});
|
|
55
59
|
}
|
|
56
60
|
}
|
|
@@ -58,7 +62,7 @@ class GoogleProvider {
|
|
|
58
62
|
const body = {
|
|
59
63
|
contents,
|
|
60
64
|
generationConfig: {
|
|
61
|
-
maxOutputTokens: 4096,
|
|
65
|
+
maxOutputTokens: options.maxOutputTokens ?? 4096,
|
|
62
66
|
},
|
|
63
67
|
};
|
|
64
68
|
if (options.system) {
|
|
@@ -86,8 +90,11 @@ class GoogleProvider {
|
|
|
86
90
|
body: JSON.stringify(body),
|
|
87
91
|
});
|
|
88
92
|
if (!response.ok) {
|
|
89
|
-
const
|
|
93
|
+
const detail = await response.text().catch(() => '');
|
|
94
|
+
const message = detail ? `Google API error: ${response.status}: ${detail.slice(0, 800)}` : `Google API error: ${response.status}`;
|
|
95
|
+
const error = new Error(message);
|
|
90
96
|
error.status = response.status;
|
|
97
|
+
error.body = detail;
|
|
91
98
|
throw error;
|
|
92
99
|
}
|
|
93
100
|
const data = await response.json();
|
|
@@ -104,8 +111,11 @@ class GoogleProvider {
|
|
|
104
111
|
body: JSON.stringify(body),
|
|
105
112
|
});
|
|
106
113
|
if (!response.ok) {
|
|
107
|
-
const
|
|
114
|
+
const detail = await response.text().catch(() => '');
|
|
115
|
+
const message = detail ? `Google API error: ${response.status}: ${detail.slice(0, 800)}` : `Google API error: ${response.status}`;
|
|
116
|
+
const error = new Error(message);
|
|
108
117
|
error.status = response.status;
|
|
118
|
+
error.body = detail;
|
|
109
119
|
throw error;
|
|
110
120
|
}
|
|
111
121
|
const reader = response.body?.getReader();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AAEpC,MAAa,cAAc;IACjB,MAAM,CAAoB;IAC1B,OAAO,GAAG,kDAAkD,CAAC;IAErE,YAAY,MAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,IAAA,iBAAS,EAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,QAAQ,GAAU,EAAE,CAAC;YAC3B,IAAI,wBAAwB,GAAU,EAAE,CAAC;YAEzC,MAAM,sBAAsB,GAAG,GAAG,EAAE;gBAClC,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAC;oBACjE,wBAAwB,GAAG,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC,CAAC;YAEF,yCAAyC;YACzC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACtB,0DAA0D;oBAC1D,wBAAwB,CAAC,IAAI,CAAC;wBAC5B,gBAAgB,EAAE;4BAChB,IAAI,EAAE,CAAC,CAAC,QAAQ;4BAChB,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;yBAChC;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAClC,sBAAsB,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAU,EAAE,CAAC;oBACxB,IAAI,CAAC,CAAC,OAAO;wBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,19 @@ export interface LLMToolCall {
|
|
|
4
4
|
name: string;
|
|
5
5
|
arguments: Record<string, any>;
|
|
6
6
|
}
|
|
7
|
+
export interface LLMTextContentPart {
|
|
8
|
+
type: 'text';
|
|
9
|
+
text: string;
|
|
10
|
+
}
|
|
11
|
+
export interface LLMImageContentPart {
|
|
12
|
+
type: 'image';
|
|
13
|
+
mimeType: string;
|
|
14
|
+
data: string;
|
|
15
|
+
}
|
|
16
|
+
export type LLMContentPart = LLMTextContentPart | LLMImageContentPart;
|
|
7
17
|
export interface LLMMessage {
|
|
8
18
|
role: 'user' | 'assistant' | 'system' | 'tool';
|
|
9
|
-
content: string;
|
|
19
|
+
content: string | LLMContentPart[];
|
|
10
20
|
toolCalls?: LLMToolCall[];
|
|
11
21
|
/** For role='tool': the tool_call_id this result corresponds to */
|
|
12
22
|
toolCallId?: string;
|
|
@@ -33,6 +43,8 @@ export interface LLMChatOptions {
|
|
|
33
43
|
resumeSessionId?: string | null;
|
|
34
44
|
/** Persist CLI session state so future turns can resume it */
|
|
35
45
|
persistSession?: boolean;
|
|
46
|
+
/** Optional output-token budget hint for unusually large responses */
|
|
47
|
+
maxOutputTokens?: number;
|
|
36
48
|
/** Explicit runtime split so shared providers can branch safely */
|
|
37
49
|
runtimeMode?: AgentRuntimeMode;
|
|
38
50
|
}
|
|
@@ -44,6 +56,8 @@ export interface LLMToolDefinition {
|
|
|
44
56
|
export interface LLMResponse {
|
|
45
57
|
content: string;
|
|
46
58
|
toolCalls?: LLMToolCall[];
|
|
59
|
+
/** Tool invocations observed inside provider-managed runtimes (for telemetry). */
|
|
60
|
+
observedToolCallCount?: number;
|
|
47
61
|
/** LLM thinking/reasoning text (provider-agnostic) */
|
|
48
62
|
thinking?: string;
|
|
49
63
|
usage?: {
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":";;;AA2IA,wCA6BC;AAxKD,2CAAgD;AAChD,qCAA0C;AAC1C,qCAA0C;AAC1C,6CAAiD;AACjD,2CAA+C;AAyG/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"}
|
|
@@ -14,7 +14,7 @@ export declare class OpenAIProvider implements LLMProvider {
|
|
|
14
14
|
private chatCodexResponses;
|
|
15
15
|
private parseCodexResponsesStream;
|
|
16
16
|
private chatStream;
|
|
17
|
-
/** Check if the model
|
|
17
|
+
/** Check if the selected model can return reasoning summaries. */
|
|
18
18
|
private isReasoningModel;
|
|
19
19
|
private parseResponse;
|
|
20
20
|
}
|
|
@@ -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;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;
|
|
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;IA0GzD,OAAO,CAAC,eAAe;IA0CvB,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,oBAAoB;YAQd,kBAAkB;YA6DlB,yBAAyB;YAyLzB,UAAU;IAuGxB,kEAAkE;IAClE,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,aAAa;CA+BtB"}
|