@llumiverse/core 1.4.0 → 1.5.0-dev.20260713.114357Z

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 CHANGED
@@ -54,14 +54,14 @@ Vercel's SDK is fantastic for frontend/full-stack React/Next.js applications.
54
54
 
55
55
  ## Requirements
56
56
 
57
- * Node.js 22+
57
+ * Node.js 24.x
58
58
  * Bun 1.0+ (experimental support)
59
59
 
60
60
  ## Installation
61
61
 
62
62
  **For most use cases (recommended):**
63
63
  ```bash
64
- npm install @llumiverse/core @llumiverse/drivers
64
+ pnpm add @llumiverse/core @llumiverse/drivers
65
65
  ```
66
66
 
67
67
  * `@llumiverse/core`: The interfaces, types, and base abstractions.
@@ -220,4 +220,4 @@ Please see [CONTRIBUTING.md](https://github.com/vertesia/llumiverse/blob/main/CO
220
220
 
221
221
  ## License
222
222
 
223
- Apache 2.0
223
+ Apache 2.0
@@ -35,7 +35,7 @@ export function accumulateToolUseChunk(accumulatedToolUse, tool) {
35
35
  const newInput = tool.tool_input;
36
36
  if (typeof existingInput === 'string' && typeof newInput === 'string') {
37
37
  // Concatenate string arguments
38
- existing.tool_input = (existingInput + newInput);
38
+ existing.tool_input = existingInput + newInput;
39
39
  }
40
40
  else if (existingInput && typeof existingInput === 'object' && newInput && typeof newInput === 'object') {
41
41
  // Merge objects
@@ -1 +1 @@
1
- {"version":3,"file":"CompletionStream.js","sourceRoot":"","sources":["../src/CompletionStream.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CompletionStream.js","sourceRoot":"","sources":["../src/CompletionStream.ts"],"names":[],"mappings":"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"}
@@ -34,12 +34,10 @@ export declare function createDriverHttpAgent(opts?: HttpTimeoutOptions): Agent;
34
34
  * drop-in replacement for global `fetch` in drivers that make raw HTTP
35
35
  * calls.
36
36
  *
37
- * `@vertesia/api-fetch-client` builds requests with `globalThis.Request`,
38
- * while the undici package uses its own `Request` class. Calling
39
- * `undici.fetch` directly can parse a global Request as `"[object Request]"`.
40
- * Use `globalThis.fetch` (undici-backed in Node/Bun) and pass the undici
41
- * dispatcher extension through init so the Agent timeout behavior is still
42
- * applied without crossing Request/Response implementations.
37
+ * `@vertesia/api-fetch-client` builds requests with `globalThis.Request`.
38
+ * Keep that Request intact and pass the undici dispatcher extension through
39
+ * init so the Agent timeout behavior is applied without rebuilding streamed
40
+ * request bodies.
43
41
  */
44
42
  export declare function createAgentBackedFetch(agent: Agent): typeof fetch;
45
43
  export interface DriverHttpAgentScope {
@@ -1 +1 @@
1
- {"version":3,"file":"http-agent.d.ts","sourceRoot":"","sources":["../src/http-agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,kBAAkB,CAKrE,CAAC;AAIF,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAOjG;AAED,wBAAgB,6BAA6B,CACzC,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,QAAQ,CAAC,EAAE,kBAAkB,GAC9B,kBAAkB,GAAG,SAAS,CAQhC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK,CAQtE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,KAAK,CAajE;AAED,MAAM,WAAW,oBAAoB;IACjC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAOD,wBAAgB,0BAA0B,CACtC,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,QAAQ,CAAC,EAAE,kBAAkB,GAC9B,oBAAoB,CActB;AAkDD;mDACmD;AACnD,YAAY,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC"}
1
+ {"version":3,"file":"http-agent.d.ts","sourceRoot":"","sources":["../src/http-agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE/B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,kBAAkB,CAKrE,CAAC;AAIF,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAOjG;AAED,wBAAgB,6BAA6B,CACzC,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,QAAQ,CAAC,EAAE,kBAAkB,GAC9B,kBAAkB,GAAG,SAAS,CAQhC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,KAAK,CAQtE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,KAAK,CAQjE;AAED,MAAM,WAAW,oBAAoB;IACjC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAOD,wBAAgB,0BAA0B,CACtC,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,QAAQ,CAAC,EAAE,kBAAkB,GAC9B,oBAAoB,CActB;AAeD;mDACmD;AACnD,YAAY,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAC"}
package/lib/http-agent.js CHANGED
@@ -63,21 +63,16 @@ export function createDriverHttpAgent(opts) {
63
63
  * drop-in replacement for global `fetch` in drivers that make raw HTTP
64
64
  * calls.
65
65
  *
66
- * `@vertesia/api-fetch-client` builds requests with `globalThis.Request`,
67
- * while the undici package uses its own `Request` class. Calling
68
- * `undici.fetch` directly can parse a global Request as `"[object Request]"`.
69
- * Use `globalThis.fetch` (undici-backed in Node/Bun) and pass the undici
70
- * dispatcher extension through init so the Agent timeout behavior is still
71
- * applied without crossing Request/Response implementations.
66
+ * `@vertesia/api-fetch-client` builds requests with `globalThis.Request`.
67
+ * Keep that Request intact and pass the undici dispatcher extension through
68
+ * init so the Agent timeout behavior is applied without rebuilding streamed
69
+ * request bodies.
72
70
  */
73
71
  export function createAgentBackedFetch(agent) {
74
72
  return ((input, init) => {
75
- const requestInput = typeof Request !== 'undefined' && input instanceof Request
76
- ? normalizeRequestInput(input, init)
77
- : { input, init };
78
73
  const dispatcher = scopedHttpAgent.getStore() ?? agent;
79
- return globalThis.fetch(requestInput.input, {
80
- ...(requestInput.init ?? {}),
74
+ return globalThis.fetch(input, {
75
+ ...(stripUndefinedRequestInit(init) ?? {}),
81
76
  dispatcher,
82
77
  });
83
78
  });
@@ -100,33 +95,6 @@ export function createDriverHttpAgentScope(defaults, override) {
100
95
  },
101
96
  };
102
97
  }
103
- function normalizeRequestInput(request, init) {
104
- const overrides = stripUndefinedRequestInit(init);
105
- const requestInit = {
106
- method: request.method,
107
- headers: request.headers,
108
- body: request.body,
109
- signal: request.signal,
110
- cache: request.cache,
111
- credentials: request.credentials,
112
- integrity: request.integrity,
113
- keepalive: request.keepalive,
114
- mode: request.mode,
115
- redirect: request.redirect,
116
- referrer: request.referrer,
117
- referrerPolicy: request.referrerPolicy,
118
- };
119
- if (request.body) {
120
- requestInit.duplex = 'half';
121
- }
122
- return {
123
- input: request.url,
124
- init: {
125
- ...requestInit,
126
- ...overrides,
127
- },
128
- };
129
- }
130
98
  function stripUndefinedRequestInit(init) {
131
99
  if (!init) {
132
100
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"http-agent.js","sourceRoot":"","sources":["../src/http-agent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"http-agent.js","sourceRoot":"","sources":["../src/http-agent.ts"],"names":[],"mappings":"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"}
package/lib/validation.js CHANGED
@@ -9,8 +9,8 @@ const ajv = new Ajv({
9
9
  useDefaults: true,
10
10
  removeAdditional: 'failing',
11
11
  });
12
- // biome-ignore lint/suspicious/noTsIgnore: ajv-formats default export inconsistently callable under ESM/CJS interop
13
- // @ts-ignore - ajv-formats default export is not callable under one of the TS configs in this monorepo
12
+ // biome-ignore lint/suspicious/noTsIgnore: ajv-formats' runtime module.exports is the callable plugin, but its shipped .d.ts declares an ESM default that resolves to a non-callable namespace under module:nodenext; no cast-free import form works
13
+ // @ts-ignore - ajv-formats default export is not callable under module:nodenext ESM resolution
14
14
  addFormats(ajv);
15
15
  function errorMessage(error) {
16
16
  return error instanceof Error ? error.message : String(error);
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@llumiverse/core",
3
- "version": "1.4.0",
3
+ "version": "1.5.0-dev.20260713.114357Z",
4
4
  "type": "module",
5
5
  "description": "Provide an universal API to LLMs. Support for existing LLMs can be added by writing a driver.",
6
6
  "files": [
@@ -62,15 +62,15 @@
62
62
  "@vertesia/api-fetch-client": "^1.3.0",
63
63
  "rimraf": "^6.1.3",
64
64
  "typescript": "^6.0.3",
65
- "vitest": "^4.1.8"
65
+ "vitest": "^4.1.9"
66
66
  },
67
67
  "dependencies": {
68
68
  "@types/node": "^24.13.2",
69
69
  "ajv": "^8.20.0",
70
70
  "ajv-formats": "^3.0.1",
71
- "jsonrepair": "^3.14.0",
72
- "undici": "^7.27.2",
73
- "@llumiverse/common": "1.4.0"
71
+ "jsonrepair": "^3.14.1",
72
+ "undici": "^7.28.0",
73
+ "@llumiverse/common": "1.5.0-dev.20260713.114357Z"
74
74
  },
75
75
  "scripts": {
76
76
  "lint": "biome lint src",
@@ -48,17 +48,17 @@ export function accumulateToolUseChunk(
48
48
  }
49
49
  // Merge tool input (for streaming where arguments come as string pieces)
50
50
  if (tool.tool_input !== null && tool.tool_input !== undefined) {
51
- const existingInput = existing.tool_input as unknown;
52
- const newInput = tool.tool_input as unknown;
51
+ const existingInput = existing.tool_input;
52
+ const newInput = tool.tool_input;
53
53
  if (typeof existingInput === 'string' && typeof newInput === 'string') {
54
54
  // Concatenate string arguments
55
- existing.tool_input = (existingInput + newInput) as typeof existing.tool_input;
55
+ existing.tool_input = existingInput + newInput;
56
56
  } else if (existingInput && typeof existingInput === 'object' && newInput && typeof newInput === 'object') {
57
57
  // Merge objects
58
58
  existing.tool_input = {
59
- ...(existingInput as Record<string, unknown>),
60
- ...(newInput as Record<string, unknown>),
61
- } as typeof existing.tool_input;
59
+ ...existingInput,
60
+ ...newInput,
61
+ };
62
62
  } else {
63
63
  existing.tool_input = tool.tool_input;
64
64
  }
@@ -148,7 +148,7 @@ export class DefaultCompletionStream<PromptT = unknown> implements CompletionStr
148
148
  // Note: During streaming, tool_input comes as string chunks that need concatenation
149
149
  if (chunk.tool_use && chunk.tool_use.length > 0) {
150
150
  for (const tool of chunk.tool_use) {
151
- accumulateToolUseChunk(accumulatedToolUse, tool as StreamingToolUse);
151
+ accumulateToolUseChunk(accumulatedToolUse, tool);
152
152
  }
153
153
  }
154
154
  if (Array.isArray(chunk.result) && chunk.result.length > 0) {
package/src/http-agent.ts CHANGED
@@ -73,23 +73,16 @@ export function createDriverHttpAgent(opts?: HttpTimeoutOptions): Agent {
73
73
  * drop-in replacement for global `fetch` in drivers that make raw HTTP
74
74
  * calls.
75
75
  *
76
- * `@vertesia/api-fetch-client` builds requests with `globalThis.Request`,
77
- * while the undici package uses its own `Request` class. Calling
78
- * `undici.fetch` directly can parse a global Request as `"[object Request]"`.
79
- * Use `globalThis.fetch` (undici-backed in Node/Bun) and pass the undici
80
- * dispatcher extension through init so the Agent timeout behavior is still
81
- * applied without crossing Request/Response implementations.
76
+ * `@vertesia/api-fetch-client` builds requests with `globalThis.Request`.
77
+ * Keep that Request intact and pass the undici dispatcher extension through
78
+ * init so the Agent timeout behavior is applied without rebuilding streamed
79
+ * request bodies.
82
80
  */
83
81
  export function createAgentBackedFetch(agent: Agent): typeof fetch {
84
82
  return ((input: RequestInfo | URL, init?: RequestInit) => {
85
- const requestInput =
86
- typeof Request !== 'undefined' && input instanceof Request
87
- ? normalizeRequestInput(input, init)
88
- : { input, init };
89
-
90
83
  const dispatcher = scopedHttpAgent.getStore() ?? agent;
91
- return globalThis.fetch(requestInput.input, {
92
- ...(requestInput.init ?? {}),
84
+ return globalThis.fetch(input, {
85
+ ...(stripUndefinedRequestInit(init) ?? {}),
93
86
  dispatcher,
94
87
  } as RequestInit & { dispatcher?: unknown });
95
88
  }) as unknown as typeof fetch;
@@ -124,41 +117,6 @@ export function createDriverHttpAgentScope(
124
117
  };
125
118
  }
126
119
 
127
- type NormalizedRequestInput = {
128
- input: RequestInfo | URL;
129
- init?: RequestInit & { duplex?: 'half' };
130
- };
131
-
132
- function normalizeRequestInput(request: Request, init?: RequestInit): NormalizedRequestInput {
133
- const overrides = stripUndefinedRequestInit(init);
134
- const requestInit: RequestInit & { duplex?: 'half' } = {
135
- method: request.method,
136
- headers: request.headers,
137
- body: request.body,
138
- signal: request.signal,
139
- cache: request.cache,
140
- credentials: request.credentials,
141
- integrity: request.integrity,
142
- keepalive: request.keepalive,
143
- mode: request.mode,
144
- redirect: request.redirect,
145
- referrer: request.referrer,
146
- referrerPolicy: request.referrerPolicy,
147
- };
148
-
149
- if (request.body) {
150
- requestInit.duplex = 'half';
151
- }
152
-
153
- return {
154
- input: request.url,
155
- init: {
156
- ...requestInit,
157
- ...overrides,
158
- },
159
- };
160
- }
161
-
162
120
  function stripUndefinedRequestInit(init?: RequestInit): RequestInit | undefined {
163
121
  if (!init) {
164
122
  return undefined;
package/src/validation.ts CHANGED
@@ -12,8 +12,8 @@ const ajv = new Ajv({
12
12
  removeAdditional: 'failing',
13
13
  });
14
14
 
15
- // biome-ignore lint/suspicious/noTsIgnore: ajv-formats default export inconsistently callable under ESM/CJS interop
16
- // @ts-ignore - ajv-formats default export is not callable under one of the TS configs in this monorepo
15
+ // biome-ignore lint/suspicious/noTsIgnore: ajv-formats' runtime module.exports is the callable plugin, but its shipped .d.ts declares an ESM default that resolves to a non-callable namespace under module:nodenext; no cast-free import form works
16
+ // @ts-ignore - ajv-formats default export is not callable under module:nodenext ESM resolution
17
17
  addFormats(ajv);
18
18
 
19
19
  function errorMessage(error: unknown): string {