@openrouter/agent 0.11.0 → 1.0.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/README.md +26 -7
- package/esm/index.d.ts +3 -1
- package/esm/index.d.ts.map +1 -1
- package/esm/index.js.map +1 -1
- package/esm/lib/anthropic-compat.d.ts +4 -1
- package/esm/lib/anthropic-compat.d.ts.map +1 -1
- package/esm/lib/anthropic-compat.js +11 -10
- package/esm/lib/anthropic-compat.js.map +1 -1
- package/esm/lib/chat-compat.d.ts +4 -1
- package/esm/lib/chat-compat.d.ts.map +1 -1
- package/esm/lib/chat-compat.js +53 -18
- package/esm/lib/chat-compat.js.map +1 -1
- package/esm/lib/chat-compat.test.js +205 -0
- package/esm/lib/chat-compat.test.js.map +1 -1
- package/esm/lib/item-types.d.ts +16 -1
- package/esm/lib/item-types.d.ts.map +1 -1
- package/esm/lib/model-result.d.ts +2 -0
- package/esm/lib/model-result.d.ts.map +1 -1
- package/esm/lib/model-result.js +18 -21
- package/esm/lib/model-result.js.map +1 -1
- package/esm/lib/stream-transformers.d.ts +12 -1
- package/esm/lib/stream-transformers.d.ts.map +1 -1
- package/esm/lib/stream-transformers.js +31 -1
- package/esm/lib/stream-transformers.js.map +1 -1
- package/esm/lib/tool-executor.d.ts.map +1 -1
- package/esm/lib/tool-executor.js +4 -5
- package/esm/lib/tool-executor.js.map +1 -1
- package/esm/lib/tool-orchestrator.d.ts +0 -1
- package/esm/lib/tool-orchestrator.d.ts.map +1 -1
- package/esm/lib/tool-orchestrator.js +1 -4
- package/esm/lib/tool-orchestrator.js.map +1 -1
- package/esm/lib/tool-types.d.ts +10 -0
- package/esm/lib/tool-types.d.ts.map +1 -1
- package/esm/lib/tool-types.js.map +1 -1
- package/esm/lib/tool.d.ts +10 -2
- package/esm/lib/tool.d.ts.map +1 -1
- package/esm/lib/tool.js +3 -0
- package/esm/lib/tool.js.map +1 -1
- package/esm/lib/user-agent.d.ts +3 -0
- package/esm/lib/user-agent.d.ts.map +1 -0
- package/esm/lib/user-agent.js +5 -0
- package/esm/lib/user-agent.js.map +1 -0
- package/esm/mcp/create-mcp-tools.d.ts +3 -2
- package/esm/mcp/create-mcp-tools.d.ts.map +1 -1
- package/esm/mcp/create-mcp-tools.js +11 -3
- package/esm/mcp/create-mcp-tools.js.map +1 -1
- package/esm/mcp/handle.d.ts +8 -0
- package/esm/mcp/handle.d.ts.map +1 -1
- package/esm/mcp/handle.js +14 -0
- package/esm/mcp/handle.js.map +1 -1
- package/esm/mcp/rehydrate.d.ts.map +1 -1
- package/esm/mcp/rehydrate.js +9 -1
- package/esm/mcp/rehydrate.js.map +1 -1
- package/esm/mcp/types.d.ts +8 -1
- package/esm/mcp/types.d.ts.map +1 -1
- package/esm/mcp/version.d.ts +1 -1
- package/esm/mcp/version.d.ts.map +1 -1
- package/esm/mcp/version.js +1 -1
- package/esm/mcp/version.js.map +1 -1
- package/esm/openrouter.d.ts.map +1 -1
- package/esm/openrouter.js +10 -5
- package/esm/openrouter.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"item-types.d.ts","sourceRoot":"","sources":["../../src/lib/item-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,6BAA6B,EAC7B,aAAa,EACb,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElE;;;;GAIG;AACH,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAE1D,kDAAkD;AAClD,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC;AAEjD,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,sEAAsE;AACtE,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG;IACzD,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,yEAAyE;AACzE,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG;IAC5D,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GAAG;IACvD,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAEhD,gDAAgD;AAChD,MAAM,MAAM,kBAAkB,GAAG,wBAAwB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,+CAA+C;AAC/C,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAExD,sDAAsD;AACtD,MAAM,MAAM,uBAAuB,GAAG,6BAA6B,CAAC;AAEpE;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC;AAEnC;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GACZ,oBAAoB,GACpB,eAAe,GACf,iBAAiB,GACjB,oBAAoB,GACpB,uBAAuB,GACvB,kBAAkB,GAClB,oBAAoB,GACpB,aAAa,GACb,kBAAkB,GAClB,kBAAkB,GAClB,oBAAoB,GACpB,iBAAiB,GACjB,uBAAuB,GACvB,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"item-types.d.ts","sourceRoot":"","sources":["../../src/lib/item-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,6BAA6B,EAC7B,aAAa,EACb,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAElE;;;;GAIG;AACH,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAE1D,kDAAkD;AAClD,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAAC;AAEjD,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,sEAAsE;AACtE,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG;IACzD,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG;IACpD,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GAAG;IACvD,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,yEAAyE;AACzE,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG;IAC5D,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,qDAAqD;AACrD,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,GAAG;IACvD,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAEhD,gDAAgD;AAChD,MAAM,MAAM,kBAAkB,GAAG,wBAAwB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AAE9D,+CAA+C;AAC/C,MAAM,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAExD,sDAAsD;AACtD,MAAM,MAAM,uBAAuB,GAAG,6BAA6B,CAAC;AAEpE;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC;AAEnC;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GACZ,oBAAoB,GACpB,eAAe,GACf,iBAAiB,GACjB,oBAAoB,GACpB,uBAAuB,GACvB,kBAAkB,GAClB,oBAAoB,GACpB,uBAAuB,GACvB,oBAAoB,GACpB,aAAa,GACb,kBAAkB,GAClB,kBAAkB,GAClB,oBAAoB,GACpB,iBAAiB,GACjB,uBAAuB,GACvB,SAAS,CAAC"}
|
|
@@ -671,6 +671,8 @@ export declare class ModelResult<TTools extends readonly Tool[], TShared extends
|
|
|
671
671
|
* @param toolCalls - The tool calls to check
|
|
672
672
|
* @param currentRound - The current execution round (1-indexed)
|
|
673
673
|
* @param currentResponse - The current response to save if pausing
|
|
674
|
+
* @param skipAutoExecution - When true, auto-approved calls are not executed;
|
|
675
|
+
* they are saved as skipped results so the paused turn stays well-formed
|
|
674
676
|
* @returns True if execution should pause for approval, false to continue
|
|
675
677
|
* @throws Error if approval is required but no state accessor is configured
|
|
676
678
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-result.d.ts","sourceRoot":"","sources":["../../src/lib/model-result.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"model-result.d.ts","sourceRoot":"","sources":["../../src/lib/model-result.ts"],"names":[],"mappings":"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"}
|
package/esm/lib/model-result.js
CHANGED
|
@@ -601,16 +601,13 @@ export class ModelResult {
|
|
|
601
601
|
* Push a tool result event to both the legacy tool event broadcaster
|
|
602
602
|
* and the unified turn broadcaster.
|
|
603
603
|
*/
|
|
604
|
-
broadcastToolResult(toolCallId, toolName, source, result
|
|
604
|
+
broadcastToolResult(toolCallId, toolName, source, result) {
|
|
605
605
|
this.toolEventBroadcaster?.push({
|
|
606
606
|
type: 'tool_result',
|
|
607
607
|
toolCallId,
|
|
608
608
|
toolName,
|
|
609
609
|
source,
|
|
610
610
|
result,
|
|
611
|
-
...(preliminaryResults?.length && {
|
|
612
|
-
preliminaryResults,
|
|
613
|
-
}),
|
|
614
611
|
});
|
|
615
612
|
this.turnBroadcaster?.push({
|
|
616
613
|
type: 'tool.result',
|
|
@@ -619,9 +616,6 @@ export class ModelResult {
|
|
|
619
616
|
source,
|
|
620
617
|
result,
|
|
621
618
|
timestamp: Date.now(),
|
|
622
|
-
...(preliminaryResults?.length && {
|
|
623
|
-
preliminaryResults,
|
|
624
|
-
}),
|
|
625
619
|
});
|
|
626
620
|
}
|
|
627
621
|
/**
|
|
@@ -2396,10 +2390,12 @@ export class ModelResult {
|
|
|
2396
2390
|
* @param toolCalls - The tool calls to check
|
|
2397
2391
|
* @param currentRound - The current execution round (1-indexed)
|
|
2398
2392
|
* @param currentResponse - The current response to save if pausing
|
|
2393
|
+
* @param skipAutoExecution - When true, auto-approved calls are not executed;
|
|
2394
|
+
* they are saved as skipped results so the paused turn stays well-formed
|
|
2399
2395
|
* @returns True if execution should pause for approval, false to continue
|
|
2400
2396
|
* @throws Error if approval is required but no state accessor is configured
|
|
2401
2397
|
*/
|
|
2402
|
-
async handleApprovalCheck(suppliedToolCalls, currentRound, currentResponse) {
|
|
2398
|
+
async handleApprovalCheck(suppliedToolCalls, currentRound, currentResponse, skipAutoExecution = false) {
|
|
2403
2399
|
if (!this.options.tools) {
|
|
2404
2400
|
return false;
|
|
2405
2401
|
}
|
|
@@ -2438,7 +2434,9 @@ export class ModelResult {
|
|
|
2438
2434
|
...initialSurvivors.filter((call) => !pendingIds.has(call.id)),
|
|
2439
2435
|
...blockedCalls,
|
|
2440
2436
|
];
|
|
2441
|
-
const unsentResults =
|
|
2437
|
+
const unsentResults = skipAutoExecution
|
|
2438
|
+
? executableNow.map((call) => createRejectedResult(call.id, String(call.name), 'Tool execution skipped: stop condition met'))
|
|
2439
|
+
: await this.executeAutoApproveTools(executableNow, turnContext);
|
|
2442
2440
|
// Combine pre-denied results (from hook "deny") with executed results.
|
|
2443
2441
|
const combinedResults = [
|
|
2444
2442
|
...unsentResults,
|
|
@@ -2711,13 +2709,10 @@ export class ModelResult {
|
|
|
2711
2709
|
if (hookDenied !== null) {
|
|
2712
2710
|
return hookDenied;
|
|
2713
2711
|
}
|
|
2714
|
-
const preliminaryResultsForCall = [];
|
|
2715
2712
|
const hasBroadcaster = this.toolEventBroadcaster || this.turnBroadcaster;
|
|
2716
2713
|
const onPreliminaryResult = hasBroadcaster
|
|
2717
2714
|
? (callId, resultValue) => {
|
|
2718
|
-
|
|
2719
|
-
preliminaryResultsForCall.push(typedResult);
|
|
2720
|
-
this.broadcastPreliminaryResult(callId, String(toolCall.name), typedResult);
|
|
2715
|
+
this.broadcastPreliminaryResult(callId, String(toolCall.name), resultValue);
|
|
2721
2716
|
}
|
|
2722
2717
|
: undefined;
|
|
2723
2718
|
// Compose the per-call abort signal (run signal + tool/run timeout +
|
|
@@ -2767,7 +2762,7 @@ export class ModelResult {
|
|
|
2767
2762
|
});
|
|
2768
2763
|
const executed = await this.raceToolDeadline(executionPromise, String(toolCall.name), timeoutMs, controller);
|
|
2769
2764
|
if (executed === 'timeout') {
|
|
2770
|
-
return this.buildToolTimeoutOutcome(toolCall, tool, timeoutMs
|
|
2765
|
+
return this.buildToolTimeoutOutcome(toolCall, tool, timeoutMs);
|
|
2771
2766
|
}
|
|
2772
2767
|
if (executed.type === 'parse_error') {
|
|
2773
2768
|
this.broadcastToolResult(toolCall.id, String(toolCall.name), isMcpTool(tool) ? 'mcp' : 'client', {
|
|
@@ -2798,7 +2793,6 @@ export class ModelResult {
|
|
|
2798
2793
|
controller,
|
|
2799
2794
|
timeoutMs,
|
|
2800
2795
|
runBinding,
|
|
2801
|
-
preliminaryResultsForCall,
|
|
2802
2796
|
};
|
|
2803
2797
|
}
|
|
2804
2798
|
return {
|
|
@@ -2806,7 +2800,6 @@ export class ModelResult {
|
|
|
2806
2800
|
toolCall: executed.effectiveToolCall,
|
|
2807
2801
|
tool,
|
|
2808
2802
|
result,
|
|
2809
|
-
preliminaryResultsForCall,
|
|
2810
2803
|
};
|
|
2811
2804
|
}
|
|
2812
2805
|
finally {
|
|
@@ -2822,7 +2815,7 @@ export class ModelResult {
|
|
|
2822
2815
|
* the model receives an error output immediately (the abandoned body
|
|
2823
2816
|
* keeps running detached).
|
|
2824
2817
|
*/
|
|
2825
|
-
buildToolTimeoutOutcome(toolCall, tool, timeoutMs
|
|
2818
|
+
buildToolTimeoutOutcome(toolCall, tool, timeoutMs) {
|
|
2826
2819
|
const message = `Tool "${toolCall.name}" timed out after ${timeoutMs}ms`;
|
|
2827
2820
|
this.broadcastToolResult(toolCall.id, String(toolCall.name), isMcpTool(tool) ? 'mcp' : 'client', {
|
|
2828
2821
|
error: message,
|
|
@@ -2837,7 +2830,6 @@ export class ModelResult {
|
|
|
2837
2830
|
code: 'tool_timeout',
|
|
2838
2831
|
}),
|
|
2839
2832
|
},
|
|
2840
|
-
preliminaryResultsForCall,
|
|
2841
2833
|
};
|
|
2842
2834
|
}
|
|
2843
2835
|
/**
|
|
@@ -2980,7 +2972,7 @@ export class ModelResult {
|
|
|
2980
2972
|
error: value.result.error.message,
|
|
2981
2973
|
}
|
|
2982
2974
|
: value.result.result);
|
|
2983
|
-
this.broadcastToolResult(value.toolCall.id, String(value.toolCall.name), isMcpTool(value.tool) ? 'mcp' : 'client', toolResult
|
|
2975
|
+
this.broadcastToolResult(value.toolCall.id, String(value.toolCall.name), isMcpTool(value.tool) ? 'mcp' : 'client', toolResult);
|
|
2984
2976
|
const outputForModel = await this.computeToolOutputForModel(value);
|
|
2985
2977
|
const executedOutput = {
|
|
2986
2978
|
type: 'function_call_output',
|
|
@@ -3398,7 +3390,6 @@ export class ModelResult {
|
|
|
3398
3390
|
: {
|
|
3399
3391
|
result,
|
|
3400
3392
|
},
|
|
3401
|
-
preliminaryResultsForCall: [],
|
|
3402
3393
|
};
|
|
3403
3394
|
};
|
|
3404
3395
|
let input;
|
|
@@ -4875,8 +4866,14 @@ export class ModelResult {
|
|
|
4875
4866
|
}
|
|
4876
4867
|
// Extract and check tool calls
|
|
4877
4868
|
const toolCalls = extractToolCallsFromResponse(currentResponse);
|
|
4869
|
+
// With allowFinalResponse: false, a met stopWhen means no tool from
|
|
4870
|
+
// this response runs (the post-loop stop path skips them). Evaluate it
|
|
4871
|
+
// before the approval check so pausing for an approval-gated call does
|
|
4872
|
+
// not execute its auto-approved siblings. With allowFinalResponse on,
|
|
4873
|
+
// the stop path runs these calls anyway, so the check is not needed.
|
|
4874
|
+
const skipAutoExecution = this.options.allowFinalResponse === false && (await this.shouldStopExecution());
|
|
4878
4875
|
// Check for approval requirements
|
|
4879
|
-
if (await this.handleApprovalCheck(toolCalls, 0, currentResponse)) {
|
|
4876
|
+
if (await this.handleApprovalCheck(toolCalls, 0, currentResponse, skipAutoExecution)) {
|
|
4880
4877
|
return; // Paused for approval
|
|
4881
4878
|
}
|
|
4882
4879
|
// All tool calls are manual (no execute / no onToolCalled) or
|