cmdr-agent 2.4.0 → 2.5.1
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/bin/cmdr.js +117 -27
- package/dist/bin/cmdr.js.map +1 -1
- package/dist/package.json +9 -4
- package/dist/src/cli/ink/App.d.ts +2 -2
- package/dist/src/cli/ink/App.d.ts.map +1 -1
- package/dist/src/cli/ink/App.js +118 -65
- package/dist/src/cli/ink/App.js.map +1 -1
- package/dist/src/cli/ink/PromptInput.d.ts +17 -0
- package/dist/src/cli/ink/PromptInput.d.ts.map +1 -0
- package/dist/src/cli/ink/PromptInput.js +202 -0
- package/dist/src/cli/ink/PromptInput.js.map +1 -0
- package/dist/src/cli/ink/StatusBar.d.ts +1 -1
- package/dist/src/cli/ink/StatusBar.d.ts.map +1 -1
- package/dist/src/cli/ink/StatusBar.js +116 -21
- package/dist/src/cli/ink/StatusBar.js.map +1 -1
- package/dist/src/cli/ink/input-buffer.d.ts +34 -0
- package/dist/src/cli/ink/input-buffer.d.ts.map +1 -0
- package/dist/src/cli/ink/input-buffer.js +152 -0
- package/dist/src/cli/ink/input-buffer.js.map +1 -0
- package/dist/src/cli/progress.d.ts +59 -0
- package/dist/src/cli/progress.d.ts.map +1 -0
- package/dist/src/cli/progress.js +172 -0
- package/dist/src/cli/progress.js.map +1 -0
- package/dist/src/cli/renderer.d.ts +14 -3
- package/dist/src/cli/renderer.d.ts.map +1 -1
- package/dist/src/cli/renderer.js +93 -32
- package/dist/src/cli/renderer.js.map +1 -1
- package/dist/src/cli/repl.d.ts.map +1 -1
- package/dist/src/cli/repl.js +46 -28
- package/dist/src/cli/repl.js.map +1 -1
- package/dist/src/cli/spinner.d.ts +4 -1
- package/dist/src/cli/spinner.d.ts.map +1 -1
- package/dist/src/cli/spinner.js +34 -1
- package/dist/src/cli/spinner.js.map +1 -1
- package/dist/src/cli/theme.d.ts +14 -12
- package/dist/src/cli/theme.d.ts.map +1 -1
- package/dist/src/cli/theme.js +192 -123
- package/dist/src/cli/theme.js.map +1 -1
- package/dist/src/cli/themes.d.ts +17 -1
- package/dist/src/cli/themes.d.ts.map +1 -1
- package/dist/src/cli/themes.js +125 -27
- package/dist/src/cli/themes.js.map +1 -1
- package/dist/src/core/agent-runner.d.ts +12 -0
- package/dist/src/core/agent-runner.d.ts.map +1 -1
- package/dist/src/core/agent-runner.js +176 -5
- package/dist/src/core/agent-runner.js.map +1 -1
- package/dist/src/core/event-bus.d.ts +12 -0
- package/dist/src/core/event-bus.d.ts.map +1 -1
- package/dist/src/core/event-bus.js.map +1 -1
- package/dist/src/core/presets.d.ts.map +1 -1
- package/dist/src/core/presets.js +1 -0
- package/dist/src/core/presets.js.map +1 -1
- package/dist/src/core/types.d.ts +17 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/types.js +8 -1
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/llm/anthropic.d.ts +1 -0
- package/dist/src/llm/anthropic.d.ts.map +1 -1
- package/dist/src/llm/anthropic.js +20 -1
- package/dist/src/llm/anthropic.js.map +1 -1
- package/dist/src/llm/ollama.d.ts +2 -12
- package/dist/src/llm/ollama.d.ts.map +1 -1
- package/dist/src/llm/ollama.js +46 -250
- package/dist/src/llm/ollama.js.map +1 -1
- package/dist/src/llm/openai.d.ts +1 -0
- package/dist/src/llm/openai.d.ts.map +1 -1
- package/dist/src/llm/openai.js +21 -7
- package/dist/src/llm/openai.js.map +1 -1
- package/dist/src/llm/repair/retry-policy.d.ts +48 -0
- package/dist/src/llm/repair/retry-policy.d.ts.map +1 -0
- package/dist/src/llm/repair/retry-policy.js +85 -0
- package/dist/src/llm/repair/retry-policy.js.map +1 -0
- package/dist/src/llm/repair/tool-repair.d.ts +39 -0
- package/dist/src/llm/repair/tool-repair.d.ts.map +1 -0
- package/dist/src/llm/repair/tool-repair.js +313 -0
- package/dist/src/llm/repair/tool-repair.js.map +1 -0
- package/dist/src/llm/shared/text-cleanup.d.ts +16 -0
- package/dist/src/llm/shared/text-cleanup.d.ts.map +1 -0
- package/dist/src/llm/shared/text-cleanup.js +120 -0
- package/dist/src/llm/shared/text-cleanup.js.map +1 -0
- package/dist/src/llm/shared/tool-parsing.d.ts +70 -0
- package/dist/src/llm/shared/tool-parsing.d.ts.map +1 -0
- package/dist/src/llm/shared/tool-parsing.js +355 -0
- package/dist/src/llm/shared/tool-parsing.js.map +1 -0
- package/dist/src/llm/validation/tool-call-schema.d.ts +83 -0
- package/dist/src/llm/validation/tool-call-schema.d.ts.map +1 -0
- package/dist/src/llm/validation/tool-call-schema.js +145 -0
- package/dist/src/llm/validation/tool-call-schema.js.map +1 -0
- package/dist/src/tools/built-in/bash.d.ts +5 -1
- package/dist/src/tools/built-in/bash.d.ts.map +1 -1
- package/dist/src/tools/built-in/bash.js +34 -46
- package/dist/src/tools/built-in/bash.js.map +1 -1
- package/dist/src/tools/built-in/index.d.ts +2 -1
- package/dist/src/tools/built-in/index.d.ts.map +1 -1
- package/dist/src/tools/built-in/index.js +3 -1
- package/dist/src/tools/built-in/index.js.map +1 -1
- package/dist/src/tools/built-in/pdf-report.d.ts +39 -0
- package/dist/src/tools/built-in/pdf-report.d.ts.map +1 -0
- package/dist/src/tools/built-in/pdf-report.js +326 -0
- package/dist/src/tools/built-in/pdf-report.js.map +1 -0
- package/dist/src/tools/executor.d.ts +7 -1
- package/dist/src/tools/executor.d.ts.map +1 -1
- package/dist/src/tools/executor.js +20 -5
- package/dist/src/tools/executor.js.map +1 -1
- package/dist/src/tools/shell/shell-executor.d.ts +71 -0
- package/dist/src/tools/shell/shell-executor.d.ts.map +1 -0
- package/dist/src/tools/shell/shell-executor.js +238 -0
- package/dist/src/tools/shell/shell-executor.js.map +1 -0
- package/package.json +9 -4
package/dist/src/core/presets.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../src/core/presets.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,8EAA8E;AAC9E,qBAAqB;AACrB,8EAA8E;AAE9E,MAAM,CAAC,MAAM,UAAU,GAAgB;IACrC,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sGAkDsF;IACpG,KAAK,EAAE;QACL,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW;QAC9C,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO;QAC9C,aAAa,EAAE,cAAc;QAC7B,cAAc,EAAE,aAAa,EAAE,cAAc;
|
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../src/core/presets.ts"],"names":[],"mappings":"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"}
|
package/dist/src/core/types.d.ts
CHANGED
|
@@ -271,10 +271,27 @@ export interface LLMChatOptions {
|
|
|
271
271
|
}
|
|
272
272
|
export interface LLMStreamOptions extends LLMChatOptions {
|
|
273
273
|
}
|
|
274
|
+
/** Model-specific behavior profile for retry/repair decisions. */
|
|
275
|
+
export interface ModelProfile {
|
|
276
|
+
/** Whether to enable retry loop for failed tool calls. */
|
|
277
|
+
readonly retryOnFailure: boolean;
|
|
278
|
+
/** Maximum number of tool call retries. */
|
|
279
|
+
readonly maxToolRetries: number;
|
|
280
|
+
/** Whether to attempt structural repair before retrying. */
|
|
281
|
+
readonly attemptRepair: boolean;
|
|
282
|
+
/** Aggressiveness of correction prompts. */
|
|
283
|
+
readonly correctionStyle: 'gentle' | 'strict';
|
|
284
|
+
/** Use strict tool discipline in prompt. */
|
|
285
|
+
readonly strictToolPrompt: boolean;
|
|
286
|
+
}
|
|
287
|
+
/** Default profile for reliable models (OpenAI, Anthropic). */
|
|
288
|
+
export declare const DEFAULT_MODEL_PROFILE: ModelProfile;
|
|
274
289
|
export interface LLMAdapter {
|
|
275
290
|
readonly name: string;
|
|
276
291
|
chat(messages: LLMMessage[], options: LLMChatOptions): Promise<LLMResponse>;
|
|
277
292
|
stream(messages: LLMMessage[], options: LLMStreamOptions): AsyncIterable<StreamEvent>;
|
|
293
|
+
/** Get model-specific behavior profile for retry/repair decisions. */
|
|
294
|
+
getModelProfile?(model: string): Promise<ModelProfile> | ModelProfile;
|
|
278
295
|
}
|
|
279
296
|
export interface OrchestratorEvent {
|
|
280
297
|
readonly type: 'agent_start' | 'agent_complete' | 'task_start' | 'task_complete' | 'message' | 'error';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"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"}
|
package/dist/src/core/types.js
CHANGED
|
@@ -3,5 +3,12 @@
|
|
|
3
3
|
*
|
|
4
4
|
* All public types are defined here to keep the dependency graph acyclic.
|
|
5
5
|
*/
|
|
6
|
-
|
|
6
|
+
/** Default profile for reliable models (OpenAI, Anthropic). */
|
|
7
|
+
export const DEFAULT_MODEL_PROFILE = {
|
|
8
|
+
retryOnFailure: false,
|
|
9
|
+
maxToolRetries: 0,
|
|
10
|
+
attemptRepair: false,
|
|
11
|
+
correctionStyle: 'gentle',
|
|
12
|
+
strictToolPrompt: false,
|
|
13
|
+
};
|
|
7
14
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAsXH,+DAA+D;AAC/D,MAAM,CAAC,MAAM,qBAAqB,GAAiB;IACjD,cAAc,EAAE,KAAK;IACrB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,KAAK;IACpB,eAAe,EAAE,QAAQ;IACzB,gBAAgB,EAAE,KAAK;CACxB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../../src/llm/anthropic.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EACxD,WAAW,EAAE,WAAW,EAEzB,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../../src/llm/anthropic.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EACxD,WAAW,EAAE,WAAW,EAEzB,MAAM,kBAAkB,CAAA;AA0CzB,qBAAa,gBAAiB,YAAW,UAAU;IACjD,QAAQ,CAAC,IAAI,eAAc;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;gBAEpB,OAAO,EAAE;QACnB,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,CAAC,EAAE,MAAM,CAAA;KACjB;IASK,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;IAmD1E,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC;IAmK5F;;;OAGG;IACH,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,cAAc;IAQtB,eAAe,IAAI,OAAO,kBAAkB,EAAE,YAAY;CAS3D"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* Anthropic's message format uses content blocks (text + tool_use), matching
|
|
6
6
|
* cmdr's internal ContentBlock structure very closely.
|
|
7
7
|
*/
|
|
8
|
+
import { validateToolCallShape } from './validation/tool-call-schema.js';
|
|
8
9
|
export class AnthropicAdapter {
|
|
9
10
|
name = 'anthropic';
|
|
10
11
|
apiKey;
|
|
@@ -253,7 +254,16 @@ export class AnthropicAdapter {
|
|
|
253
254
|
return { type: 'text', text: b.text };
|
|
254
255
|
}
|
|
255
256
|
if (b.type === 'tool_use') {
|
|
256
|
-
|
|
257
|
+
// Validate through canonical schema
|
|
258
|
+
const validation = validateToolCallShape({ name: b.name, arguments: b.input });
|
|
259
|
+
if (validation.ok) {
|
|
260
|
+
return {
|
|
261
|
+
type: 'tool_use',
|
|
262
|
+
id: b.id,
|
|
263
|
+
name: validation.toolCall.name,
|
|
264
|
+
input: validation.toolCall.arguments,
|
|
265
|
+
};
|
|
266
|
+
}
|
|
257
267
|
}
|
|
258
268
|
return { type: 'text', text: '' }; // fallback
|
|
259
269
|
});
|
|
@@ -265,5 +275,14 @@ export class AnthropicAdapter {
|
|
|
265
275
|
input_schema: tool.inputSchema,
|
|
266
276
|
};
|
|
267
277
|
}
|
|
278
|
+
getModelProfile() {
|
|
279
|
+
return {
|
|
280
|
+
retryOnFailure: false,
|
|
281
|
+
maxToolRetries: 0,
|
|
282
|
+
attemptRepair: false,
|
|
283
|
+
correctionStyle: 'gentle',
|
|
284
|
+
strictToolPrompt: false,
|
|
285
|
+
};
|
|
286
|
+
}
|
|
268
287
|
}
|
|
269
288
|
//# sourceMappingURL=anthropic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/llm/anthropic.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/llm/anthropic.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAyCxE,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,WAAW,CAAA;IACV,MAAM,CAAQ;IACd,OAAO,CAAQ;IAEhC,YAAY,OAGX;QACC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,8BAA8B,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACvF,CAAC;IAED,0EAA0E;IAC1E,kBAAkB;IAClB,0EAA0E;IAE1E,KAAK,CAAC,IAAI,CAAC,QAAsB,EAAE,OAAuB;QACxD,MAAM,IAAI,GAA4B;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;YACxC,UAAU,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;YACrC,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnF,CAAA;QAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAA;QACpC,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,WAAW,EAAE;YAClD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,WAAW,EAAE,IAAI,CAAC,MAAM;gBACxB,mBAAmB,EAAE,YAAY;aAClC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1B,MAAM,EAAE,OAAO,CAAC,WAAW;SAC5B,CAAC,CAAA;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YAC7B,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,MAAM,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;QAC/E,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAuB,CAAA;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAE/C,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,OAAO;YACP,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE;gBACL,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACrC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;aACxC;SACF,CAAA;IACH,CAAC;IAED,0EAA0E;IAC1E,oBAAoB;IACpB,0EAA0E;IAE1E,KAAK,CAAC,CAAC,MAAM,CAAC,QAAsB,EAAE,OAAyB;QAC7D,MAAM,IAAI,GAA4B;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;YACxC,UAAU,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;YACrC,MAAM,EAAE,IAAI;YACZ,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnF,CAAA;QAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAA;QACpC,CAAC;QAED,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,IAAI,GAAa,CAAA;QACjB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,WAAW,EAAE;gBAC5C,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,WAAW,EAAE,IAAI,CAAC,MAAM;oBACxB,mBAAmB,EAAE,YAAY;iBAClC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,OAAO,CAAC,WAAW;aAC5B,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAA;YAClF,OAAM;QACR,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;YAC7B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,MAAM,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAA;YACtG,OAAM;QACR,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,CAAA;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC,iCAAiC,CAAC,EAAE,CAAA;YAC3E,OAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;QACjC,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;QACzB,IAAI,UAAU,GAAe,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,CAAA;QAElE,uDAAuD;QACvD,MAAM,UAAU,GAAG,IAAI,GAAG,EAA6D,CAAA;QAEvF,IAAI,CAAC;YACH,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;gBAC3C,IAAI,IAAI;oBAAE,MAAK;gBAEf,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;gBACjD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAChC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAA;gBAE1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;oBAC3B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;wBAAE,SAAQ;oBAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;oBAEhC,IAAI,KAA2B,CAAA;oBAC/B,IAAI,CAAC;wBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAyB,CAAA;oBACrD,CAAC;oBAAC,MAAM,CAAC;wBACP,SAAQ;oBACV,CAAC;oBAED,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;wBACnB,KAAK,eAAe;4BAClB,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gCAClB,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAA;gCAC3B,UAAU,GAAG;oCACX,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,IAAI,CAAC;oCACpD,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,aAAa,IAAI,CAAC;iCACvD,CAAA;4BACH,CAAC;4BACD,MAAK;wBAEP,KAAK,qBAAqB;4BACxB,IAAI,KAAK,CAAC,aAAa,EAAE,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gCAC1E,MAAM,EAAE,GAAG,KAAK,CAAC,aAA+D,CAAA;gCAChF,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAA;4BAC5E,CAAC;4BACD,MAAK;wBAEP,KAAK,qBAAqB;4BACxB,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gCAC3D,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAA;gCAC5B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;4BAChD,CAAC;iCAAM,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,kBAAkB,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;gCAC9F,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gCACjF,IAAI,KAAK,EAAE,CAAC;oCACV,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAA;gCAC/C,CAAC;4BACH,CAAC;4BACD,MAAK;wBAEP,KAAK,oBAAoB;4BACvB,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gCAC9B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gCACzC,IAAI,KAAK,EAAE,CAAC;oCACV,IAAI,IAAI,GAA4B,EAAE,CAAA;oCACtC,IAAI,CAAC;wCAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;oCAAC,CAAC;oCAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;oCAC5D,MAAM,YAAY,GAAiB;wCACjC,IAAI,EAAE,UAAU;wCAChB,EAAE,EAAE,KAAK,CAAC,EAAE;wCACZ,IAAI,EAAE,KAAK,CAAC,IAAI;wCAChB,KAAK,EAAE,IAAI;qCACZ,CAAA;oCACD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,CAAA;gCAChD,CAAC;4BACH,CAAC;4BACD,MAAK;wBAEP,KAAK,eAAe;4BAClB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gCAChB,UAAU,GAAG;oCACX,GAAG,UAAU;oCACb,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,aAAa;iCACzC,CAAA;4BACH,CAAC;4BACD,MAAK;oBACT,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,WAAW,EAAE,CAAA;QACtB,CAAC;QAED,aAAa;QACb,MAAM,OAAO,GAAmB,EAAE,CAAA;QAClC,IAAI,QAAQ;YAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAe,CAAC,CAAA;QACzE,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,IAAI,GAA4B,EAAE,CAAA;YACtC,IAAI,CAAC;gBAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5D,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAkB,CAAC,CAAA;QACjG,CAAC;QAED,MAAM;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE;gBACJ,EAAE,EAAE,aAAa,IAAI,CAAC,GAAG,EAAE,EAAE;gBAC7B,OAAO;gBACP,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU;gBAC1D,KAAK,EAAE,UAAU;aACH;SACjB,CAAA;IACH,CAAC;IAED,0EAA0E;IAC1E,qBAAqB;IACrB,0EAA0E;IAE1E;;;OAGG;IACK,eAAe,CAAC,QAAsB;QAC5C,MAAM,MAAM,GAAuB,EAAE,CAAA;QAErC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,MAAM,GAA4B,EAAE,CAAA;YAE1C,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAG,KAAmB,CAAC,IAAI,EAAE,CAAC,CAAA;gBAChE,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACrC,MAAM,EAAE,GAAG,KAAqB,CAAA;oBAChC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;gBAC9E,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACxC,MAAM,EAAE,GAAG,KAAwB,CAAA;oBACnC,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,aAAa;wBACnB,WAAW,EAAE,EAAE,CAAC,WAAW;wBAC3B,OAAO,EAAE,EAAE,CAAC,OAAO;wBACnB,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC3C,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;YAClD,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,YAAY,CAAC,MAA+B;QAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACpB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACtB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAe,CAAA;YACpD,CAAC;YACD,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC1B,oCAAoC;gBACpC,MAAM,UAAU,GAAG,qBAAqB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;gBAC9E,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;oBAClB,OAAO;wBACL,IAAI,EAAE,UAAU;wBAChB,EAAE,EAAE,CAAC,CAAC,EAAE;wBACR,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC,IAAI;wBAC9B,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,SAAS;qBACrB,CAAA;gBACnB,CAAC;YACH,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAe,CAAA,CAAE,WAAW;QAC7D,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,cAAc,CAAC,IAAgB;QACrC,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,YAAY,EAAE,IAAI,CAAC,WAAW;SAC/B,CAAA;IACH,CAAC;IAED,eAAe;QACb,OAAO;YACL,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,KAAK;YACpB,eAAe,EAAE,QAAQ;YACzB,gBAAgB,EAAE,KAAK;SACxB,CAAA;IACH,CAAC;CACF"}
|
package/dist/src/llm/ollama.d.ts
CHANGED
|
@@ -18,21 +18,11 @@ export declare class OllamaAdapter implements LLMAdapter {
|
|
|
18
18
|
getModelFamily(model: string): Promise<string>;
|
|
19
19
|
/** Check if a specific model supports native tool calling. */
|
|
20
20
|
supportsTools(model: string): Promise<boolean>;
|
|
21
|
+
/** Get model-specific behavior profile for retry/repair decisions. */
|
|
22
|
+
getModelProfile(model: string): Promise<import('../core/types.js').ModelProfile>;
|
|
21
23
|
chat(messages: LLMMessage[], options: LLMChatOptions): Promise<LLMResponse>;
|
|
22
24
|
stream(messages: LLMMessage[], options: LLMStreamOptions): AsyncIterable<StreamEvent>;
|
|
23
25
|
private convertMessages;
|
|
24
26
|
private convertToolDef;
|
|
25
|
-
private buildToolPromptSuffix;
|
|
26
|
-
/**
|
|
27
|
-
* Three-stage tool resolution waterfall.
|
|
28
|
-
* Runs for ALL models regardless of native tool support.
|
|
29
|
-
*/
|
|
30
|
-
private resolveToolCalls;
|
|
31
|
-
private parsePromptBasedToolCalls;
|
|
32
|
-
/**
|
|
33
|
-
* Parse multiple JSON objects from a block that may contain one object per line,
|
|
34
|
-
* or a JSON array, or comma-separated objects.
|
|
35
|
-
*/
|
|
36
|
-
private parseMultipleJsonObjects;
|
|
37
27
|
}
|
|
38
28
|
//# sourceMappingURL=ollama.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/llm/ollama.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EACxD,WAAW,EAAE,WAAW,EAEzB,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/llm/ollama.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EACxD,WAAW,EAAE,WAAW,EAEzB,MAAM,kBAAkB,CAAA;AAmGzB,qBAAa,aAAc,YAAW,UAAU;IAC9C,QAAQ,CAAC,IAAI,YAAW;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,WAAW,CAA4B;gBAEnC,OAAO,SAA2B;IAI9C,gDAAgD;IAC1C,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC,6BAA6B;IACvB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAOrC,6DAA6D;IACvD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BpD,8DAA8D;IACxD,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKpD,sEAAsE;IAChE,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,kBAAkB,EAAE,YAAY,CAAC;IAgBhF,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;IA0F1E,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,aAAa,CAAC,WAAW,CAAC;IAwK5F,OAAO,CAAC,eAAe;IAqEvB,OAAO,CAAC,cAAc;CAYvB"}
|
package/dist/src/llm/ollama.js
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
* Falls back to prompt-based tool injection for models without tool support.
|
|
6
6
|
*/
|
|
7
7
|
import { getDefaultContextLength } from './model-registry.js';
|
|
8
|
+
import { resolveToolCalls, buildToolPromptSuffix } from './shared/tool-parsing.js';
|
|
9
|
+
import { detectToolCallLeakage } from './validation/tool-call-schema.js';
|
|
8
10
|
const MODEL_FAMILY_CONFIGS = {
|
|
9
11
|
qwen2: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: true, jsonToolFormat: true },
|
|
10
12
|
'qwen2.5': { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: true, jsonToolFormat: true },
|
|
@@ -18,16 +20,17 @@ const MODEL_FAMILY_CONFIGS = {
|
|
|
18
20
|
mistral: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
19
21
|
'mistral-nemo': { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
20
22
|
'command-r': { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
21
|
-
minimax: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
23
|
+
minimax: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true, retryOnFailure: true, maxToolRetries: 2, strictToolPrompt: true, correctionStyle: 'strict' },
|
|
22
24
|
deepseek: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
23
|
-
dolphin: { supportsNativeTools: false, needsPromptInjection: true, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
25
|
+
dolphin: { supportsNativeTools: false, needsPromptInjection: true, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true, retryOnFailure: true, maxToolRetries: 1, correctionStyle: 'gentle' },
|
|
24
26
|
phi: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
25
27
|
gemma: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
26
28
|
granite: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
27
29
|
nemotron: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
28
30
|
hermes3: { supportsNativeTools: true, needsPromptInjection: false, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true },
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
kimi: { supportsNativeTools: false, needsPromptInjection: true, thinkingMode: 'auto', xmlToolFormat: true, jsonToolFormat: true, retryOnFailure: true, maxToolRetries: 2, strictToolPrompt: true, correctionStyle: 'strict' },
|
|
32
|
+
yi: { supportsNativeTools: false, needsPromptInjection: true, thinkingMode: 'auto', xmlToolFormat: false, jsonToolFormat: true, retryOnFailure: true, maxToolRetries: 1, correctionStyle: 'gentle' },
|
|
33
|
+
default: { supportsNativeTools: false, needsPromptInjection: true, thinkingMode: 'auto', xmlToolFormat: true, jsonToolFormat: true, retryOnFailure: true, maxToolRetries: 1, correctionStyle: 'gentle' },
|
|
31
34
|
};
|
|
32
35
|
/** Resolve the family config for a detected model family string. */
|
|
33
36
|
function getFamilyConfig(family) {
|
|
@@ -103,6 +106,18 @@ export class OllamaAdapter {
|
|
|
103
106
|
const family = await this.getModelFamily(model);
|
|
104
107
|
return getFamilyConfig(family).supportsNativeTools;
|
|
105
108
|
}
|
|
109
|
+
/** Get model-specific behavior profile for retry/repair decisions. */
|
|
110
|
+
async getModelProfile(model) {
|
|
111
|
+
const family = await this.getModelFamily(model);
|
|
112
|
+
const config = getFamilyConfig(family);
|
|
113
|
+
return {
|
|
114
|
+
retryOnFailure: config.retryOnFailure ?? false,
|
|
115
|
+
maxToolRetries: config.maxToolRetries ?? 0,
|
|
116
|
+
attemptRepair: config.retryOnFailure ?? false,
|
|
117
|
+
correctionStyle: config.correctionStyle ?? 'gentle',
|
|
118
|
+
strictToolPrompt: config.strictToolPrompt ?? false,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
106
121
|
// -----------------------------------------------------------------------
|
|
107
122
|
// LLMAdapter.chat
|
|
108
123
|
// -----------------------------------------------------------------------
|
|
@@ -115,7 +130,7 @@ export class OllamaAdapter {
|
|
|
115
130
|
const contextLength = getDefaultContextLength(options.model);
|
|
116
131
|
const body = {
|
|
117
132
|
model: options.model,
|
|
118
|
-
messages: this.convertMessages(messages, options.systemPrompt, needsInjection ? options.tools : undefined),
|
|
133
|
+
messages: this.convertMessages(messages, options.systemPrompt, needsInjection ? options.tools : undefined, { strict: config.strictToolPrompt }),
|
|
119
134
|
stream: false,
|
|
120
135
|
options: {
|
|
121
136
|
num_ctx: contextLength,
|
|
@@ -157,7 +172,13 @@ export class OllamaAdapter {
|
|
|
157
172
|
// Strip thinking channel markers from content
|
|
158
173
|
const rawContent = stripThinkingMarkers(data.message.content || '');
|
|
159
174
|
// Three-stage tool resolution waterfall (runs for ALL models)
|
|
160
|
-
|
|
175
|
+
// Uses unified parser from shared/tool-parsing.ts
|
|
176
|
+
const nativeToolCalls = data.message.tool_calls ?? null;
|
|
177
|
+
const parseConfig = {
|
|
178
|
+
jsonToolFormat: config.jsonToolFormat,
|
|
179
|
+
xmlToolFormat: config.xmlToolFormat,
|
|
180
|
+
};
|
|
181
|
+
const content = resolveToolCalls(nativeToolCalls, rawContent, parseConfig, hasTools ?? false);
|
|
161
182
|
const usage = {
|
|
162
183
|
input_tokens: data.prompt_eval_count ?? 0,
|
|
163
184
|
output_tokens: data.eval_count ?? 0,
|
|
@@ -183,7 +204,7 @@ export class OllamaAdapter {
|
|
|
183
204
|
const contextLength = getDefaultContextLength(options.model);
|
|
184
205
|
const body = {
|
|
185
206
|
model: options.model,
|
|
186
|
-
messages: this.convertMessages(messages, options.systemPrompt, needsInjection ? options.tools : undefined),
|
|
207
|
+
messages: this.convertMessages(messages, options.systemPrompt, needsInjection ? options.tools : undefined, { strict: config.strictToolPrompt }),
|
|
187
208
|
stream: true,
|
|
188
209
|
options: {
|
|
189
210
|
num_ctx: contextLength,
|
|
@@ -287,14 +308,29 @@ export class OllamaAdapter {
|
|
|
287
308
|
reader.releaseLock();
|
|
288
309
|
}
|
|
289
310
|
// Fallback: three-stage waterfall for text-based tool calls if no native calls were emitted
|
|
311
|
+
// Uses unified parser from shared/tool-parsing.ts
|
|
290
312
|
if (hasTools && fullText && !nativeToolCallsEmitted) {
|
|
291
|
-
const
|
|
313
|
+
const parseConfig = {
|
|
314
|
+
jsonToolFormat: config.jsonToolFormat,
|
|
315
|
+
xmlToolFormat: config.xmlToolFormat,
|
|
316
|
+
};
|
|
317
|
+
const resolved = resolveToolCalls(null, fullText, parseConfig, true);
|
|
292
318
|
const toolBlocks = resolved.filter(b => b.type === 'tool_use');
|
|
293
319
|
if (toolBlocks.length > 0) {
|
|
294
320
|
for (const block of toolBlocks) {
|
|
295
321
|
yield { type: 'tool_use', data: block };
|
|
296
322
|
}
|
|
297
323
|
}
|
|
324
|
+
// Leakage detection: if no tool_use blocks extracted but text smells like
|
|
325
|
+
// leaked tool call format, yield a leakage event so agent-runner can retry
|
|
326
|
+
if (toolBlocks.length === 0 && detectToolCallLeakage(fullText)) {
|
|
327
|
+
yield { type: 'tool_use', data: {
|
|
328
|
+
type: 'tool_use',
|
|
329
|
+
id: `leakage_${Date.now()}`,
|
|
330
|
+
name: '__tool_call_leakage__',
|
|
331
|
+
input: { rawText: fullText },
|
|
332
|
+
} };
|
|
333
|
+
}
|
|
298
334
|
}
|
|
299
335
|
const finalContent = fullText
|
|
300
336
|
? [{ type: 'text', text: fullText }]
|
|
@@ -311,12 +347,12 @@ export class OllamaAdapter {
|
|
|
311
347
|
// -----------------------------------------------------------------------
|
|
312
348
|
// Private helpers
|
|
313
349
|
// -----------------------------------------------------------------------
|
|
314
|
-
convertMessages(messages, systemPrompt, fallbackTools) {
|
|
350
|
+
convertMessages(messages, systemPrompt, fallbackTools, options) {
|
|
315
351
|
const result = [];
|
|
316
352
|
// System prompt
|
|
317
353
|
let sysContent = systemPrompt || '';
|
|
318
354
|
if (fallbackTools && fallbackTools.length > 0) {
|
|
319
|
-
sysContent +=
|
|
355
|
+
sysContent += buildToolPromptSuffix(fallbackTools, { strict: options?.strict });
|
|
320
356
|
}
|
|
321
357
|
if (sysContent) {
|
|
322
358
|
result.push({ role: 'system', content: sysContent });
|
|
@@ -380,245 +416,5 @@ export class OllamaAdapter {
|
|
|
380
416
|
},
|
|
381
417
|
};
|
|
382
418
|
}
|
|
383
|
-
buildToolPromptSuffix(tools) {
|
|
384
|
-
const toolDescs = tools.map(t => `- ${t.name}: ${t.description}\n Input: ${JSON.stringify(t.inputSchema)}`).join('\n');
|
|
385
|
-
return `\n\nYou have access to the following tools. To use a tool, respond with a JSON block:
|
|
386
|
-
|
|
387
|
-
\`\`\`tool_call
|
|
388
|
-
{"name": "tool_name", "arguments": {"arg1": "value1"}}
|
|
389
|
-
\`\`\`
|
|
390
|
-
|
|
391
|
-
To call MULTIPLE tools, use one JSON object per line inside a single \`\`\`tool_call block:
|
|
392
|
-
|
|
393
|
-
\`\`\`tool_call
|
|
394
|
-
{"name": "tool1", "arguments": {"arg": "val"}}
|
|
395
|
-
{"name": "tool2", "arguments": {"arg": "val"}}
|
|
396
|
-
\`\`\`
|
|
397
|
-
|
|
398
|
-
Available tools:
|
|
399
|
-
${toolDescs}
|
|
400
|
-
|
|
401
|
-
IMPORTANT: Use ONLY the \`\`\`tool_call JSON format shown above. Do NOT use XML, <invoke>, <function>, or any other format for tool calls.
|
|
402
|
-
Always use tools when you need to interact with the filesystem or run commands.
|
|
403
|
-
After receiving a tool result, continue your analysis.`;
|
|
404
|
-
}
|
|
405
|
-
/**
|
|
406
|
-
* Three-stage tool resolution waterfall.
|
|
407
|
-
* Runs for ALL models regardless of native tool support.
|
|
408
|
-
*/
|
|
409
|
-
resolveToolCalls(nativeToolCalls, textContent, config, hasTools) {
|
|
410
|
-
// Stage 1: Native tool_calls from Ollama response
|
|
411
|
-
if (nativeToolCalls && nativeToolCalls.length > 0) {
|
|
412
|
-
const content = [];
|
|
413
|
-
if (textContent) {
|
|
414
|
-
content.push({ type: 'text', text: textContent });
|
|
415
|
-
}
|
|
416
|
-
for (const tc of nativeToolCalls) {
|
|
417
|
-
content.push({
|
|
418
|
-
type: 'tool_use',
|
|
419
|
-
id: `tool_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
|
|
420
|
-
name: tc.function.name,
|
|
421
|
-
input: tc.function.arguments,
|
|
422
|
-
});
|
|
423
|
-
}
|
|
424
|
-
return content;
|
|
425
|
-
}
|
|
426
|
-
// Stage 2+3: Parse text-based tool calls only if we had tools available
|
|
427
|
-
if (hasTools && textContent) {
|
|
428
|
-
const parsed = this.parsePromptBasedToolCalls(textContent, config);
|
|
429
|
-
if (parsed.length > 0)
|
|
430
|
-
return parsed;
|
|
431
|
-
}
|
|
432
|
-
// No tool calls — return as pure text
|
|
433
|
-
if (textContent) {
|
|
434
|
-
return [{ type: 'text', text: textContent }];
|
|
435
|
-
}
|
|
436
|
-
return [];
|
|
437
|
-
}
|
|
438
|
-
parsePromptBasedToolCalls(text, config) {
|
|
439
|
-
const content = [];
|
|
440
|
-
const checkJson = config?.jsonToolFormat !== false; // default true
|
|
441
|
-
const checkXml = config?.xmlToolFormat !== false; // default true
|
|
442
|
-
// Strategy 1: ```tool_call\n{JSON}\n``` format (supports multiple JSON objects per block)
|
|
443
|
-
if (checkJson) {
|
|
444
|
-
const toolCallRegex = /```tool_call\s*\n([\s\S]*?)\n```/g;
|
|
445
|
-
let lastIndex = 0;
|
|
446
|
-
let match;
|
|
447
|
-
let foundToolCalls = false;
|
|
448
|
-
while ((match = toolCallRegex.exec(text)) !== null) {
|
|
449
|
-
foundToolCalls = true;
|
|
450
|
-
if (match.index > lastIndex) {
|
|
451
|
-
const before = text.slice(lastIndex, match.index).trim();
|
|
452
|
-
if (before)
|
|
453
|
-
content.push({ type: 'text', text: before });
|
|
454
|
-
}
|
|
455
|
-
const blockContent = match[1].trim();
|
|
456
|
-
const parsedObjects = this.parseMultipleJsonObjects(blockContent);
|
|
457
|
-
if (parsedObjects.length > 0) {
|
|
458
|
-
for (const parsed of parsedObjects) {
|
|
459
|
-
if (parsed.name && parsed.arguments) {
|
|
460
|
-
content.push({
|
|
461
|
-
type: 'tool_use',
|
|
462
|
-
id: `tool_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
|
|
463
|
-
name: parsed.name,
|
|
464
|
-
input: parsed.arguments,
|
|
465
|
-
});
|
|
466
|
-
}
|
|
467
|
-
}
|
|
468
|
-
}
|
|
469
|
-
else {
|
|
470
|
-
content.push({ type: 'text', text: match[0] });
|
|
471
|
-
}
|
|
472
|
-
lastIndex = match.index + match[0].length;
|
|
473
|
-
}
|
|
474
|
-
if (foundToolCalls) {
|
|
475
|
-
if (lastIndex < text.length) {
|
|
476
|
-
const remainder = text.slice(lastIndex).trim();
|
|
477
|
-
if (remainder)
|
|
478
|
-
content.push({ type: 'text', text: remainder });
|
|
479
|
-
}
|
|
480
|
-
return content;
|
|
481
|
-
}
|
|
482
|
-
}
|
|
483
|
-
// Strategy 2: XML <function=name><parameter=key>value</parameter></function> format
|
|
484
|
-
if (checkXml) {
|
|
485
|
-
const xmlToolRegex = /<function=(\w+)>([\s\S]*?)<\/function>/g;
|
|
486
|
-
const paramRegex = /<parameter=(\w+)>([\s\S]*?)<\/parameter>/g;
|
|
487
|
-
let lastIndex = 0;
|
|
488
|
-
let match;
|
|
489
|
-
let foundToolCalls = false;
|
|
490
|
-
while ((match = xmlToolRegex.exec(text)) !== null) {
|
|
491
|
-
foundToolCalls = true;
|
|
492
|
-
if (match.index > lastIndex) {
|
|
493
|
-
const before = text.slice(lastIndex, match.index).trim();
|
|
494
|
-
if (before)
|
|
495
|
-
content.push({ type: 'text', text: before });
|
|
496
|
-
}
|
|
497
|
-
const toolName = match[1];
|
|
498
|
-
const paramsBlock = match[2];
|
|
499
|
-
const input = {};
|
|
500
|
-
let paramMatch;
|
|
501
|
-
while ((paramMatch = paramRegex.exec(paramsBlock)) !== null) {
|
|
502
|
-
input[paramMatch[1]] = paramMatch[2].trim();
|
|
503
|
-
}
|
|
504
|
-
paramRegex.lastIndex = 0; // Reset for next tool call
|
|
505
|
-
content.push({
|
|
506
|
-
type: 'tool_use',
|
|
507
|
-
id: `tool_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
|
|
508
|
-
name: toolName,
|
|
509
|
-
input,
|
|
510
|
-
});
|
|
511
|
-
lastIndex = match.index + match[0].length;
|
|
512
|
-
}
|
|
513
|
-
if (foundToolCalls) {
|
|
514
|
-
if (lastIndex < text.length) {
|
|
515
|
-
const remainder = text.slice(lastIndex).trim();
|
|
516
|
-
if (remainder)
|
|
517
|
-
content.push({ type: 'text', text: remainder });
|
|
518
|
-
}
|
|
519
|
-
return content;
|
|
520
|
-
}
|
|
521
|
-
}
|
|
522
|
-
// Strategy 3: <invoke name="..."><parameter name="...">value</parameter></invoke> format
|
|
523
|
-
// Handles minimax <minimax:tool_call> and similar XML tool-call dialects
|
|
524
|
-
const invokeRegex = /<invoke\s+name="([^"]+)">((?:.|\n)*?)<\/invoke>/g;
|
|
525
|
-
const invokeParamRegex = /<parameter\s+name="([^"]+)">((?:.|\n)*?)<\/parameter>/g;
|
|
526
|
-
let invokeLastIndex = 0;
|
|
527
|
-
let invokeMatch;
|
|
528
|
-
let invokeFoundToolCalls = false;
|
|
529
|
-
while ((invokeMatch = invokeRegex.exec(text)) !== null) {
|
|
530
|
-
invokeFoundToolCalls = true;
|
|
531
|
-
if (invokeMatch.index > invokeLastIndex) {
|
|
532
|
-
const before = text.slice(invokeLastIndex, invokeMatch.index).trim();
|
|
533
|
-
// Skip wrapper tags like <minimax:tool_call>
|
|
534
|
-
const cleaned = before.replace(/<\/?[\w:]+>/g, '').trim();
|
|
535
|
-
if (cleaned)
|
|
536
|
-
content.push({ type: 'text', text: cleaned });
|
|
537
|
-
}
|
|
538
|
-
const toolName = invokeMatch[1];
|
|
539
|
-
const paramsBlock = invokeMatch[2];
|
|
540
|
-
const input = {};
|
|
541
|
-
let paramMatch;
|
|
542
|
-
while ((paramMatch = invokeParamRegex.exec(paramsBlock)) !== null) {
|
|
543
|
-
input[paramMatch[1]] = paramMatch[2].trim();
|
|
544
|
-
}
|
|
545
|
-
invokeParamRegex.lastIndex = 0;
|
|
546
|
-
content.push({
|
|
547
|
-
type: 'tool_use',
|
|
548
|
-
id: `tool_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
|
|
549
|
-
name: toolName,
|
|
550
|
-
input,
|
|
551
|
-
});
|
|
552
|
-
invokeLastIndex = invokeMatch.index + invokeMatch[0].length;
|
|
553
|
-
}
|
|
554
|
-
if (invokeFoundToolCalls) {
|
|
555
|
-
if (invokeLastIndex < text.length) {
|
|
556
|
-
// Strip closing wrapper tags
|
|
557
|
-
const remainder = text.slice(invokeLastIndex).replace(/<\/?[\w:]+>/g, '').trim();
|
|
558
|
-
if (remainder)
|
|
559
|
-
content.push({ type: 'text', text: remainder });
|
|
560
|
-
}
|
|
561
|
-
return content;
|
|
562
|
-
}
|
|
563
|
-
// No tool calls found — return as pure text
|
|
564
|
-
if (text) {
|
|
565
|
-
content.push({ type: 'text', text });
|
|
566
|
-
}
|
|
567
|
-
return content;
|
|
568
|
-
}
|
|
569
|
-
/**
|
|
570
|
-
* Parse multiple JSON objects from a block that may contain one object per line,
|
|
571
|
-
* or a JSON array, or comma-separated objects.
|
|
572
|
-
*/
|
|
573
|
-
parseMultipleJsonObjects(block) {
|
|
574
|
-
const results = [];
|
|
575
|
-
// Try 1: Single JSON object
|
|
576
|
-
try {
|
|
577
|
-
const parsed = JSON.parse(block);
|
|
578
|
-
if (parsed.name && parsed.arguments) {
|
|
579
|
-
results.push(parsed);
|
|
580
|
-
return results;
|
|
581
|
-
}
|
|
582
|
-
// Could be an array
|
|
583
|
-
if (Array.isArray(parsed)) {
|
|
584
|
-
for (const item of parsed) {
|
|
585
|
-
if (item.name && item.arguments)
|
|
586
|
-
results.push(item);
|
|
587
|
-
}
|
|
588
|
-
if (results.length > 0)
|
|
589
|
-
return results;
|
|
590
|
-
}
|
|
591
|
-
}
|
|
592
|
-
catch {
|
|
593
|
-
// Not valid single JSON — try multi-line
|
|
594
|
-
}
|
|
595
|
-
// Try 2: One JSON object per line
|
|
596
|
-
const lines = block.split('\n');
|
|
597
|
-
for (const line of lines) {
|
|
598
|
-
const trimmed = line.trim();
|
|
599
|
-
if (!trimmed || !trimmed.startsWith('{'))
|
|
600
|
-
continue;
|
|
601
|
-
try {
|
|
602
|
-
const parsed = JSON.parse(trimmed);
|
|
603
|
-
if (parsed.name && parsed.arguments) {
|
|
604
|
-
results.push(parsed);
|
|
605
|
-
}
|
|
606
|
-
}
|
|
607
|
-
catch {
|
|
608
|
-
// Try stripping trailing comma
|
|
609
|
-
const noComma = trimmed.replace(/,\s*$/, '');
|
|
610
|
-
try {
|
|
611
|
-
const parsed = JSON.parse(noComma);
|
|
612
|
-
if (parsed.name && parsed.arguments) {
|
|
613
|
-
results.push(parsed);
|
|
614
|
-
}
|
|
615
|
-
}
|
|
616
|
-
catch {
|
|
617
|
-
// Skip unparseable line
|
|
618
|
-
}
|
|
619
|
-
}
|
|
620
|
-
}
|
|
621
|
-
return results;
|
|
622
|
-
}
|
|
623
419
|
}
|
|
624
420
|
//# sourceMappingURL=ollama.js.map
|