prefix-safe-json 0.2.0 → 0.4.0
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 +170 -89
- package/dist/coordinator/coordinator.d.ts +2 -0
- package/dist/coordinator/coordinator.d.ts.map +1 -1
- package/dist/coordinator/coordinator.js +54 -10
- package/dist/coordinator/coordinator.js.map +1 -1
- package/dist/coordinator/diagnostic-codes.d.ts +18 -0
- package/dist/coordinator/diagnostic-codes.d.ts.map +1 -1
- package/dist/coordinator/diagnostic-codes.js +26 -0
- package/dist/coordinator/diagnostic-codes.js.map +1 -1
- package/dist/coordinator/types.d.ts +2 -0
- package/dist/coordinator/types.d.ts.map +1 -1
- package/dist/gate/decide.d.ts.map +1 -1
- package/dist/gate/decide.js +9 -2
- package/dist/gate/decide.js.map +1 -1
- package/dist/gate/gate.d.ts +4 -2
- package/dist/gate/gate.d.ts.map +1 -1
- package/dist/gate/gate.js +18 -3
- package/dist/gate/gate.js.map +1 -1
- package/dist/gate/types.d.ts +7 -1
- package/dist/gate/types.d.ts.map +1 -1
- package/dist/guard/ai-sdk-execution-lock.d.ts +19 -0
- package/dist/guard/ai-sdk-execution-lock.d.ts.map +1 -0
- package/dist/guard/ai-sdk-execution-lock.js +78 -0
- package/dist/guard/ai-sdk-execution-lock.js.map +1 -0
- package/dist/guard/ai-sdk.d.ts +3 -4
- package/dist/guard/ai-sdk.d.ts.map +1 -1
- package/dist/guard/ai-sdk.js +3 -4
- package/dist/guard/ai-sdk.js.map +1 -1
- package/dist/guard/provider-guard.d.ts.map +1 -1
- package/dist/guard/provider-guard.js +3 -0
- package/dist/guard/provider-guard.js.map +1 -1
- package/dist/guard/types.d.ts +3 -1
- package/dist/guard/types.d.ts.map +1 -1
- package/dist/index.d.ts +38 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +30 -3
- package/dist/index.js.map +1 -1
- package/dist/providers/ai-sdk.d.ts +2 -0
- package/dist/providers/ai-sdk.d.ts.map +1 -1
- package/dist/providers/ai-sdk.js +57 -3
- package/dist/providers/ai-sdk.js.map +1 -1
- package/dist/providers/gemini.d.ts +1 -1
- package/dist/providers/gemini.d.ts.map +1 -1
- package/dist/providers/gemini.js +35 -8
- package/dist/providers/gemini.js.map +1 -1
- package/dist/providers/openai-compatible.d.ts +2 -1
- package/dist/providers/openai-compatible.d.ts.map +1 -1
- package/dist/providers/openai-compatible.js +54 -6
- package/dist/providers/openai-compatible.js.map +1 -1
- package/package.json +21 -5
package/dist/providers/ai-sdk.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CONTENT_FILTERED_DIAGNOSTIC_CODE, SDK_EXECUTION_OBSERVED_DIAGNOSTIC_CODE, SDK_EXECUTION_ERROR_DIAGNOSTIC_CODE, } from "../coordinator/diagnostic-codes.js";
|
|
1
|
+
import { CONTENT_FILTERED_DIAGNOSTIC_CODE, SDK_EXECUTION_OBSERVED_DIAGNOSTIC_CODE, SDK_EXECUTION_ERROR_DIAGNOSTIC_CODE, DUPLICATE_TOOL_END_DIAGNOSTIC_CODE, TOOL_ARGUMENTS_AFTER_END_DIAGNOSTIC_CODE, TOOL_ARGUMENTS_BEFORE_START_DIAGNOSTIC_CODE, TOOL_END_BEFORE_START_DIAGNOSTIC_CODE, } from "../coordinator/diagnostic-codes.js";
|
|
2
2
|
function toolPartId(part) {
|
|
3
3
|
// "tool-input-start"/"tool-input-delta" carry `id`; "tool-input-end" is
|
|
4
4
|
// documented with `toolCallId`. Reading both defensively means this
|
|
@@ -28,6 +28,8 @@ export class AiSdkStreamAdapter {
|
|
|
28
28
|
provider = "ai-sdk";
|
|
29
29
|
sequence = 0;
|
|
30
30
|
finished = false;
|
|
31
|
+
startedCallKeys = new Set();
|
|
32
|
+
endedCallKeys = new Set();
|
|
31
33
|
push(rawEvent) {
|
|
32
34
|
if (this.finished)
|
|
33
35
|
return [];
|
|
@@ -55,6 +57,7 @@ export class AiSdkStreamAdapter {
|
|
|
55
57
|
const id = toolPartId(part);
|
|
56
58
|
if (id === undefined)
|
|
57
59
|
break;
|
|
60
|
+
this.startedCallKeys.add(`tool-input:${id}`);
|
|
58
61
|
events.push({
|
|
59
62
|
type: "tool_call_start",
|
|
60
63
|
sequence: ++this.sequence,
|
|
@@ -69,11 +72,36 @@ export class AiSdkStreamAdapter {
|
|
|
69
72
|
const id = toolPartId(part);
|
|
70
73
|
if (id === undefined || typeof part.delta !== "string")
|
|
71
74
|
break;
|
|
75
|
+
const sourceKey = `tool-input:${id}`;
|
|
76
|
+
if (!this.startedCallKeys.has(sourceKey)) {
|
|
77
|
+
events.push({
|
|
78
|
+
type: "provider_diagnostic",
|
|
79
|
+
sequence: ++this.sequence,
|
|
80
|
+
provider: this.provider,
|
|
81
|
+
callRef: { sourceKey },
|
|
82
|
+
code: TOOL_ARGUMENTS_BEFORE_START_DIAGNOSTIC_CODE,
|
|
83
|
+
severity: "error",
|
|
84
|
+
message: "AI SDK tool-input-delta arrived before tool-input-start",
|
|
85
|
+
});
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
if (this.endedCallKeys.has(sourceKey)) {
|
|
89
|
+
events.push({
|
|
90
|
+
type: "provider_diagnostic",
|
|
91
|
+
sequence: ++this.sequence,
|
|
92
|
+
provider: this.provider,
|
|
93
|
+
callRef: { sourceKey },
|
|
94
|
+
code: TOOL_ARGUMENTS_AFTER_END_DIAGNOSTIC_CODE,
|
|
95
|
+
severity: "error",
|
|
96
|
+
message: "AI SDK tool-input-delta arrived after tool-input-end",
|
|
97
|
+
});
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
72
100
|
events.push({
|
|
73
101
|
type: "tool_call_arguments_delta",
|
|
74
102
|
sequence: ++this.sequence,
|
|
75
103
|
provider: this.provider,
|
|
76
|
-
callRef: { sourceKey
|
|
104
|
+
callRef: { sourceKey },
|
|
77
105
|
delta: part.delta,
|
|
78
106
|
});
|
|
79
107
|
break;
|
|
@@ -82,11 +110,37 @@ export class AiSdkStreamAdapter {
|
|
|
82
110
|
const id = toolPartId(part);
|
|
83
111
|
if (id === undefined)
|
|
84
112
|
break;
|
|
113
|
+
const sourceKey = `tool-input:${id}`;
|
|
114
|
+
if (!this.startedCallKeys.has(sourceKey)) {
|
|
115
|
+
events.push({
|
|
116
|
+
type: "provider_diagnostic",
|
|
117
|
+
sequence: ++this.sequence,
|
|
118
|
+
provider: this.provider,
|
|
119
|
+
callRef: { sourceKey },
|
|
120
|
+
code: TOOL_END_BEFORE_START_DIAGNOSTIC_CODE,
|
|
121
|
+
severity: "error",
|
|
122
|
+
message: "AI SDK tool-input-end arrived before tool-input-start",
|
|
123
|
+
});
|
|
124
|
+
break;
|
|
125
|
+
}
|
|
126
|
+
if (this.endedCallKeys.has(sourceKey)) {
|
|
127
|
+
events.push({
|
|
128
|
+
type: "provider_diagnostic",
|
|
129
|
+
sequence: ++this.sequence,
|
|
130
|
+
provider: this.provider,
|
|
131
|
+
callRef: { sourceKey },
|
|
132
|
+
code: DUPLICATE_TOOL_END_DIAGNOSTIC_CODE,
|
|
133
|
+
severity: "error",
|
|
134
|
+
message: "AI SDK emitted duplicate tool-input-end parts for one call",
|
|
135
|
+
});
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
138
|
+
this.endedCallKeys.add(sourceKey);
|
|
85
139
|
events.push({
|
|
86
140
|
type: "tool_call_end",
|
|
87
141
|
sequence: ++this.sequence,
|
|
88
142
|
provider: this.provider,
|
|
89
|
-
callRef: { sourceKey
|
|
143
|
+
callRef: { sourceKey },
|
|
90
144
|
reason: "complete", // corrected by the stream-level "finish" part below
|
|
91
145
|
});
|
|
92
146
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-sdk.js","sourceRoot":"","sources":["../../src/providers/ai-sdk.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gCAAgC,EAChC,sCAAsC,EACtC,mCAAmC,
|
|
1
|
+
{"version":3,"file":"ai-sdk.js","sourceRoot":"","sources":["../../src/providers/ai-sdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { ProviderName, NormalizedToolStreamEvent, StreamEndReason } from "../coo
|
|
|
2
2
|
import { ProviderStreamAdapter } from "./adapter.js";
|
|
3
3
|
interface GeminiFunctionCall {
|
|
4
4
|
name?: string;
|
|
5
|
-
args?:
|
|
5
|
+
args?: unknown;
|
|
6
6
|
}
|
|
7
7
|
interface GeminiPart {
|
|
8
8
|
functionCall?: GeminiFunctionCall;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAIrD,UAAU,kBAAkB;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,YAAY,CAAC,EAAE,kBAAkB,CAAC;CAGnC;AAED,UAAU,aAAa;IACrB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB;AAED,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;CAChC;AAED,qBAAa,mBAAoB,YAAW,qBAAqB,CAAC,OAAO,CAAC;IACxE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAY;IAC3C,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,QAAQ,CAAS;IAEzB,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,yBAAyB,EAAE;IA8G7D,MAAM,CAAC,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,yBAAyB,EAAE;CAW3G"}
|
package/dist/providers/gemini.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { PROJECTION_ONLY_ARGUMENTS_DIAGNOSTIC_CODE } from "../coordinator/diagnostic-codes.js";
|
|
1
2
|
export class GeminiStreamAdapter {
|
|
2
3
|
provider = "gemini";
|
|
3
4
|
sequence = 0;
|
|
@@ -32,17 +33,43 @@ export class GeminiStreamAdapter {
|
|
|
32
33
|
callRef: { sourceKey },
|
|
33
34
|
name: fc.name,
|
|
34
35
|
});
|
|
35
|
-
|
|
36
|
+
events.push({
|
|
37
|
+
type: "provider_diagnostic",
|
|
38
|
+
sequence: ++this.sequence,
|
|
39
|
+
provider: this.provider,
|
|
40
|
+
callRef: { sourceKey },
|
|
41
|
+
code: PROJECTION_ONLY_ARGUMENTS_DIAGNOSTIC_CODE,
|
|
42
|
+
severity: "warning",
|
|
43
|
+
message: "Gemini function-call arguments are a structured projection, not raw streamed argument evidence",
|
|
44
|
+
});
|
|
45
|
+
if (fc.args !== undefined) {
|
|
36
46
|
// Gemini currently emits structured objects.
|
|
37
47
|
// We serialize it to emulate a text delta, BUT it is documented in docs/providers/gemini.md
|
|
38
48
|
// that this is NOT byte-level streaming. It is object-level final delivery.
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
49
|
+
try {
|
|
50
|
+
const projected = JSON.stringify(fc.args);
|
|
51
|
+
if (projected === undefined) {
|
|
52
|
+
throw new TypeError("structured arguments are not JSON-serializable");
|
|
53
|
+
}
|
|
54
|
+
events.push({
|
|
55
|
+
type: "tool_call_arguments_delta",
|
|
56
|
+
sequence: ++this.sequence,
|
|
57
|
+
provider: this.provider,
|
|
58
|
+
callRef: { sourceKey },
|
|
59
|
+
delta: projected,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
events.push({
|
|
64
|
+
type: "provider_diagnostic",
|
|
65
|
+
sequence: ++this.sequence,
|
|
66
|
+
provider: this.provider,
|
|
67
|
+
callRef: { sourceKey },
|
|
68
|
+
code: "E_GEMINI_ARGUMENT_PROJECTION_FAILED",
|
|
69
|
+
severity: "error",
|
|
70
|
+
message: "Gemini structured function-call arguments could not be projected to JSON",
|
|
71
|
+
});
|
|
72
|
+
}
|
|
46
73
|
}
|
|
47
74
|
events.push({
|
|
48
75
|
type: "tool_call_end",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/providers/gemini.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ interface OpenAIChoiceDelta {
|
|
|
11
11
|
}>;
|
|
12
12
|
}
|
|
13
13
|
interface OpenAIChoice {
|
|
14
|
+
index?: number;
|
|
14
15
|
delta?: OpenAIChoiceDelta;
|
|
15
16
|
finish_reason?: string | null;
|
|
16
17
|
}
|
|
@@ -20,7 +21,7 @@ export interface OpenAICompatibleEvent {
|
|
|
20
21
|
export declare class OpenAICompatibleStreamAdapter implements ProviderStreamAdapter<unknown> {
|
|
21
22
|
readonly provider: ProviderName;
|
|
22
23
|
private sequence;
|
|
23
|
-
private
|
|
24
|
+
private startedSourceKeys;
|
|
24
25
|
private knownSourceKeys;
|
|
25
26
|
private finished;
|
|
26
27
|
push(rawEvent: unknown): readonly NormalizedToolStreamEvent[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.d.ts","sourceRoot":"","sources":["../../src/providers/openai-compatible.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible.d.ts","sourceRoot":"","sources":["../../src/providers/openai-compatible.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAMrD,UAAU,iBAAiB;IACzB,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAE;YACT,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC,CAAC;CACJ;AAED,UAAU,YAAY;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;CAC1B;AAED,qBAAa,6BAA8B,YAAW,qBAAqB,CAAC,OAAO,CAAC;IAClF,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAuB;IACtD,OAAO,CAAC,QAAQ,CAAK;IAGrB,OAAO,CAAC,iBAAiB,CAA0B;IAEnD,OAAO,CAAC,eAAe,CAA0B;IAEjD,OAAO,CAAC,QAAQ,CAAS;IAEzB,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,yBAAyB,EAAE;IAwL7D,MAAM,CAAC,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,eAAe,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,yBAAyB,EAAE;CAyB3G"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import { DUPLICATE_CHOICE_INDEX_DIAGNOSTIC_CODE, INVALID_CHOICE_INDEX_DIAGNOSTIC_CODE, } from "../coordinator/diagnostic-codes.js";
|
|
1
2
|
export class OpenAICompatibleStreamAdapter {
|
|
2
3
|
provider = "openai-compatible";
|
|
3
4
|
sequence = 0;
|
|
4
|
-
// Track
|
|
5
|
-
|
|
5
|
+
// Track full provider coordinates, never the tool index alone.
|
|
6
|
+
startedSourceKeys = new Set();
|
|
6
7
|
// Keep track of sourceKeys to emit tool_call_end
|
|
7
8
|
knownSourceKeys = new Set();
|
|
8
9
|
finished = false;
|
|
@@ -32,10 +33,57 @@ export class OpenAICompatibleStreamAdapter {
|
|
|
32
33
|
}
|
|
33
34
|
const chunk = rawEvent;
|
|
34
35
|
if (Array.isArray(chunk.choices)) {
|
|
36
|
+
const choiceCounts = new Map();
|
|
35
37
|
for (const choice of chunk.choices) {
|
|
38
|
+
if (Number.isInteger(choice.index) && choice.index >= 0) {
|
|
39
|
+
const choiceIndex = choice.index;
|
|
40
|
+
choiceCounts.set(choiceIndex, (choiceCounts.get(choiceIndex) ?? 0) + 1);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
for (const choice of chunk.choices) {
|
|
44
|
+
if (!Number.isInteger(choice.index) || choice.index < 0) {
|
|
45
|
+
events.push({
|
|
46
|
+
type: "provider_diagnostic",
|
|
47
|
+
sequence: ++this.sequence,
|
|
48
|
+
provider: this.provider,
|
|
49
|
+
code: INVALID_CHOICE_INDEX_DIAGNOSTIC_CODE,
|
|
50
|
+
severity: "error",
|
|
51
|
+
message: "choice.index is missing, non-integer, or negative; tool-call identity is ambiguous",
|
|
52
|
+
});
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
const choiceIndex = choice.index;
|
|
56
|
+
if ((choiceCounts.get(choiceIndex) ?? 0) > 1) {
|
|
57
|
+
const toolCalls = choice.delta?.tool_calls ?? [];
|
|
58
|
+
if (toolCalls.length === 0) {
|
|
59
|
+
events.push({
|
|
60
|
+
type: "provider_diagnostic",
|
|
61
|
+
sequence: ++this.sequence,
|
|
62
|
+
provider: this.provider,
|
|
63
|
+
code: DUPLICATE_CHOICE_INDEX_DIAGNOSTIC_CODE,
|
|
64
|
+
severity: "error",
|
|
65
|
+
message: `choice.index ${choiceIndex} is duplicated in one provider event`,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
for (const tc of toolCalls) {
|
|
69
|
+
const hasToolIndex = Number.isInteger(tc.index) && tc.index >= 0;
|
|
70
|
+
events.push({
|
|
71
|
+
type: "provider_diagnostic",
|
|
72
|
+
sequence: ++this.sequence,
|
|
73
|
+
provider: this.provider,
|
|
74
|
+
code: DUPLICATE_CHOICE_INDEX_DIAGNOSTIC_CODE,
|
|
75
|
+
severity: "error",
|
|
76
|
+
message: `choice.index ${choiceIndex} is duplicated in one provider event`,
|
|
77
|
+
...(hasToolIndex
|
|
78
|
+
? { callRef: { sourceKey: `choice:${choiceIndex}/tool-index:${tc.index}` } }
|
|
79
|
+
: {}),
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
36
84
|
if (choice.delta && Array.isArray(choice.delta.tool_calls)) {
|
|
37
85
|
for (const tc of choice.delta.tool_calls) {
|
|
38
|
-
if (
|
|
86
|
+
if (!Number.isInteger(tc.index) || tc.index < 0) {
|
|
39
87
|
events.push({
|
|
40
88
|
type: "provider_diagnostic",
|
|
41
89
|
sequence: ++this.sequence,
|
|
@@ -46,10 +94,10 @@ export class OpenAICompatibleStreamAdapter {
|
|
|
46
94
|
});
|
|
47
95
|
continue;
|
|
48
96
|
}
|
|
49
|
-
const sourceKey = `choice
|
|
97
|
+
const sourceKey = `choice:${choiceIndex}/tool-index:${tc.index}`;
|
|
50
98
|
this.knownSourceKeys.add(sourceKey);
|
|
51
|
-
if (!this.
|
|
52
|
-
this.
|
|
99
|
+
if (!this.startedSourceKeys.has(sourceKey)) {
|
|
100
|
+
this.startedSourceKeys.add(sourceKey);
|
|
53
101
|
events.push({
|
|
54
102
|
type: "tool_call_start",
|
|
55
103
|
sequence: ++this.sequence,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible.js","sourceRoot":"","sources":["../../src/providers/openai-compatible.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openai-compatible.js","sourceRoot":"","sources":["../../src/providers/openai-compatible.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prefix-safe-json",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Fail-closed execution integrity for streamed LLM tool calls — reject truncated or unconfirmed arguments before side effects",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"json",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"README.md"
|
|
42
42
|
],
|
|
43
43
|
"engines": {
|
|
44
|
-
"node": ">=
|
|
44
|
+
"node": ">=22.0.0"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"ajv": "^8.20.0"
|
|
@@ -65,7 +65,12 @@
|
|
|
65
65
|
"pack:check": "pnpm pack --dry-run",
|
|
66
66
|
"example:anthropic": "node examples/anthropic-truncation-safety.mjs",
|
|
67
67
|
"example:ai-sdk": "node examples/ai-sdk-execution-gate.mjs",
|
|
68
|
-
"example:ai-sdk-guard": "node examples/ai-sdk-guard.mjs"
|
|
68
|
+
"example:ai-sdk-guard": "node examples/ai-sdk-guard.mjs",
|
|
69
|
+
"example:ai-sdk-safe-boundary": "node examples/ai-sdk-v7-safe-boundary.mjs",
|
|
70
|
+
"example:ai-sdk-v5-safe-boundary": "node examples/ai-sdk-v5-safe-boundary.mjs",
|
|
71
|
+
"example:ai-sdk-v6-safe-boundary": "node examples/ai-sdk-v6-safe-boundary.mjs",
|
|
72
|
+
"example:ai-sdk-v7-safe-boundary": "node examples/ai-sdk-v7-safe-boundary.mjs",
|
|
73
|
+
"example:ai-sdk-lifecycle-proof": "node examples/ai-sdk-lifecycle-proof.mjs"
|
|
69
74
|
},
|
|
70
75
|
"devDependencies": {
|
|
71
76
|
"@eslint/js": "^9.8.0",
|
|
@@ -73,7 +78,10 @@
|
|
|
73
78
|
"@stryker-mutator/vitest-runner": "^9.6.1",
|
|
74
79
|
"@types/clarinet": "^0.12.3",
|
|
75
80
|
"@types/node": "^26.1.2",
|
|
76
|
-
"@vitest/coverage-v8": "^2.
|
|
81
|
+
"@vitest/coverage-v8": "^3.2.6",
|
|
82
|
+
"ai-v5": "npm:ai@5.0.244",
|
|
83
|
+
"ai-v6": "npm:ai@6.0.264",
|
|
84
|
+
"ai-v7": "npm:ai@7.0.77",
|
|
77
85
|
"clarinet": "^0.12.6",
|
|
78
86
|
"eslint": "^9.8.0",
|
|
79
87
|
"fast-check": "^4.9.0",
|
|
@@ -83,6 +91,14 @@
|
|
|
83
91
|
"tsx": "^4.16.0",
|
|
84
92
|
"typescript": "^5.5.0",
|
|
85
93
|
"typescript-eslint": "^8.0.0",
|
|
86
|
-
"vitest": "^2.
|
|
94
|
+
"vitest": "^3.2.6"
|
|
95
|
+
},
|
|
96
|
+
"pnpm": {
|
|
97
|
+
"overrides": {
|
|
98
|
+
"qs": "^6.15.2",
|
|
99
|
+
"vite": "^6.4.3",
|
|
100
|
+
"nanoid": "^3.3.18",
|
|
101
|
+
"undici": "^7.28.0"
|
|
102
|
+
}
|
|
87
103
|
}
|
|
88
104
|
}
|