@vibes.diy/call-ai-v2 12.2.8 → 12.2.10

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.
Files changed (11) hide show
  1. package/package.json +2 -2
  2. package/prompt-type-cache-control.test.d.ts +1 -0
  3. package/prompt-type-cache-control.test.js +74 -0
  4. package/prompt-type-cache-control.test.js.map +1 -0
  5. package/prompt-type.d.ts +45 -0
  6. package/prompt-type.js +6 -0
  7. package/prompt-type.js.map +1 -1
  8. package/stats-stream.js +13 -5
  9. package/stats-stream.js.map +1 -1
  10. package/stats-stream.test.js +12 -0
  11. package/stats-stream.test.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vibes.diy/call-ai-v2",
3
- "version": "12.2.8",
3
+ "version": "12.2.10",
4
4
  "description": "",
5
5
  "type": "module",
6
6
  "main": "index.js",
@@ -15,7 +15,7 @@
15
15
  "license": "Apache-2.0",
16
16
  "dependencies": {
17
17
  "@adviser/cement": "~0.5.34",
18
- "@vibes.diy/identity": "^12.2.8",
18
+ "@vibes.diy/identity": "^12.2.10",
19
19
  "arktype": "~2.2.3",
20
20
  "cmd-ts": "~0.15.0",
21
21
  "mime": "~4.1.0",
package/prompt-type-cache-control.test.d.ts ADDED
@@ -0,0 +1 @@
1
+ export {};
package/prompt-type-cache-control.test.js ADDED
@@ -0,0 +1,74 @@
1
+ import { describe, expect, it } from "vitest";
2
+ import { type } from "arktype";
3
+ import { CacheControl, LLMRequest } from "./prompt-type.js";
4
+ function strip(req) {
5
+ const out = type(LLMRequest).onDeepUndeclaredKey("delete")(req);
6
+ if (out instanceof type.errors) {
7
+ throw new Error(`Invalid LLMRequest: ${out.summary}`);
8
+ }
9
+ return out;
10
+ }
11
+ describe("cache_control survives the undeclared-key strip", () => {
12
+ it("keeps cache_control on a text content part", () => {
13
+ const req = {
14
+ model: "anthropic/claude-sonnet-4.6",
15
+ messages: [
16
+ {
17
+ role: "system",
18
+ content: [{ type: "text", text: "long stable prefix", cache_control: { type: "ephemeral" } }],
19
+ },
20
+ ],
21
+ };
22
+ const body = JSON.parse(JSON.stringify(strip(req)));
23
+ expect(body.messages[0].content[0].cache_control).toEqual({ type: "ephemeral" });
24
+ });
25
+ it("keeps cache_control with an explicit ttl", () => {
26
+ const req = {
27
+ messages: [
28
+ {
29
+ role: "user",
30
+ content: [{ type: "text", text: "hi", cache_control: { type: "ephemeral", ttl: "1h" } }],
31
+ },
32
+ ],
33
+ };
34
+ const body = JSON.parse(JSON.stringify(strip(req)));
35
+ expect(body.messages[0].content[0].cache_control).toEqual({ type: "ephemeral", ttl: "1h" });
36
+ });
37
+ it("keeps cache_control on an image content part", () => {
38
+ const req = {
39
+ messages: [
40
+ {
41
+ role: "user",
42
+ content: [
43
+ {
44
+ type: "image_url",
45
+ image_url: { url: "https://example.com/a.png" },
46
+ cache_control: { type: "ephemeral" },
47
+ },
48
+ ],
49
+ },
50
+ ],
51
+ };
52
+ const body = JSON.parse(JSON.stringify(strip(req)));
53
+ expect(body.messages[0].content[0].cache_control).toEqual({ type: "ephemeral" });
54
+ });
55
+ it("still strips an undeclared junk key from the same content part", () => {
56
+ const req = {
57
+ messages: [
58
+ {
59
+ role: "user",
60
+ content: [{ type: "text", text: "hi", cache_control: { type: "ephemeral" }, junk: "nope" }],
61
+ },
62
+ ],
63
+ };
64
+ const body = JSON.parse(JSON.stringify(strip(req)));
65
+ expect(body.messages[0].content[0].junk).toBeUndefined();
66
+ expect(body.messages[0].content[0].cache_control).toEqual({ type: "ephemeral" });
67
+ });
68
+ it("CacheControl rejects a non-ephemeral type and an unknown ttl", () => {
69
+ expect(CacheControl({ type: "persistent" })).toBeInstanceOf(type.errors);
70
+ expect(CacheControl({ type: "ephemeral", ttl: "7d" })).toBeInstanceOf(type.errors);
71
+ expect(CacheControl({ type: "ephemeral", ttl: "5m" })).not.toBeInstanceOf(type.errors);
72
+ });
73
+ });
74
+ //# sourceMappingURL=prompt-type-cache-control.test.js.map
package/prompt-type-cache-control.test.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prompt-type-cache-control.test.js","sourceRoot":"","sources":["../jsr/prompt-type-cache-control.test.ts"],"names":[],"mappings":"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"}
package/prompt-type.d.ts CHANGED
@@ -40,9 +40,18 @@ export declare const ToolChoice: import("arktype").BaseType<"auto" | "none" | "r
40
40
  };
41
41
  }, {}>;
42
42
  export type ToolChoice = typeof ToolChoice.infer;
43
+ export declare const CacheControl: import("arktype/internal/variants/object.ts").ObjectType<{
44
+ type: "ephemeral";
45
+ ttl?: "1h" | "5m" | undefined;
46
+ }, {}>;
47
+ export type CacheControl = typeof CacheControl.infer;
43
48
  export declare const TextContent: import("arktype/internal/variants/object.ts").ObjectType<{
44
49
  type: "text";
45
50
  text: string;
51
+ cache_control?: {
52
+ type: "ephemeral";
53
+ ttl?: "1h" | "5m" | undefined;
54
+ } | undefined;
46
55
  }, {}>;
47
56
  export type TextContent = typeof TextContent.infer;
48
57
  export declare const ImageUrlContent: import("arktype/internal/variants/object.ts").ObjectType<{
@@ -50,6 +59,10 @@ export declare const ImageUrlContent: import("arktype/internal/variants/object.t
50
59
  image_url: {
51
60
  url: string;
52
61
  };
62
+ cache_control?: {
63
+ type: "ephemeral";
64
+ ttl?: "1h" | "5m" | undefined;
65
+ } | undefined;
53
66
  }, {}>;
54
67
  export type ImageUrlContent = typeof ImageUrlContent.infer;
55
68
  export declare const VibesFileContent: import("arktype/internal/variants/object.ts").ObjectType<{
@@ -65,11 +78,19 @@ export type VibesFileContent = typeof VibesFileContent.infer;
65
78
  export declare const MessageContent: import("arktype/internal/variants/object.ts").ObjectType<{
66
79
  type: "text";
67
80
  text: string;
81
+ cache_control?: {
82
+ type: "ephemeral";
83
+ ttl?: "1h" | "5m" | undefined;
84
+ } | undefined;
68
85
  } | {
69
86
  type: "image_url";
70
87
  image_url: {
71
88
  url: string;
72
89
  };
90
+ cache_control?: {
91
+ type: "ephemeral";
92
+ ttl?: "1h" | "5m" | undefined;
93
+ } | undefined;
73
94
  } | {
74
95
  type: "vibes_file";
75
96
  uploadId: string;
@@ -85,11 +106,19 @@ export declare const ChatMessage: import("arktype/internal/variants/object.ts").
85
106
  content: ({
86
107
  type: "text";
87
108
  text: string;
109
+ cache_control?: {
110
+ type: "ephemeral";
111
+ ttl?: "1h" | "5m" | undefined;
112
+ } | undefined;
88
113
  } | {
89
114
  type: "image_url";
90
115
  image_url: {
91
116
  url: string;
92
117
  };
118
+ cache_control?: {
119
+ type: "ephemeral";
120
+ ttl?: "1h" | "5m" | undefined;
121
+ } | undefined;
93
122
  } | {
94
123
  type: "vibes_file";
95
124
  uploadId: string;
@@ -125,11 +154,19 @@ export declare const LLMMessage: import("arktype/internal/variants/object.ts").O
125
154
  content: ({
126
155
  type: "text";
127
156
  text: string;
157
+ cache_control?: {
158
+ type: "ephemeral";
159
+ ttl?: "1h" | "5m" | undefined;
160
+ } | undefined;
128
161
  } | {
129
162
  type: "image_url";
130
163
  image_url: {
131
164
  url: string;
132
165
  };
166
+ cache_control?: {
167
+ type: "ephemeral";
168
+ ttl?: "1h" | "5m" | undefined;
169
+ } | undefined;
133
170
  } | {
134
171
  type: "vibes_file";
135
172
  uploadId: string;
@@ -163,11 +200,19 @@ export declare const LLMRequest: import("arktype/internal/variants/object.ts").O
163
200
  content: ({
164
201
  type: "text";
165
202
  text: string;
203
+ cache_control?: {
204
+ type: "ephemeral";
205
+ ttl?: "1h" | "5m" | undefined;
206
+ } | undefined;
166
207
  } | {
167
208
  type: "image_url";
168
209
  image_url: {
169
210
  url: string;
170
211
  };
212
+ cache_control?: {
213
+ type: "ephemeral";
214
+ ttl?: "1h" | "5m" | undefined;
215
+ } | undefined;
171
216
  } | {
172
217
  type: "vibes_file";
173
218
  uploadId: string;
package/prompt-type.js CHANGED
@@ -30,15 +30,21 @@ export const ToolChoice = type("'none' | 'auto' | 'required'").or(type({
30
30
  type: "'function'",
31
31
  function: { name: "string" },
32
32
  }));
33
+ export const CacheControl = type({
34
+ type: "'ephemeral'",
35
+ "ttl?": "'5m' | '1h'",
36
+ });
33
37
  export const TextContent = type({
34
38
  type: "'text'",
35
39
  text: "string",
40
+ "cache_control?": CacheControl,
36
41
  });
37
42
  export const ImageUrlContent = type({
38
43
  type: "'image_url'",
39
44
  image_url: type({
40
45
  url: "string",
41
46
  }),
47
+ "cache_control?": CacheControl,
42
48
  });
43
49
  export const VibesFileContent = type({
44
50
  type: "'vibes_file'",
package/prompt-type.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prompt-type.js","sourceRoot":"","sources":["../jsr/prompt-type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prompt-type.js","sourceRoot":"","sources":["../jsr/prompt-type.ts"],"names":[],"mappings":"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"}
package/stats-stream.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { exception2Result } from "@adviser/cement";
1
2
  import { type } from "arktype";
2
3
  import { CoercedDate } from "./types.js";
3
4
  export const StatsCollectMsg = type({
@@ -9,24 +10,31 @@ export const isStatsCollect = (msg, streamId) => !(StatsCollectMsg(msg) instance
9
10
  export function createStatsCollector(streamId, intervalMs = 1000) {
10
11
  let intervalId;
11
12
  let controller;
13
+ function stopCollecting() {
14
+ if (intervalId !== undefined) {
15
+ clearInterval(intervalId);
16
+ intervalId = undefined;
17
+ }
18
+ }
12
19
  return new TransformStream({
13
20
  start(ctrl) {
14
21
  controller = ctrl;
15
22
  intervalId = setInterval(() => {
16
- controller?.enqueue({
23
+ const injected = exception2Result(() => controller?.enqueue({
17
24
  type: "stats.collect",
18
25
  streamId,
19
26
  timestamp: new Date(),
20
- });
27
+ }));
28
+ if (injected.isErr()) {
29
+ stopCollecting();
30
+ }
21
31
  }, intervalMs);
22
32
  },
23
33
  transform(chunk, ctrl) {
24
34
  ctrl.enqueue(chunk);
25
35
  },
26
36
  flush() {
27
- if (intervalId) {
28
- clearInterval(intervalId);
29
- }
37
+ stopCollecting();
30
38
  controller?.enqueue({
31
39
  type: "stats.collect",
32
40
  streamId,
package/stats-stream.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stats-stream.js","sourceRoot":"","sources":["../jsr/stats-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA0B,EAAE,CACxF,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAK,GAAuB,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAKlH,MAAM,UAAU,oBAAoB,CAAI,QAAgB,EAAE,UAAU,GAAG,IAAI;IACzE,IAAI,UAAsD,CAAC;IAC3D,IAAI,UAA6E,CAAC;IAElF,OAAO,IAAI,eAAe,CAAyB;QACjD,KAAK,CAAC,IAAI;YACR,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;gBAC5B,UAAU,EAAE,OAAO,CAAC;oBAClB,IAAI,EAAE,eAAe;oBACrB,QAAQ;oBACR,SAAS,EAAE,IAAI,IAAI,EAAE;iBACtB,CAAC,CAAC;YACL,CAAC,EAAE,UAAU,CAAC,CAAC;QACjB,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,IAAI;YACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,KAAK;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,aAAa,CAAC,UAAU,CAAC,CAAC;YAC5B,CAAC;YAED,UAAU,EAAE,OAAO,CAAC;gBAClB,IAAI,EAAE,eAAe;gBACrB,QAAQ;gBACR,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"stats-stream.js","sourceRoot":"","sources":["../jsr/stats-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA0B,EAAE,CACxF,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAK,GAAuB,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAKlH,MAAM,UAAU,oBAAoB,CAAI,QAAgB,EAAE,UAAU,GAAG,IAAI;IACzE,IAAI,UAAsD,CAAC;IAC3D,IAAI,UAA6E,CAAC;IAElF,SAAS,cAAc;QACrB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1B,UAAU,GAAG,SAAS,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,IAAI,eAAe,CAAyB;QACjD,KAAK,CAAC,IAAI;YACR,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;gBAM5B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,CACrC,UAAU,EAAE,OAAO,CAAC;oBAClB,IAAI,EAAE,eAAe;oBACrB,QAAQ;oBACR,SAAS,EAAE,IAAI,IAAI,EAAE;iBACtB,CAAC,CACH,CAAC;gBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;oBACrB,cAAc,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC,EAAE,UAAU,CAAC,CAAC;QACjB,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,IAAI;YACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,KAAK;YACH,cAAc,EAAE,CAAC;YAEjB,UAAU,EAAE,OAAO,CAAC;gBAClB,IAAI,EAAE,eAAe;gBACrB,QAAQ;gBACR,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
package/stats-stream.test.js CHANGED
@@ -71,6 +71,18 @@ describe("stats-stream", () => {
71
71
  streamId: "test-stream",
72
72
  });
73
73
  });
74
+ it("stops the interval when the stream is cancelled instead of leaking it", async () => {
75
+ const collector = createStatsCollector("cancelled-stream", 100);
76
+ const input = new ReadableStream({
77
+ start(controller) {
78
+ controller.enqueue(new Uint8Array([1]));
79
+ },
80
+ });
81
+ const output = input.pipeThrough(collector);
82
+ await output.cancel("caller went away");
83
+ await vi.advanceTimersByTimeAsync(500);
84
+ expect(vi.getTimerCount()).toBe(0);
85
+ });
74
86
  it("uses correct streamId in emitted messages", async () => {
75
87
  const collector = createStatsCollector("my-unique-id", 10000);
76
88
  const input = new ReadableStream({
package/stats-stream.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stats-stream.test.js","sourceRoot":"","sources":["../jsr/stats-stream.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stats-stream.test.js","sourceRoot":"","sources":["../jsr/stats-stream.test.ts"],"names":[],"mappings":"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"}