@calliopelabs/cli 0.8.20 → 2.0.2
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/agents/agent-config-loader.d.ts +60 -0
- package/dist/agents/agent-config-loader.d.ts.map +1 -0
- package/dist/agents/agent-config-loader.js +402 -0
- package/dist/agents/agent-config-loader.js.map +1 -0
- package/dist/agents/agent-config-presets.d.ts +10 -0
- package/dist/agents/agent-config-presets.d.ts.map +1 -0
- package/dist/agents/agent-config-presets.js +940 -0
- package/dist/agents/agent-config-presets.js.map +1 -0
- package/dist/agents/agent-config-types.d.ts +145 -0
- package/dist/agents/agent-config-types.d.ts.map +1 -0
- package/dist/agents/agent-config-types.js +12 -0
- package/dist/agents/agent-config-types.js.map +1 -0
- package/dist/{agterm → agents}/agent-detection.d.ts +1 -1
- package/dist/{agterm → agents}/agent-detection.d.ts.map +1 -1
- package/dist/{agterm → agents}/agent-detection.js +21 -5
- package/dist/agents/agent-detection.js.map +1 -0
- package/dist/agents/aggregator.d.ts +19 -0
- package/dist/agents/aggregator.d.ts.map +1 -0
- package/dist/agents/aggregator.js +141 -0
- package/dist/agents/aggregator.js.map +1 -0
- package/dist/{agterm → agents}/cli-backend.d.ts +1 -1
- package/dist/{agterm → agents}/cli-backend.d.ts.map +1 -1
- package/dist/{agterm → agents}/cli-backend.js +90 -12
- package/dist/agents/cli-backend.js.map +1 -0
- package/dist/agents/council-types.d.ts +113 -0
- package/dist/agents/council-types.d.ts.map +1 -0
- package/dist/agents/council-types.js +81 -0
- package/dist/agents/council-types.js.map +1 -0
- package/dist/agents/council.d.ts +107 -0
- package/dist/agents/council.d.ts.map +1 -0
- package/dist/agents/council.js +586 -0
- package/dist/agents/council.js.map +1 -0
- package/dist/agents/decomposer.d.ts +33 -0
- package/dist/agents/decomposer.d.ts.map +1 -0
- package/dist/agents/decomposer.js +138 -0
- package/dist/agents/decomposer.js.map +1 -0
- package/dist/agents/dynamic-tools.d.ts +52 -0
- package/dist/agents/dynamic-tools.d.ts.map +1 -0
- package/dist/agents/dynamic-tools.js +395 -0
- package/dist/agents/dynamic-tools.js.map +1 -0
- package/dist/agents/index.d.ts +29 -0
- package/dist/agents/index.d.ts.map +1 -0
- package/dist/agents/index.js +29 -0
- package/dist/agents/index.js.map +1 -0
- package/dist/agents/installer.d.ts +39 -0
- package/dist/agents/installer.d.ts.map +1 -0
- package/dist/agents/installer.js +205 -0
- package/dist/agents/installer.js.map +1 -0
- package/dist/{agterm → agents}/orchestrator.d.ts +7 -2
- package/dist/agents/orchestrator.d.ts.map +1 -0
- package/dist/{agterm → agents}/orchestrator.js +22 -2
- package/dist/agents/orchestrator.js.map +1 -0
- package/dist/agents/sdk-backend.d.ts +63 -0
- package/dist/agents/sdk-backend.d.ts.map +1 -0
- package/dist/agents/sdk-backend.js +489 -0
- package/dist/agents/sdk-backend.js.map +1 -0
- package/dist/agents/swarm-types.d.ts +83 -0
- package/dist/agents/swarm-types.d.ts.map +1 -0
- package/dist/agents/swarm-types.js +20 -0
- package/dist/agents/swarm-types.js.map +1 -0
- package/dist/agents/swarm.d.ts +74 -0
- package/dist/agents/swarm.d.ts.map +1 -0
- package/dist/agents/swarm.js +307 -0
- package/dist/agents/swarm.js.map +1 -0
- package/dist/{agterm → agents}/tools.d.ts +7 -5
- package/dist/agents/tools.d.ts.map +1 -0
- package/dist/agents/tools.js +776 -0
- package/dist/agents/tools.js.map +1 -0
- package/dist/{agterm → agents}/types.d.ts +14 -2
- package/dist/agents/types.d.ts.map +1 -0
- package/dist/{agterm → agents}/types.js +2 -2
- package/dist/agents/types.js.map +1 -0
- package/dist/api-server.d.ts +26 -0
- package/dist/api-server.d.ts.map +1 -0
- package/dist/api-server.js +230 -0
- package/dist/api-server.js.map +1 -0
- package/dist/auto-checkpoint.d.ts +35 -0
- package/dist/auto-checkpoint.d.ts.map +1 -0
- package/dist/auto-checkpoint.js +143 -0
- package/dist/auto-checkpoint.js.map +1 -0
- package/dist/auto-compressor.d.ts +44 -0
- package/dist/auto-compressor.d.ts.map +1 -0
- package/dist/auto-compressor.js +145 -0
- package/dist/auto-compressor.js.map +1 -0
- package/dist/background-jobs.d.ts +45 -0
- package/dist/background-jobs.d.ts.map +1 -0
- package/dist/background-jobs.js +122 -0
- package/dist/background-jobs.js.map +1 -0
- package/dist/bin.d.ts +6 -2
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +127 -24
- package/dist/bin.js.map +1 -1
- package/dist/checkpoint.d.ts +49 -0
- package/dist/checkpoint.d.ts.map +1 -0
- package/dist/checkpoint.js +219 -0
- package/dist/checkpoint.js.map +1 -0
- package/dist/circuit-breaker/breaker.d.ts +80 -0
- package/dist/circuit-breaker/breaker.d.ts.map +1 -0
- package/dist/circuit-breaker/breaker.js +408 -0
- package/dist/circuit-breaker/breaker.js.map +1 -0
- package/dist/circuit-breaker/defaults.d.ts +8 -0
- package/dist/circuit-breaker/defaults.d.ts.map +1 -0
- package/dist/circuit-breaker/defaults.js +35 -0
- package/dist/circuit-breaker/defaults.js.map +1 -0
- package/dist/circuit-breaker/index.d.ts +9 -0
- package/dist/circuit-breaker/index.d.ts.map +1 -0
- package/dist/circuit-breaker/index.js +8 -0
- package/dist/circuit-breaker/index.js.map +1 -0
- package/dist/circuit-breaker/types.d.ts +77 -0
- package/dist/circuit-breaker/types.d.ts.map +1 -0
- package/dist/circuit-breaker/types.js +8 -0
- package/dist/circuit-breaker/types.js.map +1 -0
- package/dist/circuit-breaker.d.ts +8 -0
- package/dist/circuit-breaker.d.ts.map +1 -0
- package/dist/circuit-breaker.js +7 -0
- package/dist/circuit-breaker.js.map +1 -0
- package/dist/cli/agent.d.ts +9 -0
- package/dist/cli/agent.d.ts.map +1 -0
- package/dist/cli/agent.js +262 -0
- package/dist/cli/agent.js.map +1 -0
- package/dist/cli/commands.d.ts +12 -0
- package/dist/cli/commands.d.ts.map +1 -0
- package/dist/{cli.js → cli/commands.js} +285 -422
- package/dist/cli/commands.js.map +1 -0
- package/dist/cli/index.d.ts +8 -0
- package/dist/cli/index.d.ts.map +1 -0
- package/dist/cli/index.js +222 -0
- package/dist/cli/index.js.map +1 -0
- package/dist/cli/types.d.ts +30 -0
- package/dist/cli/types.d.ts.map +1 -0
- package/dist/cli/types.js +20 -0
- package/dist/cli/types.js.map +1 -0
- package/dist/companions.d.ts +54 -0
- package/dist/companions.d.ts.map +1 -0
- package/dist/companions.js +440 -0
- package/dist/companions.js.map +1 -0
- package/dist/config.d.ts +23 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +95 -22
- package/dist/config.js.map +1 -1
- package/dist/diff.d.ts +27 -0
- package/dist/diff.d.ts.map +1 -1
- package/dist/diff.js +415 -10
- package/dist/diff.js.map +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +20 -11
- package/dist/errors.js.map +1 -1
- package/dist/git-status.d.ts +23 -0
- package/dist/git-status.d.ts.map +1 -0
- package/dist/git-status.js +92 -0
- package/dist/git-status.js.map +1 -0
- package/dist/headless.d.ts +25 -0
- package/dist/headless.d.ts.map +1 -0
- package/dist/headless.js +182 -0
- package/dist/headless.js.map +1 -0
- package/dist/hud/api.d.ts +35 -0
- package/dist/hud/api.d.ts.map +1 -0
- package/dist/hud/api.js +448 -0
- package/dist/hud/api.js.map +1 -0
- package/dist/hud/palettes.d.ts +9 -0
- package/dist/hud/palettes.d.ts.map +1 -0
- package/dist/hud/palettes.js +280 -0
- package/dist/hud/palettes.js.map +1 -0
- package/dist/hud/skins.d.ts +12 -0
- package/dist/hud/skins.d.ts.map +1 -0
- package/dist/hud/skins.js +365 -0
- package/dist/hud/skins.js.map +1 -0
- package/dist/hud/theme-packs/api.d.ts +51 -0
- package/dist/hud/theme-packs/api.d.ts.map +1 -0
- package/dist/hud/theme-packs/api.js +145 -0
- package/dist/hud/theme-packs/api.js.map +1 -0
- package/dist/hud/theme-packs/index.d.ts +18 -0
- package/dist/hud/theme-packs/index.d.ts.map +1 -0
- package/dist/hud/theme-packs/index.js +38 -0
- package/dist/hud/theme-packs/index.js.map +1 -0
- package/dist/hud/theme-packs/types.d.ts +29 -0
- package/dist/hud/theme-packs/types.d.ts.map +1 -0
- package/dist/hud/theme-packs/types.js +9 -0
- package/dist/hud/theme-packs/types.js.map +1 -0
- package/dist/hud/types.d.ts +182 -0
- package/dist/hud/types.d.ts.map +1 -0
- package/dist/hud/types.js +7 -0
- package/dist/hud/types.js.map +1 -0
- package/dist/idle-eviction.d.ts +34 -0
- package/dist/idle-eviction.d.ts.map +1 -0
- package/dist/idle-eviction.js +78 -0
- package/dist/idle-eviction.js.map +1 -0
- package/dist/index.d.ts +9 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -3
- package/dist/index.js.map +1 -1
- package/dist/iteration-ledger.d.ts +105 -0
- package/dist/iteration-ledger.d.ts.map +1 -0
- package/dist/iteration-ledger.js +237 -0
- package/dist/iteration-ledger.js.map +1 -0
- package/dist/markdown.d.ts.map +1 -1
- package/dist/markdown.js +1 -27
- package/dist/markdown.js.map +1 -1
- package/dist/mcp.d.ts +35 -0
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +291 -7
- package/dist/mcp.js.map +1 -1
- package/dist/memory.d.ts.map +1 -1
- package/dist/memory.js +12 -2
- package/dist/memory.js.map +1 -1
- package/dist/model-detection.d.ts +5 -0
- package/dist/model-detection.d.ts.map +1 -1
- package/dist/model-detection.js +278 -10
- package/dist/model-detection.js.map +1 -1
- package/dist/model-router.d.ts.map +1 -1
- package/dist/model-router.js +33 -11
- package/dist/model-router.js.map +1 -1
- package/dist/plugins.d.ts +8 -0
- package/dist/plugins.d.ts.map +1 -1
- package/dist/plugins.js +97 -6
- package/dist/plugins.js.map +1 -1
- package/dist/providers/anthropic.d.ts +10 -0
- package/dist/providers/anthropic.d.ts.map +1 -0
- package/dist/providers/anthropic.js +221 -0
- package/dist/providers/anthropic.js.map +1 -0
- package/dist/providers/bedrock.d.ts +17 -0
- package/dist/providers/bedrock.d.ts.map +1 -0
- package/dist/providers/bedrock.js +574 -0
- package/dist/providers/bedrock.js.map +1 -0
- package/dist/providers/compat.d.ts +13 -0
- package/dist/providers/compat.d.ts.map +1 -0
- package/dist/providers/compat.js +202 -0
- package/dist/providers/compat.js.map +1 -0
- package/dist/providers/google.d.ts +10 -0
- package/dist/providers/google.d.ts.map +1 -0
- package/dist/providers/google.js +203 -0
- package/dist/providers/google.js.map +1 -0
- package/dist/providers/index.d.ts +23 -0
- package/dist/providers/index.d.ts.map +1 -0
- package/dist/providers/index.js +145 -0
- package/dist/providers/index.js.map +1 -0
- package/dist/providers/ollama.d.ts +17 -0
- package/dist/providers/ollama.d.ts.map +1 -0
- package/dist/providers/ollama.js +289 -0
- package/dist/providers/ollama.js.map +1 -0
- package/dist/providers/openai.d.ts +121 -0
- package/dist/providers/openai.d.ts.map +1 -0
- package/dist/providers/openai.js +485 -0
- package/dist/providers/openai.js.map +1 -0
- package/dist/providers/types.d.ts +63 -0
- package/dist/providers/types.d.ts.map +1 -0
- package/dist/providers/types.js +164 -0
- package/dist/providers/types.js.map +1 -0
- package/dist/sandbox-native.d.ts +59 -0
- package/dist/sandbox-native.d.ts.map +1 -0
- package/dist/sandbox-native.js +292 -0
- package/dist/sandbox-native.js.map +1 -0
- package/dist/sandbox.d.ts +2 -2
- package/dist/sandbox.d.ts.map +1 -1
- package/dist/sandbox.js +59 -13
- package/dist/sandbox.js.map +1 -1
- package/dist/scope.d.ts +3 -1
- package/dist/scope.d.ts.map +1 -1
- package/dist/scope.js +13 -1
- package/dist/scope.js.map +1 -1
- package/dist/session-timeout.d.ts +31 -0
- package/dist/session-timeout.d.ts.map +1 -0
- package/dist/session-timeout.js +100 -0
- package/dist/session-timeout.js.map +1 -0
- package/dist/setup.d.ts.map +1 -1
- package/dist/setup.js +29 -17
- package/dist/setup.js.map +1 -1
- package/dist/smart-router.d.ts +73 -0
- package/dist/smart-router.d.ts.map +1 -0
- package/dist/smart-router.js +332 -0
- package/dist/smart-router.js.map +1 -0
- package/dist/storage.d.ts +19 -0
- package/dist/storage.d.ts.map +1 -1
- package/dist/storage.js +164 -1
- package/dist/storage.js.map +1 -1
- package/dist/streaming.d.ts +4 -0
- package/dist/streaming.d.ts.map +1 -1
- package/dist/streaming.js +12 -0
- package/dist/streaming.js.map +1 -1
- package/dist/styles.d.ts +32 -0
- package/dist/styles.d.ts.map +1 -1
- package/dist/styles.js +91 -0
- package/dist/styles.js.map +1 -1
- package/dist/summarization.d.ts +1 -1
- package/dist/summarization.js +4 -4
- package/dist/summarization.js.map +1 -1
- package/dist/terminal-image.d.ts +115 -0
- package/dist/terminal-image.d.ts.map +1 -0
- package/dist/terminal-image.js +766 -0
- package/dist/terminal-image.js.map +1 -0
- package/dist/terminal-recording.d.ts +55 -0
- package/dist/terminal-recording.d.ts.map +1 -0
- package/dist/terminal-recording.js +182 -0
- package/dist/terminal-recording.js.map +1 -0
- package/dist/themes.d.ts +19 -35
- package/dist/themes.d.ts.map +1 -1
- package/dist/themes.js +101 -210
- package/dist/themes.js.map +1 -1
- package/dist/tmux.d.ts +35 -0
- package/dist/tmux.d.ts.map +1 -0
- package/dist/tmux.js +106 -0
- package/dist/tmux.js.map +1 -0
- package/dist/tools.d.ts +3 -3
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +587 -45
- package/dist/tools.js.map +1 -1
- package/dist/trust.d.ts +53 -0
- package/dist/trust.d.ts.map +1 -0
- package/dist/trust.js +154 -0
- package/dist/trust.js.map +1 -0
- package/dist/types.d.ts +7 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +70 -32
- package/dist/types.js.map +1 -1
- package/dist/ui/agent.d.ts +61 -0
- package/dist/ui/agent.d.ts.map +1 -0
- package/dist/ui/agent.js +768 -0
- package/dist/ui/agent.js.map +1 -0
- package/dist/ui/chat-input.d.ts +32 -0
- package/dist/ui/chat-input.d.ts.map +1 -0
- package/dist/ui/chat-input.js +355 -0
- package/dist/ui/chat-input.js.map +1 -0
- package/dist/ui/commands.d.ts +92 -0
- package/dist/ui/commands.d.ts.map +1 -0
- package/dist/ui/commands.js +3006 -0
- package/dist/ui/commands.js.map +1 -0
- package/dist/ui/completions.d.ts +22 -0
- package/dist/ui/completions.d.ts.map +1 -0
- package/dist/ui/completions.js +215 -0
- package/dist/ui/completions.js.map +1 -0
- package/dist/ui/components.d.ts +38 -0
- package/dist/ui/components.d.ts.map +1 -0
- package/dist/ui/components.js +422 -0
- package/dist/ui/components.js.map +1 -0
- package/dist/ui/context.d.ts +12 -0
- package/dist/ui/context.d.ts.map +1 -0
- package/dist/ui/context.js +102 -0
- package/dist/ui/context.js.map +1 -0
- package/dist/ui/error-boundary.d.ts +33 -0
- package/dist/ui/error-boundary.d.ts.map +1 -0
- package/dist/ui/error-boundary.js +94 -0
- package/dist/ui/error-boundary.js.map +1 -0
- package/dist/ui/frame.d.ts +13 -0
- package/dist/ui/frame.d.ts.map +1 -0
- package/dist/ui/frame.js +89 -0
- package/dist/ui/frame.js.map +1 -0
- package/dist/ui/index.d.ts +12 -0
- package/dist/ui/index.d.ts.map +1 -0
- package/dist/ui/index.js +928 -0
- package/dist/ui/index.js.map +1 -0
- package/dist/ui/messages.d.ts +19 -0
- package/dist/ui/messages.d.ts.map +1 -0
- package/dist/ui/messages.js +181 -0
- package/dist/ui/messages.js.map +1 -0
- package/dist/ui/modals.d.ts +52 -0
- package/dist/ui/modals.d.ts.map +1 -0
- package/dist/ui/modals.js +204 -0
- package/dist/ui/modals.js.map +1 -0
- package/dist/ui/pack-picker.d.ts +12 -0
- package/dist/ui/pack-picker.d.ts.map +1 -0
- package/dist/ui/pack-picker.js +101 -0
- package/dist/ui/pack-picker.js.map +1 -0
- package/dist/ui/status-bar.d.ts +20 -0
- package/dist/ui/status-bar.d.ts.map +1 -0
- package/dist/ui/status-bar.js +41 -0
- package/dist/ui/status-bar.js.map +1 -0
- package/dist/ui/theme-picker.d.ts +24 -0
- package/dist/ui/theme-picker.d.ts.map +1 -0
- package/dist/ui/theme-picker.js +190 -0
- package/dist/ui/theme-picker.js.map +1 -0
- package/dist/ui/types.d.ts +62 -0
- package/dist/ui/types.d.ts.map +1 -0
- package/dist/ui/types.js +7 -0
- package/dist/ui/types.js.map +1 -0
- package/dist/version-check.d.ts.map +1 -1
- package/dist/version-check.js +1 -9
- package/dist/version-check.js.map +1 -1
- package/package.json +8 -3
- package/dist/agterm/agent-detection.js.map +0 -1
- package/dist/agterm/cli-backend.js.map +0 -1
- package/dist/agterm/index.d.ts +0 -12
- package/dist/agterm/index.d.ts.map +0 -1
- package/dist/agterm/index.js +0 -15
- package/dist/agterm/index.js.map +0 -1
- package/dist/agterm/orchestrator.d.ts.map +0 -1
- package/dist/agterm/orchestrator.js.map +0 -1
- package/dist/agterm/tools.d.ts.map +0 -1
- package/dist/agterm/tools.js +0 -278
- package/dist/agterm/tools.js.map +0 -1
- package/dist/agterm/types.d.ts.map +0 -1
- package/dist/agterm/types.js.map +0 -1
- package/dist/cli.d.ts +0 -14
- package/dist/cli.d.ts.map +0 -1
- package/dist/cli.js.map +0 -1
- package/dist/providers.d.ts +0 -51
- package/dist/providers.d.ts.map +0 -1
- package/dist/providers.js +0 -1146
- package/dist/providers.js.map +0 -1
- package/dist/ui-cli.d.ts +0 -17
- package/dist/ui-cli.d.ts.map +0 -1
- package/dist/ui-cli.js +0 -3730
- package/dist/ui-cli.js.map +0 -1
|
@@ -0,0 +1,289 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Native Ollama Provider
|
|
3
|
+
*
|
|
4
|
+
* Uses Ollama's native /api/chat endpoint instead of the OpenAI-compatible
|
|
5
|
+
* /v1/chat/completions. Many Ollama models (e.g. devstral) only support
|
|
6
|
+
* tool calling through the native API.
|
|
7
|
+
*
|
|
8
|
+
* Features:
|
|
9
|
+
* - Native /api/chat for reliable tool calling
|
|
10
|
+
* - Auto-detection of tool support (retries without tools on 400)
|
|
11
|
+
* - Model fallback discovery when configured model isn't available
|
|
12
|
+
* - Streaming support with proper tool call collection
|
|
13
|
+
*/
|
|
14
|
+
import * as config from '../config.js';
|
|
15
|
+
import { debugLog } from './types.js';
|
|
16
|
+
import { getOllamaFallbackModel } from '../model-detection.js';
|
|
17
|
+
// Track which models don't support tools — expires after 10 calls to allow recovery
|
|
18
|
+
const toolUnsupportedModels = new Map(); // model -> remaining skip count
|
|
19
|
+
const TOOL_SKIP_COUNT = 10; // Retry tools after this many calls
|
|
20
|
+
// ============================================================================
|
|
21
|
+
// Message Conversion
|
|
22
|
+
// ============================================================================
|
|
23
|
+
function toOllamaMessages(messages, stripToolHistory = false) {
|
|
24
|
+
return messages
|
|
25
|
+
.filter(m => {
|
|
26
|
+
// When stripping tool history, remove tool result messages and
|
|
27
|
+
// assistant messages that only contain tool calls
|
|
28
|
+
if (!stripToolHistory)
|
|
29
|
+
return true;
|
|
30
|
+
if (m.role === 'tool')
|
|
31
|
+
return false;
|
|
32
|
+
if (m.role === 'assistant' && m.toolCalls && m.toolCalls.length > 0 && !m.content)
|
|
33
|
+
return false;
|
|
34
|
+
return true;
|
|
35
|
+
})
|
|
36
|
+
.map(m => {
|
|
37
|
+
if (m.role === 'tool') {
|
|
38
|
+
return {
|
|
39
|
+
role: 'tool',
|
|
40
|
+
content: typeof m.content === 'string' ? m.content : JSON.stringify(m.content),
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
if (!stripToolHistory && m.toolCalls && m.toolCalls.length > 0) {
|
|
44
|
+
return {
|
|
45
|
+
role: 'assistant',
|
|
46
|
+
content: typeof m.content === 'string' ? (m.content || '') : JSON.stringify(m.content),
|
|
47
|
+
tool_calls: m.toolCalls.map(tc => ({
|
|
48
|
+
id: tc.id,
|
|
49
|
+
function: {
|
|
50
|
+
name: tc.name,
|
|
51
|
+
arguments: tc.arguments,
|
|
52
|
+
},
|
|
53
|
+
})),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
const content = typeof m.content === 'string'
|
|
57
|
+
? m.content
|
|
58
|
+
: Array.isArray(m.content)
|
|
59
|
+
? m.content.filter(b => b.type === 'text').map(b => b.text).join('\n')
|
|
60
|
+
: JSON.stringify(m.content);
|
|
61
|
+
return {
|
|
62
|
+
role: m.role,
|
|
63
|
+
content,
|
|
64
|
+
};
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
function toOllamaTools(tools) {
|
|
68
|
+
return tools.map(t => ({
|
|
69
|
+
type: 'function',
|
|
70
|
+
function: {
|
|
71
|
+
name: t.name,
|
|
72
|
+
description: t.description,
|
|
73
|
+
parameters: t.parameters,
|
|
74
|
+
},
|
|
75
|
+
}));
|
|
76
|
+
}
|
|
77
|
+
function parseOllamaToolCalls(toolCalls) {
|
|
78
|
+
if (!toolCalls || toolCalls.length === 0)
|
|
79
|
+
return [];
|
|
80
|
+
return toolCalls.map((tc, i) => ({
|
|
81
|
+
id: tc.id || `call_${Date.now()}_${i}`,
|
|
82
|
+
name: tc.function.name,
|
|
83
|
+
arguments: tc.function.arguments,
|
|
84
|
+
}));
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Parse text-based tool calls from model output when structured tool calling isn't available.
|
|
88
|
+
* Handles XML-style: <function=name><parameter=key>value</parameter></function>
|
|
89
|
+
* Handles JSON-style: {"name": "tool", "arguments": {...}}
|
|
90
|
+
*/
|
|
91
|
+
function parseTextToolCalls(content) {
|
|
92
|
+
const toolCalls = [];
|
|
93
|
+
// Match XML-style: <function=name><parameter=key>value</parameter>...</function>
|
|
94
|
+
const xmlPattern = /<function=(\w+)>([\s\S]*?)<\/function>/g;
|
|
95
|
+
const paramPattern = /<parameter=(\w+)>([\s\S]*?)<\/parameter>/g;
|
|
96
|
+
let match;
|
|
97
|
+
while ((match = xmlPattern.exec(content)) !== null) {
|
|
98
|
+
const name = match[1];
|
|
99
|
+
const body = match[2];
|
|
100
|
+
const args = {};
|
|
101
|
+
let paramMatch;
|
|
102
|
+
paramPattern.lastIndex = 0;
|
|
103
|
+
while ((paramMatch = paramPattern.exec(body)) !== null) {
|
|
104
|
+
const value = paramMatch[2].trim();
|
|
105
|
+
// Try to parse as JSON, fall back to string
|
|
106
|
+
try {
|
|
107
|
+
args[paramMatch[1]] = JSON.parse(value);
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
110
|
+
args[paramMatch[1]] = value;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
toolCalls.push({
|
|
114
|
+
id: `call_${Date.now()}_${toolCalls.length}`,
|
|
115
|
+
name,
|
|
116
|
+
arguments: args,
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
// Strip matched XML tool calls from content
|
|
120
|
+
const cleanContent = content.replace(/<function=\w+>[\s\S]*?<\/function>/g, '').trim();
|
|
121
|
+
return { toolCalls, cleanContent };
|
|
122
|
+
}
|
|
123
|
+
// ============================================================================
|
|
124
|
+
// Helpers
|
|
125
|
+
// ============================================================================
|
|
126
|
+
function getBaseUrl() {
|
|
127
|
+
let baseUrl = config.getBaseUrl('ollama') || 'http://localhost:11434';
|
|
128
|
+
if (baseUrl.endsWith('/v1')) {
|
|
129
|
+
baseUrl = baseUrl.slice(0, -3);
|
|
130
|
+
}
|
|
131
|
+
return baseUrl;
|
|
132
|
+
}
|
|
133
|
+
function isToolError(errText) {
|
|
134
|
+
const lower = errText.toLowerCase();
|
|
135
|
+
// Only match specific tool-related errors, not generic "bad request"
|
|
136
|
+
return lower.includes('does not support tools') ||
|
|
137
|
+
lower.includes('tool_calls') ||
|
|
138
|
+
lower.includes('tools are not supported') ||
|
|
139
|
+
lower.includes('unknown field') && lower.includes('tool');
|
|
140
|
+
}
|
|
141
|
+
// ============================================================================
|
|
142
|
+
// Chat Function
|
|
143
|
+
// ============================================================================
|
|
144
|
+
export async function chatOllama(messages, tools, model, onToken) {
|
|
145
|
+
const baseUrl = getBaseUrl();
|
|
146
|
+
const skipCount = toolUnsupportedModels.get(model) ?? 0;
|
|
147
|
+
const skipTools = skipCount > 0;
|
|
148
|
+
if (skipTools) {
|
|
149
|
+
// Decrement counter — eventually we'll retry with tools
|
|
150
|
+
toolUnsupportedModels.set(model, skipCount - 1);
|
|
151
|
+
if (skipCount <= 1)
|
|
152
|
+
toolUnsupportedModels.delete(model);
|
|
153
|
+
}
|
|
154
|
+
const ollamaTools = skipTools ? [] : toOllamaTools(tools);
|
|
155
|
+
const ollamaMessages = toOllamaMessages(messages, skipTools);
|
|
156
|
+
if (skipTools && tools.length > 0) {
|
|
157
|
+
debugLog(`ollama: skipping tools for ${model} (retry in ${skipCount - 1} calls)`);
|
|
158
|
+
}
|
|
159
|
+
debugLog(`ollama native request: model=${model}, tools=${ollamaTools.length}, stream=${!!onToken}`);
|
|
160
|
+
try {
|
|
161
|
+
return await doChat(baseUrl, model, ollamaMessages, ollamaTools, onToken);
|
|
162
|
+
}
|
|
163
|
+
catch (error) {
|
|
164
|
+
const errMsg = error instanceof Error ? error.message : String(error);
|
|
165
|
+
// Model not found — try fallback
|
|
166
|
+
if (errMsg.includes('not found') || errMsg.includes('404')) {
|
|
167
|
+
return tryFallback(baseUrl, model, ollamaMessages, ollamaTools, onToken);
|
|
168
|
+
}
|
|
169
|
+
// Tool-related error (400) — retry without tools
|
|
170
|
+
if (ollamaTools.length > 0 && isToolError(errMsg)) {
|
|
171
|
+
debugLog(`ollama: model "${model}" rejected tools, retrying without tools (will retry in ${TOOL_SKIP_COUNT} calls)`);
|
|
172
|
+
toolUnsupportedModels.set(model, TOOL_SKIP_COUNT);
|
|
173
|
+
const cleanMessages = toOllamaMessages(messages, true);
|
|
174
|
+
return doChat(baseUrl, model, cleanMessages, [], onToken);
|
|
175
|
+
}
|
|
176
|
+
throw error;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
async function doChat(baseUrl, model, messages, tools, onToken) {
|
|
180
|
+
const requestBody = {
|
|
181
|
+
model,
|
|
182
|
+
messages,
|
|
183
|
+
tools: tools.length > 0 ? tools : undefined,
|
|
184
|
+
stream: !!onToken,
|
|
185
|
+
};
|
|
186
|
+
const response = await fetch(`${baseUrl}/api/chat`, {
|
|
187
|
+
method: 'POST',
|
|
188
|
+
headers: { 'Content-Type': 'application/json' },
|
|
189
|
+
body: JSON.stringify(requestBody),
|
|
190
|
+
});
|
|
191
|
+
if (!response.ok) {
|
|
192
|
+
const errText = await response.text();
|
|
193
|
+
throw new Error(`Ollama API error ${response.status}: ${errText}`);
|
|
194
|
+
}
|
|
195
|
+
if (onToken) {
|
|
196
|
+
return streamResponse(response, onToken);
|
|
197
|
+
}
|
|
198
|
+
const data = await response.json();
|
|
199
|
+
if (data.load_duration && data.load_duration > 10_000_000_000) {
|
|
200
|
+
debugLog(`ollama: cold start for ${model} took ${Math.round(data.load_duration / 1_000_000_000)}s`);
|
|
201
|
+
}
|
|
202
|
+
let toolCalls = parseOllamaToolCalls(data.message?.tool_calls);
|
|
203
|
+
let responseContent = data.message?.content || '';
|
|
204
|
+
// Fallback: parse text-based tool calls if model output XML-style calls
|
|
205
|
+
if (toolCalls.length === 0 && responseContent.includes('<function=')) {
|
|
206
|
+
const parsed = parseTextToolCalls(responseContent);
|
|
207
|
+
if (parsed.toolCalls.length > 0) {
|
|
208
|
+
toolCalls = parsed.toolCalls;
|
|
209
|
+
responseContent = parsed.cleanContent;
|
|
210
|
+
debugLog(`ollama: parsed ${toolCalls.length} text-based tool call(s) from response`);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return {
|
|
214
|
+
content: responseContent,
|
|
215
|
+
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
216
|
+
finishReason: toolCalls.length > 0 ? 'tool_use' : 'stop',
|
|
217
|
+
usage: {
|
|
218
|
+
inputTokens: data.prompt_eval_count || 0,
|
|
219
|
+
outputTokens: data.eval_count || 0,
|
|
220
|
+
},
|
|
221
|
+
};
|
|
222
|
+
}
|
|
223
|
+
async function streamResponse(response, onToken) {
|
|
224
|
+
const reader = response.body?.getReader();
|
|
225
|
+
if (!reader)
|
|
226
|
+
throw new Error('No response body from Ollama');
|
|
227
|
+
const decoder = new TextDecoder();
|
|
228
|
+
let content = '';
|
|
229
|
+
let allToolCalls = [];
|
|
230
|
+
let promptTokens = 0;
|
|
231
|
+
let completionTokens = 0;
|
|
232
|
+
while (true) {
|
|
233
|
+
const { done, value } = await reader.read();
|
|
234
|
+
if (done)
|
|
235
|
+
break;
|
|
236
|
+
const text = decoder.decode(value, { stream: true });
|
|
237
|
+
const lines = text.split('\n').filter(l => l.trim());
|
|
238
|
+
for (const line of lines) {
|
|
239
|
+
let chunk;
|
|
240
|
+
try {
|
|
241
|
+
chunk = JSON.parse(line);
|
|
242
|
+
}
|
|
243
|
+
catch {
|
|
244
|
+
continue;
|
|
245
|
+
}
|
|
246
|
+
if (chunk.message?.content) {
|
|
247
|
+
content += chunk.message.content;
|
|
248
|
+
onToken(chunk.message.content);
|
|
249
|
+
}
|
|
250
|
+
if (chunk.message?.tool_calls) {
|
|
251
|
+
const parsed = parseOllamaToolCalls(chunk.message.tool_calls);
|
|
252
|
+
allToolCalls.push(...parsed);
|
|
253
|
+
}
|
|
254
|
+
if (chunk.done) {
|
|
255
|
+
if (chunk.prompt_eval_count)
|
|
256
|
+
promptTokens = chunk.prompt_eval_count;
|
|
257
|
+
if (chunk.eval_count)
|
|
258
|
+
completionTokens = chunk.eval_count;
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
// Fallback: parse text-based tool calls from streamed content
|
|
263
|
+
if (allToolCalls.length === 0 && content.includes('<function=')) {
|
|
264
|
+
const parsed = parseTextToolCalls(content);
|
|
265
|
+
if (parsed.toolCalls.length > 0) {
|
|
266
|
+
allToolCalls = parsed.toolCalls;
|
|
267
|
+
content = parsed.cleanContent;
|
|
268
|
+
debugLog(`ollama: parsed ${allToolCalls.length} text-based tool call(s) from stream`);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
return {
|
|
272
|
+
content,
|
|
273
|
+
toolCalls: allToolCalls.length > 0 ? allToolCalls : undefined,
|
|
274
|
+
finishReason: allToolCalls.length > 0 ? 'tool_use' : 'stop',
|
|
275
|
+
usage: {
|
|
276
|
+
inputTokens: promptTokens,
|
|
277
|
+
outputTokens: completionTokens,
|
|
278
|
+
},
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
async function tryFallback(baseUrl, originalModel, messages, tools, onToken) {
|
|
282
|
+
const fallback = await getOllamaFallbackModel();
|
|
283
|
+
if (!fallback || fallback === originalModel) {
|
|
284
|
+
throw new Error(`Ollama model "${originalModel}" not found. Pull it with: ollama pull ${originalModel}`);
|
|
285
|
+
}
|
|
286
|
+
debugLog(`Ollama model "${originalModel}" not found, falling back to "${fallback}"`);
|
|
287
|
+
return doChat(baseUrl, fallback, messages, tools, onToken);
|
|
288
|
+
}
|
|
289
|
+
//# sourceMappingURL=ollama.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/providers/ollama.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OpenAI Provider (Chat Completions + Responses API)
|
|
3
|
+
*
|
|
4
|
+
* Handles both the standard Chat Completions API and the newer Responses API
|
|
5
|
+
* for reasoning models (o3, o4-mini, gpt-5, etc.).
|
|
6
|
+
*
|
|
7
|
+
* Also exports shared OpenAI format converters used by the compat provider.
|
|
8
|
+
*/
|
|
9
|
+
import OpenAI from 'openai';
|
|
10
|
+
import type { Message, Tool, LLMResponse, ToolCall, MessageContent } from '../types.js';
|
|
11
|
+
import { type StreamCallback } from './types.js';
|
|
12
|
+
/**
|
|
13
|
+
* Convert MessageContent to OpenAI content format
|
|
14
|
+
*/
|
|
15
|
+
export declare function toOpenAIContent(content: MessageContent): string | OpenAI.Chat.Completions.ChatCompletionContentPart[];
|
|
16
|
+
/**
|
|
17
|
+
* Convert messages to OpenAI format
|
|
18
|
+
*/
|
|
19
|
+
export declare function toOpenAIMessages(messages: Message[]): ({
|
|
20
|
+
role: "tool";
|
|
21
|
+
tool_call_id: string;
|
|
22
|
+
content: string;
|
|
23
|
+
tool_calls?: undefined;
|
|
24
|
+
} | {
|
|
25
|
+
role: "assistant";
|
|
26
|
+
content: string | null;
|
|
27
|
+
tool_calls: {
|
|
28
|
+
id: string;
|
|
29
|
+
type: "function";
|
|
30
|
+
function: {
|
|
31
|
+
name: string;
|
|
32
|
+
arguments: string;
|
|
33
|
+
};
|
|
34
|
+
}[];
|
|
35
|
+
tool_call_id?: undefined;
|
|
36
|
+
} | {
|
|
37
|
+
role: "user";
|
|
38
|
+
content: string | OpenAI.Chat.Completions.ChatCompletionContentPart[];
|
|
39
|
+
tool_call_id?: undefined;
|
|
40
|
+
tool_calls?: undefined;
|
|
41
|
+
} | {
|
|
42
|
+
role: "system" | "user" | "assistant";
|
|
43
|
+
content: string;
|
|
44
|
+
tool_call_id?: undefined;
|
|
45
|
+
tool_calls?: undefined;
|
|
46
|
+
})[];
|
|
47
|
+
/**
|
|
48
|
+
* Convert tools to OpenAI format
|
|
49
|
+
*/
|
|
50
|
+
export declare function toOpenAITools(tools: Tool[]): {
|
|
51
|
+
type: "function";
|
|
52
|
+
function: {
|
|
53
|
+
name: string;
|
|
54
|
+
description: string;
|
|
55
|
+
parameters: {
|
|
56
|
+
type: "object";
|
|
57
|
+
properties: Record<string, {
|
|
58
|
+
type: string;
|
|
59
|
+
description: string;
|
|
60
|
+
enum?: string[];
|
|
61
|
+
items?: {
|
|
62
|
+
type: string;
|
|
63
|
+
};
|
|
64
|
+
}>;
|
|
65
|
+
required?: string[];
|
|
66
|
+
};
|
|
67
|
+
};
|
|
68
|
+
}[];
|
|
69
|
+
/**
|
|
70
|
+
* Parse tool calls from OpenAI response
|
|
71
|
+
*/
|
|
72
|
+
export declare function parseOpenAIToolCalls(toolCalls: OpenAI.Chat.Completions.ChatCompletionMessageToolCall[] | undefined): ToolCall[];
|
|
73
|
+
/** Input message types for Responses API */
|
|
74
|
+
type ResponsesInputItem = {
|
|
75
|
+
role: 'developer' | 'user' | 'assistant';
|
|
76
|
+
content: string | ResponsesContentPart[];
|
|
77
|
+
} | {
|
|
78
|
+
type: 'function_call';
|
|
79
|
+
call_id: string;
|
|
80
|
+
name: string;
|
|
81
|
+
arguments: string;
|
|
82
|
+
} | {
|
|
83
|
+
type: 'function_call_output';
|
|
84
|
+
call_id: string;
|
|
85
|
+
output: string;
|
|
86
|
+
};
|
|
87
|
+
type ResponsesContentPart = {
|
|
88
|
+
type: 'input_text';
|
|
89
|
+
text: string;
|
|
90
|
+
} | {
|
|
91
|
+
type: 'input_image';
|
|
92
|
+
image_url: {
|
|
93
|
+
url: string;
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
/** Tool definition for Responses API */
|
|
97
|
+
interface ResponsesTool {
|
|
98
|
+
type: 'function';
|
|
99
|
+
name: string;
|
|
100
|
+
description?: string;
|
|
101
|
+
parameters: Record<string, unknown>;
|
|
102
|
+
strict: boolean;
|
|
103
|
+
}
|
|
104
|
+
/**
|
|
105
|
+
* Check if a model requires the Responses API
|
|
106
|
+
*/
|
|
107
|
+
export declare function requiresResponsesAPI(model: string): boolean;
|
|
108
|
+
/**
|
|
109
|
+
* Convert messages to Responses API input format
|
|
110
|
+
*/
|
|
111
|
+
export declare function toResponsesInput(messages: Message[]): ResponsesInputItem[];
|
|
112
|
+
/**
|
|
113
|
+
* Convert tools to Responses API format
|
|
114
|
+
*/
|
|
115
|
+
export declare function toResponsesTools(tools: Tool[]): ResponsesTool[];
|
|
116
|
+
/**
|
|
117
|
+
* Chat with OpenAI
|
|
118
|
+
*/
|
|
119
|
+
export declare function chatOpenAI(messages: Message[], tools: Tool[], model: string, onToken?: StreamCallback): Promise<LLMResponse>;
|
|
120
|
+
export {};
|
|
121
|
+
//# sourceMappingURL=openai.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAM/E;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAkBrH;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE;;;;;;;;;;;;;;;;;;;;;;;UAkC9B,QAAQ,GAAG,MAAM,GAAG,WAAW;;;;KAIpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE;;;;;;;;;;oBAjCvC,CAAH;qBAAuB,CAAC;;;;;;;IA0CxB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,SAAS,GAAG,QAAQ,EAAE,CAmB/H;AAMD,4CAA4C;AAC5C,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAAA;CAAE,GACtF;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3E;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,KAAK,oBAAoB,GACrB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,SAAS,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAExD,wCAAwC;AACxC,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;CACjB;AAqED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAqE1E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,aAAa,EAAE,CAQ/D;AA0JD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,IAAI,EAAE,EACb,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,WAAW,CAAC,CAqItB"}
|