@modular-prompt/driver 0.14.0 → 0.15.0

package/dist/local-inference/queue-types.d.ts

@@ -0,0 +1,54 @@
+import { Readable } from 'stream';
+import type { InferenceCapabilities, InferenceCapabilitiesRequest, InferenceFormatTestRequest, InferenceFormatTestResult, InferenceRenderRequest, InferenceRenderResult, InferenceTokenizeRequest, InferenceTokenizeResult, InferenceChatRequest, InferenceCompletionRequest, InferenceGenerateRequest, InferenceCachePrefillRequest, InferenceCachePrefillResult, InferenceMessage, InferenceRequest, InferenceSamplingOptions } from './protocol.js';
+/** 旧プロトコル互換のストリーミングリクエスト形状。
+ * options は LIP ワイヤ形式（snake_case）または mapper 通過後の Record を受け付ける。
+ * 旧 LegacyMlxRequest の MlxMlModelOptions 専用型から意図的に拡張（挙動は mapper 経由で同等）。 */
+export interface LegacyStreamingRequest {
+    messages: InferenceMessage[];
+    prompt?: string;
+    primer?: string;
+    options?: InferenceSamplingOptions | Record<string, unknown>;
+}
+export interface BaseQueueItem {
+    request: InferenceRequest | LegacyStreamingRequest;
+    expectJsonResponse?: boolean;
+    reject?: (reason: Error) => void;
+}
+export interface CapabilitiesQueueItem extends BaseQueueItem {
+    request: InferenceCapabilitiesRequest;
+    resolve: (value: InferenceCapabilities) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface FormatTestQueueItem extends BaseQueueItem {
+    request: InferenceFormatTestRequest;
+    resolve: (value: InferenceFormatTestResult) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface RenderQueueItem extends BaseQueueItem {
+    request: InferenceRenderRequest;
+    resolve: (value: InferenceRenderResult) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface TokenizeQueueItem extends BaseQueueItem {
+    request: InferenceTokenizeRequest;
+    resolve: (value: InferenceTokenizeResult) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface CachePrefillQueueItem extends BaseQueueItem {
+    request: InferenceCachePrefillRequest;
+    resolve: (value: InferenceCachePrefillResult) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse: true;
+}
+export interface StreamingQueueItem extends BaseQueueItem {
+    request: InferenceChatRequest | InferenceCompletionRequest | InferenceGenerateRequest | LegacyStreamingRequest;
+    resolve: (value: Readable) => void;
+    reject: (reason: Error) => void;
+    expectJsonResponse?: false;
+}
+export type QueueItem = CapabilitiesQueueItem | FormatTestQueueItem | RenderQueueItem | TokenizeQueueItem | CachePrefillQueueItem | StreamingQueueItem;
+//# sourceMappingURL=queue-types.d.ts.map

package/dist/local-inference/queue-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue-types.d.ts","sourceRoot":"","sources":["../../src/local-inference/queue-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,EACV,qBAAqB,EACrB,4BAA4B,EAC5B,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,qBAAqB,EACrB,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,wBAAwB,EACxB,4BAA4B,EAC5B,2BAA2B,EAC3B,gBAAgB,EAChB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,eAAe,CAAC;AAEvB;;2EAE2E;AAC3E,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,wBAAwB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9D;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,gBAAgB,GAAG,sBAAsB,CAAC;IACnD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,OAAO,EAAE,4BAA4B,CAAC;IACtC,OAAO,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAChD,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACxD,OAAO,EAAE,0BAA0B,CAAC;IACpC,OAAO,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,IAAI,CAAC;IACpD,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,OAAO,EAAE,sBAAsB,CAAC;IAChC,OAAO,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;IAChD,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,OAAO,EAAE,wBAAwB,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,CAAC;IAClD,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IAC1D,OAAO,EAAE,4BAA4B,CAAC;IACtC,OAAO,EAAE,CAAC,KAAK,EAAE,2BAA2B,KAAK,IAAI,CAAC;IACtD,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,kBAAkB,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACvD,OAAO,EAAE,oBAAoB,GAAG,0BAA0B,GAAG,wBAAwB,GAAG,sBAAsB,CAAC;IAC/G,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;IACnC,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAChC,kBAAkB,CAAC,EAAE,KAAK,CAAC;CAC5B;AAED,MAAM,MAAM,SAAS,GACjB,qBAAqB,GACrB,mBAAmB,GACnB,eAAe,GACf,iBAAiB,GACjB,qBAAqB,GACrB,kBAAkB,CAAC"}

package/dist/local-inference/queue-types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=queue-types.js.map

package/dist/local-inference/queue-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue-types.js","sourceRoot":"","sources":["../../src/local-inference/queue-types.ts"],"names":[],"mappings":""}

package/dist/local-inference/request-queue.d.ts

@@ -0,0 +1,36 @@
+/**
+ * LIP JSON-RPC リクエストキュー
+ */
+import { Readable } from 'stream';
+import type { InferenceCapabilities, InferenceFormatTestResult, InferenceRenderResult, InferenceTokenizeResult, InferenceCachePrefillResult, InferenceMessage, InferenceToolDefinition, InferenceSamplingOptions } from './protocol.js';
+export interface RequestQueueCallbacks {
+    sendToProcess: (data: string) => void;
+    createNewStream: () => Readable;
+    cancelActiveStream: () => void;
+}
+export type SamplingOptionsMapper = (options?: unknown) => InferenceSamplingOptions | Record<string, unknown> | undefined;
+export declare class InferenceRequestQueue {
+    private queue;
+    private isProcessing;
+    private callbacks;
+    private mapSamplingOptions;
+    constructor(callbacks: RequestQueueCallbacks, mapSamplingOptions?: SamplingOptionsMapper);
+    addCapabilitiesRequest(): Promise<InferenceCapabilities>;
+    addFormatTestRequest(messages: InferenceMessage[], options?: {
+        primer?: string;
+    }): Promise<InferenceFormatTestResult>;
+    addRenderRequest(messages: InferenceMessage[], options?: InferenceSamplingOptions & {
+        primer?: string;
+    }, tools?: InferenceToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<InferenceRenderResult>;
+    addTokenizeRequest(messages: InferenceMessage[], tools?: InferenceToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<InferenceTokenizeResult>;
+    addCachePrefillRequest(cachePath: string, messages: InferenceMessage[], baseCachePath?: string, trimToTokens?: number, prefixOffsets?: number[], prefixHashes?: string[], tools?: InferenceToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<InferenceCachePrefillResult>;
+    addCompletionRequest(prompt: string, options?: unknown, images?: string[], maxImageSize?: number): Promise<Readable>;
+    addGenerateRequest(prompt: string | number[], options?: unknown, images?: string[], maxImageSize?: number, cachePath?: string, cacheTrimTokens?: number, primer?: string): Promise<Readable>;
+    processNext(): void;
+    handleJsonResponse(jsonData: string): void;
+    onRequestCompleted(): void;
+    cancelActiveRequest(): void;
+    get length(): number;
+    rejectAll(error: Error): void;
+}
+//# sourceMappingURL=request-queue.d.ts.map

package/dist/local-inference/request-queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-queue.d.ts","sourceRoot":"","sources":["../../src/local-inference/request-queue.ts"],"names":[],"mappings":"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"}

package/dist/{mlx-ml/process/queue.js → local-inference/request-queue.js}

@@ -1,15 +1,14 @@
 /**
- * MLX Driver キュー管理システム
- *
- * リクエストキューの管理とプロセッシングロジックを提供
+ * LIP JSON-RPC リクエストキュー
  */
-import { mapOptionsToPython } from './parameter-mapper.js';
-export class QueueManager {
+export class InferenceRequestQueue {
     queue = [];
     isProcessing = false;
     callbacks;
-    constructor(callbacks) {
+    mapSamplingOptions;
+    constructor(callbacks, mapSamplingOptions) {
         this.callbacks = callbacks;
+        this.mapSamplingOptions = mapSamplingOptions ?? ((options) => options);
     }
     addCapabilitiesRequest() {
         return new Promise((resolve, reject) => {
@@ -18,7 +17,7 @@ export class QueueManager {
                 request,
                 resolve,
                 reject,
-                expectJsonResponse: true
+                expectJsonResponse: true,
             });
             this.processNext();
         });
@@ -28,22 +27,29 @@ export class QueueManager {
             const request = {
                 method: 'format_test',
                 messages,
-                options
+                options,
             };
             this.queue.push({
                 request,
                 resolve,
                 reject,
-                expectJsonResponse: true
+                expectJsonResponse: true,
             });
             this.processNext();
         });
     }
-    addTokenizeRequest(messages, tools, reasoningEffort) {
+    addRenderRequest(messages, options, tools, reasoningEffort) {
         return new Promise((resolve, reject) => {
+            const mappedOptions = options
+                ? {
+                    ...(this.mapSamplingOptions(options) ?? {}),
+                    ...(options.primer ? { primer: options.primer } : {}),
+                }
+                : undefined;
             const request = {
-                method: 'tokenize',
+                method: 'render',
                 messages,
+                ...(mappedOptions && Object.keys(mappedOptions).length > 0 ? { options: mappedOptions } : {}),
                 ...(tools && { tools }),
                 ...(reasoningEffort && { reasoning_effort: reasoningEffort }),
             };
@@ -51,35 +57,26 @@ export class QueueManager {
                 request,
                 resolve,
                 reject,
-                expectJsonResponse: true
+                expectJsonResponse: true,
             });
             this.processNext();
         });
     }
-    addChatRequest(messages, primer, options, tools, images, maxImageSize, reasoningEffort, cachePath, cacheTrimTokens) {
+    addTokenizeRequest(messages, tools, reasoningEffort) {
         return new Promise((resolve, reject) => {
-            try {
-                const request = {
-                    method: 'chat',
-                    messages,
-                    primer,
-                    tools,
-                    options: mapOptionsToPython(options, true),
-                    ...(images?.length ? { images, maxImageSize } : {}),
-                    ...(reasoningEffort ? { reasoning_effort: reasoningEffort } : {}),
-                    ...(cachePath ? { cache_path: cachePath } : {}),
-                    ...(cacheTrimTokens != null ? { cache_trim_tokens: cacheTrimTokens } : {}),
-                };
-                this.queue.push({
-                    request,
-                    resolve,
-                    reject,
-                });
-                this.processNext();
-            }
-            catch (error) {
-                reject(error);
-            }
+            const request = {
+                method: 'tokenize',
+                messages,
+                ...(tools && { tools }),
+                ...(reasoningEffort && { reasoning_effort: reasoningEffort }),
+            };
+            this.queue.push({
+                request,
+                resolve,
+                reject,
+                expectJsonResponse: true,
+            });
+            this.processNext();
         });
     }
     addCachePrefillRequest(cachePath, messages, baseCachePath, trimToTokens, prefixOffsets, prefixHashes, tools, reasoningEffort) {
@@ -109,7 +106,7 @@ export class QueueManager {
                 const request = {
                     method: 'completion',
                     prompt,
-                    options: mapOptionsToPython(options, true),
+                    options: this.mapSamplingOptions(options),
                     ...(images?.length ? { images, maxImageSize } : {}),
                 };
                 this.queue.push({
@@ -124,20 +121,42 @@ export class QueueManager {
             }
         });
     }
+    addGenerateRequest(prompt, options, images, maxImageSize, cachePath, cacheTrimTokens, primer) {
+        return new Promise((resolve, reject) => {
+            try {
+                const request = {
+                    method: 'generate',
+                    prompt,
+                    ...(primer ? { primer } : {}),
+                    options: this.mapSamplingOptions(options),
+                    ...(images?.length ? { images, maxImageSize } : {}),
+                    ...(cachePath ? { cache_path: cachePath } : {}),
+                    ...(cacheTrimTokens != null ? { cache_trim_tokens: cacheTrimTokens } : {}),
+                };
+                this.queue.push({
+                    request,
+                    resolve,
+                    reject,
+                });
+                this.processNext();
+            }
+            catch (error) {
+                reject(error);
+            }
+        });
+    }
     processNext() {
         if (this.isProcessing || this.queue.length === 0) {
             return;
         }
         this.isProcessing = true;
-        const queueItem = this.queue[0]; // まだshiftしない
+        const queueItem = this.queue[0];
         const { request, expectJsonResponse } = queueItem;
-        // ストリーミングレスポンスの場合のみcurrentStreamを設定
         if (!expectJsonResponse) {
             const stream = this.callbacks.createNewStream();
             queueItem.resolve(stream);
-            this.queue.shift(); // ここでshiftする
+            this.queue.shift();
         }
-        // リクエストを送信
         const input = JSON.stringify(request);
         this.callbacks.sendToProcess(input + '\n');
     }
@@ -147,8 +166,6 @@ export class QueueManager {
             if (queueItem?.expectJsonResponse) {
                 try {
                     const jsonResponse = JSON.parse(jsonData);
-                    // format_test has its own error field in MlxFormatTestResult — resolve if well-formed,
-                    // but reject bare protocol errors (missing template_applied indicates server-side exception)
                     if (queueItem.request.method === 'format_test') {
                         if ('template_applied' in jsonResponse) {
                             queueItem.resolve(jsonResponse);
@@ -158,7 +175,18 @@ export class QueueManager {
                                 formatted_prompt: null,
                                 template_applied: false,
                                 model_specific_processing: null,
-                                error: jsonResponse.error || 'Malformed format_test response'
+                                error: jsonResponse.error || 'Malformed format_test response',
+                            });
+                        }
+                    }
+                    else if (queueItem.request.method === 'render') {
+                        if ('formatted_prompt' in jsonResponse || jsonResponse.error) {
+                            queueItem.resolve(jsonResponse);
+                        }
+                        else {
+                            queueItem.resolve({
+                                formatted_prompt: null,
+                                error: jsonResponse.error || 'Malformed render response',
                             });
                         }
                     }
@@ -170,7 +198,7 @@ export class QueueManager {
                             queueItem.resolve({
                                 token_ids: null,
                                 token_count: 0,
-                                error: jsonResponse.error || 'Malformed tokenize response'
+                                error: jsonResponse.error || 'Malformed tokenize response',
                             });
                         }
                     }
@@ -189,7 +217,7 @@ export class QueueManager {
                         queueItem.resolve({
                             methods: [],
                             special_tokens: {},
-                            features: { apply_chat_template: false }
+                            features: { apply_chat_template: false },
                         });
                     }
                     else if (queueItem.request.method === 'format_test') {
@@ -197,14 +225,20 @@ export class QueueManager {
                             formatted_prompt: null,
                             template_applied: false,
                             model_specific_processing: null,
-                            error: e instanceof Error ? e.message : 'Unknown error'
+                            error: e instanceof Error ? e.message : 'Unknown error',
+                        });
+                    }
+                    else if (queueItem.request.method === 'render') {
+                        queueItem.resolve({
+                            formatted_prompt: null,
+                            error: e instanceof Error ? e.message : 'Unknown error',
                         });
                     }
                     else if (queueItem.request.method === 'tokenize') {
                         queueItem.resolve({
                             token_ids: null,
                             token_count: 0,
-                            error: e instanceof Error ? e.message : 'Unknown error'
+                            error: e instanceof Error ? e.message : 'Unknown error',
                         });
                     }
                     else if (queueItem.request.method === 'cache_prefill') {
@@ -216,7 +250,7 @@ export class QueueManager {
     }
     onRequestCompleted() {
         this.isProcessing = false;
-        this.processNext(); // 次のリクエストを処理
+        this.processNext();
     }
     cancelActiveRequest() {
         if (!this.isProcessing) {
@@ -227,9 +261,6 @@ export class QueueManager {
     get length() {
         return this.queue.length;
     }
-    get isEmpty() {
-        return this.queue.length === 0;
-    }
     rejectAll(error) {
         const pending = this.queue.splice(0);
         for (const item of pending) {
@@ -237,9 +268,5 @@ export class QueueManager {
         }
         this.isProcessing = false;
     }
-    clear() {
-        this.queue = [];
-        this.isProcessing = false;
-    }
 }
-//# sourceMappingURL=queue.js.map
+//# sourceMappingURL=request-queue.js.map

package/dist/local-inference/request-queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-queue.js","sourceRoot":"","sources":["../../src/local-inference/request-queue.ts"],"names":[],"mappings":"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"}

package/dist/local-inference/stream-utils.d.ts

@@ -0,0 +1,19 @@
+import { Readable } from 'stream';
+export interface StreamMeta {
+    prompt_tokens?: number;
+    generation_tokens?: number;
+}
+export declare const META_MARKER = "\u001E__META__:";
+export declare function extractStreamMeta(content: string): {
+    content: string;
+    meta: StreamMeta;
+};
+export declare function createStreamIterable(stream: Readable, isAborted?: () => boolean): {
+    iterable: AsyncIterable<string>;
+    completion: Promise<{
+        content: string;
+        meta: StreamMeta;
+        error: Error | null;
+    }>;
+};
+//# sourceMappingURL=stream-utils.d.ts.map

package/dist/local-inference/stream-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-utils.d.ts","sourceRoot":"","sources":["../../src/local-inference/stream-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,MAAM,WAAW,UAAU;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,WAAW,oBAAkB,CAAC;AAE3C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CASxF;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,QAAQ,EAChB,SAAS,CAAC,EAAE,MAAM,OAAO,GACxB;IACD,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CACjF,CA0DA"}

package/dist/local-inference/stream-utils.js

@@ -0,0 +1,76 @@
+export const META_MARKER = '\x1e__META__:';
+export function extractStreamMeta(content) {
+    const idx = content.lastIndexOf(META_MARKER);
+    if (idx === -1)
+        return { content, meta: {} };
+    const jsonStr = content.slice(idx + META_MARKER.length);
+    try {
+        return { content: content.slice(0, idx), meta: JSON.parse(jsonStr) };
+    }
+    catch {
+        return { content: content.slice(0, idx), meta: {} };
+    }
+}
+export function createStreamIterable(stream, isAborted) {
+    const chunks = [];
+    let resolveCompletion;
+    let settled = false;
+    const settle = (error) => {
+        if (settled)
+            return;
+        settled = true;
+        const raw = chunks.join('');
+        const { content, meta } = extractStreamMeta(raw);
+        const aborted = isAborted?.() ?? false;
+        resolveCompletion({ content, meta, error: aborted ? null : error });
+    };
+    const completion = new Promise((resolve) => {
+        resolveCompletion = resolve;
+    });
+    const iterable = {
+        async *[Symbol.asyncIterator]() {
+            try {
+                let buffer = '';
+                let markerFound = false;
+                for await (const chunk of stream) {
+                    if (isAborted?.()) {
+                        break;
+                    }
+                    const str = chunk.toString();
+                    chunks.push(str);
+                    if (markerFound)
+                        continue;
+                    buffer += str;
+                    const markerIdx = buffer.indexOf(META_MARKER);
+                    if (markerIdx !== -1) {
+                        const text = buffer.slice(0, markerIdx);
+                        if (text)
+                            yield text;
+                        markerFound = true;
+                    }
+                    else {
+                        const safeLen = buffer.length - (META_MARKER.length - 1);
+                        if (safeLen > 0) {
+                            yield buffer.slice(0, safeLen);
+                            buffer = buffer.slice(safeLen);
+                        }
+                    }
+                }
+                if (!markerFound && buffer)
+                    yield buffer;
+            }
+            catch (error) {
+                settle(error);
+                const aborted = isAborted?.() ?? false;
+                if (!aborted) {
+                    throw error;
+                }
+            }
+            finally {
+                settle(null);
+            }
+        },
+    };
+    return { iterable, completion };
+}
+//# sourceMappingURL=stream-utils.js.map

package/dist/local-inference/stream-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-utils.js","sourceRoot":"","sources":["../../src/local-inference/stream-utils.ts"],"names":[],"mappings":"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"}

package/dist/mlx-ml/mlx-cache-support.d.ts

@@ -0,0 +1,23 @@
+import type { FormatterOptions } from '../formatter/types.js';
+import type { InferenceMessage } from '../local-inference/protocol.js';
+import type { LocalInferenceCacheSupport } from '../local-inference/adapters.js';
+import type { InferenceProcessPort } from '../local-inference/process-port.js';
+import type { PromptCacheController } from '../cache-controller.js';
+/**
+ * MLX 向け KV キャッシュ連携を構築する。
+ * `PromptCacheController` が `MlxCacheController` でない場合は undefined（旧挙動と同様）。
+ * PyTorch 等の別バックエンド用 adapter は将来ここに並列で追加する。
+ */
+export declare function createMlxCacheSupport(controller: PromptCacheController): LocalInferenceCacheSupport | undefined;
+export declare function bindMlxCacheOnCapabilitiesLoaded(cache: LocalInferenceCacheSupport, cacheBound: {
+    bound: boolean;
+}, runtimeInfo: {
+    model_kind?: 'lm' | 'vlm';
+}, ctx: {
+    process: InferenceProcessPort;
+    formatterOptions: FormatterOptions;
+    modelProcessor: {
+        applyChatSpecificProcessing(messages: InferenceMessage[]): InferenceMessage[];
+    };
+}, onVlmDisabled: () => void): Promise<void>;
+//# sourceMappingURL=mlx-cache-support.d.ts.map

package/dist/mlx-ml/mlx-cache-support.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mlx-cache-support.d.ts","sourceRoot":"","sources":["../../src/mlx-ml/mlx-cache-support.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAEV,0BAA0B,EAC3B,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,qBAAqB,GAChC,0BAA0B,GAAG,SAAS,CA6BxC;AAED,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,0BAA0B,EACjC,UAAU,EAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,EAC9B,WAAW,EAAE;IAAE,UAAU,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;CAAE,EAC1C,GAAG,EAAE;IACH,OAAO,EAAE,oBAAoB,CAAC;IAC9B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,EAAE;QAAE,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,EAAE,CAAA;KAAE,CAAC;CACnG,EACD,aAAa,EAAE,MAAM,IAAI,GACxB,OAAO,CAAC,IAAI,CAAC,CAef"}

package/dist/mlx-ml/mlx-cache-support.js

@@ -0,0 +1,45 @@
+import { MlxCacheController } from './mlx-cache-controller.js';
+/**
+ * MLX 向け KV キャッシュ連携を構築する。
+ * `PromptCacheController` が `MlxCacheController` でない場合は undefined（旧挙動と同様）。
+ * PyTorch 等の別バックエンド用 adapter は将来ここに並列で追加する。
+ */
+export function createMlxCacheSupport(controller) {
+    if (!(controller instanceof MlxCacheController)) {
+        return undefined;
+    }
+    const mlxCache = controller;
+    return {
+        async bind(process, formatterOptions, preprocess) {
+            await mlxCache.bind(process, formatterOptions, preprocess);
+        },
+        shouldDisableForVlm: (modelKind) => modelKind === 'vlm',
+        recordQuery: () => mlxCache.recordQuery?.(),
+        getGrowthBefore: () => mlxCache.getStats().cacheGrowthTokens,
+        getWriteTokensSince: (growthBefore) => Math.max(0, mlxCache.getStats().cacheGrowthTokens - growthBefore),
+        prepare: (params) => mlxCache.prepare(params),
+        readTokenCount: (cachePath) => mlxCache.readCacheTokenCount(cachePath),
+        recordPromptTokens: (promptTokens, cacheTokensUsed) => {
+            mlxCache.recordPromptTokens(promptTokens, cacheTokensUsed);
+        },
+        logStats: () => {
+            // MlxDriver.close() で QueryLogger 経由のログを行う
+        },
+        close: () => mlxCache.close(),
+    };
+}
+export function bindMlxCacheOnCapabilitiesLoaded(cache, cacheBound, runtimeInfo, ctx, onVlmDisabled) {
+    if (cacheBound.bound) {
+        return Promise.resolve();
+    }
+    if (cache.shouldDisableForVlm(runtimeInfo.model_kind)) {
+        onVlmDisabled();
+        return Promise.resolve();
+    }
+    return cache
+        .bind(ctx.process, ctx.formatterOptions, (msgs) => ctx.modelProcessor.applyChatSpecificProcessing(msgs))
+        .then(() => {
+        cacheBound.bound = true;
+    });
+}
+//# sourceMappingURL=mlx-cache-support.js.map

package/dist/mlx-ml/mlx-cache-support.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mlx-cache-support.js","sourceRoot":"","sources":["../../src/mlx-ml/mlx-cache-support.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CACnC,UAAiC;IAEjC,IAAI,CAAC,CAAC,UAAU,YAAY,kBAAkB,CAAC,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC;IAC5B,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,UAAU;YAC9C,MAAM,QAAQ,CAAC,IAAI,CACjB,OAAoD,EACpD,gBAAgB,EAChB,UAAU,CACX,CAAC;QACJ,CAAC;QACD,mBAAmB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,KAAK;QACvD,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE;QAC3C,eAAe,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,iBAAiB;QAC5D,mBAAmB,EAAE,CAAC,YAAY,EAAE,EAAE,CACpC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,iBAAiB,GAAG,YAAY,CAAC;QACnE,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAgC;QAC5E,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC;QACtE,kBAAkB,EAAE,CAAC,YAAY,EAAE,eAAe,EAAE,EAAE;YACpD,QAAQ,CAAC,kBAAkB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;QAC7D,CAAC;QACD,QAAQ,EAAE,GAAG,EAAE;YACb,2CAA2C;QAC7C,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE;KAC9B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,KAAiC,EACjC,UAA8B,EAC9B,WAA0C,EAC1C,GAIC,EACD,aAAyB;IAEzB,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,aAAa,EAAE,CAAC;QAChB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO,KAAK;SACT,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE,CAChD,GAAG,CAAC,cAAc,CAAC,2BAA2B,CAAC,IAAI,CAAC,CACrD;SACA,IAAI,CAAC,GAAG,EAAE;QACT,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;IAC1B,CAAC,CAAC,CAAC;AACP,CAAC"}