@modular-prompt/driver 0.14.0 → 0.16.0

package/dist/mlx-ml/mlx-local-inference-adapters.js

@@ -0,0 +1,19 @@
+import { mergeMlxQueryOptions, toMlxSamplingOptions } from './mlx-options.js';
+import { createModelSpecificProcessor, selectApi } from './process/model-specific.js';
+import { selectResponseProcessor } from './process/model-handlers.js';
+import { generateMergedPrompt } from './process/prompt-builder.js';
+import { formatToolDefinitionsAsText } from './tool-call-parser/index.js';
+import { convertMessages, convertToolDefinitions, extractImagePaths, } from './mlx-message-utils.js';
+export const mlxLocalInferenceAdapters = {
+    mergeQueryOptions: (defaults, options) => mergeMlxQueryOptions(defaults, options),
+    toSamplingOptions: (merged) => toMlxSamplingOptions(merged),
+    createModelProcessor: (model) => createModelSpecificProcessor(model),
+    selectResponseProcessor: (model, runtimeInfo, opts) => selectResponseProcessor(model, runtimeInfo, opts),
+    convertToolDefinitions,
+    convertMessages,
+    extractImagePaths,
+    formatToolDefinitionsAsText,
+    generateMergedPrompt,
+    selectApi,
+};
+//# sourceMappingURL=mlx-local-inference-adapters.js.map

package/dist/mlx-ml/mlx-local-inference-adapters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mlx-local-inference-adapters.js","sourceRoot":"","sources":["../../src/mlx-ml/mlx-local-inference-adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EACL,eAAe,EACf,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAGhC,MAAM,CAAC,MAAM,yBAAyB,GAA2B;IAC/D,iBAAiB,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CACvC,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAA4B;IACpE,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAA4B;IACtF,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,4BAA4B,CAAC,KAAK,CAAC;IACpE,uBAAuB,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CACpD,uBAAuB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC;IACnD,sBAAsB;IACtB,eAAe;IACf,iBAAiB;IACjB,2BAA2B;IAC3B,oBAAoB;IACpB,SAAS;CACV,CAAC"}

package/dist/mlx-ml/mlx-options.d.ts

@@ -0,0 +1,19 @@
+import type { QueryOptions } from '../types.js';
+import type { MlxMlModelOptions } from './types.js';
+/** MLX 固有のサンプリングパラメータ（QueryOptions に無いもの） */
+export type MlxSamplingExtras = Pick<MlxMlModelOptions, 'repetitionPenalty' | 'repetitionContextSize' | 'trustRemoteCode'>;
+/**
+ * MLX ドライバーのクエリオプション。
+ * 共通 QueryOptions + MLX 固有サンプリング。Python 層には toMlxSamplingOptions で変換して渡す。
+ */
+export type MlxQueryOptions = QueryOptions & Partial<MlxSamplingExtras>;
+/**
+ * defaultOptions と per-query オプションをマージする（他ドライバーと同じパターン）。
+ */
+export declare function mergeMlxQueryOptions(defaults?: Partial<MlxQueryOptions>, overrides?: QueryOptions): MlxQueryOptions;
+/**
+ * マージ済み QueryOptions から Python 向けサンプリングパラメータのみ抽出する。
+ * mode / apiStrategy / tools / signal / cache 等は含めない。
+ */
+export declare function toMlxSamplingOptions(merged: Partial<MlxQueryOptions>): MlxMlModelOptions;
+//# sourceMappingURL=mlx-options.d.ts.map

package/dist/mlx-ml/mlx-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mlx-options.d.ts","sourceRoot":"","sources":["../../src/mlx-ml/mlx-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,6CAA6C;AAC7C,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,iBAAiB,EACjB,mBAAmB,GAAG,uBAAuB,GAAG,iBAAiB,CAClE,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAYxE;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,EACnC,SAAS,CAAC,EAAE,YAAY,GACvB,eAAe,CAEjB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,iBAAiB,CASxF"}

package/dist/mlx-ml/mlx-options.js

@@ -0,0 +1,30 @@
+const MLX_SAMPLING_KEYS = [
+    'maxTokens',
+    'temperature',
+    'topP',
+    'topK',
+    'repetitionPenalty',
+    'repetitionContextSize',
+    'trustRemoteCode',
+];
+/**
+ * defaultOptions と per-query オプションをマージする（他ドライバーと同じパターン）。
+ */
+export function mergeMlxQueryOptions(defaults, overrides) {
+    return { ...defaults, ...overrides };
+}
+/**
+ * マージ済み QueryOptions から Python 向けサンプリングパラメータのみ抽出する。
+ * mode / apiStrategy / tools / signal / cache 等は含めない。
+ */
+export function toMlxSamplingOptions(merged) {
+    const result = {};
+    for (const key of MLX_SAMPLING_KEYS) {
+        const value = merged[key];
+        if (value !== undefined) {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=mlx-options.js.map

package/dist/mlx-ml/mlx-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mlx-options.js","sourceRoot":"","sources":["../../src/mlx-ml/mlx-options.ts"],"names":[],"mappings":"AAeA,MAAM,iBAAiB,GAAG;IACxB,WAAW;IACX,aAAa;IACb,MAAM;IACN,MAAM;IACN,mBAAmB;IACnB,uBAAuB;IACvB,iBAAiB;CACsC,CAAC;AAE1D;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAmC,EACnC,SAAwB;IAExB,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;AACvC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAgC;IACnE,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACvB,MAAkC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACnD,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/mlx-ml/process/index.d.ts

@@ -1,34 +1,36 @@
 /**
  * MLX Driver 外部インターフェース
  *
- * mlx-ml.tsドライバーからアクセスされるメイン API
- * 機能をモジュール化し、役割を分離
+ * mlx-ml.ts ドライバーからアクセスされるメイン API。
+ * 通信層は LIP InferenceProcessClient に委譲する。
  */
 import { Readable } from 'stream';
 import type { MlxMlModelOptions, MlxMessage, MlxRuntimeInfo, MlxFormatTestResult, MlxTokenizeResult, MlxCachePrefillResult, MlxToolDefinition } from './types.js';
-export type { MlxMlModelOptions, MlxMessage, MlxRuntimeInfo, MlxFormatTestResult, MlxTokenizeResult, MlxCachePrefillResult, MlxToolDefinition };
+export type { MlxMlModelOptions, MlxMessage, MlxRuntimeInfo, MlxFormatTestResult, MlxTokenizeResult, MlxCachePrefillResult, MlxToolDefinition, };
 export interface MlxProcessOptions {
+    backend?: import('../../driver-registry/types.js').MlxBackendMode;
     textOnly?: boolean;
     drafterModel?: string;
     draftBlockSize?: number;
 }
 export declare class MlxProcess {
     modelName: string;
-    private queueManager;
-    private processComm;
+    private client;
     constructor(modelName: string, options?: MlxProcessOptions);
-    /**
-     * 初期化（何もしない - 互換性のために残す）
-     */
     ensureInitialized(): Promise<void>;
     getCapabilities(): Promise<MlxRuntimeInfo>;
     formatTest(messages: MlxMessage[], options?: {
         primer?: string;
     }): Promise<MlxFormatTestResult>;
+    render(messages: MlxMessage[], options?: MlxMlModelOptions & {
+        primer?: string;
+    }, tools?: MlxToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<import('../../local-inference/protocol.js').InferenceRenderResult>;
     tokenize(messages: MlxMessage[], tools?: MlxToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<MlxTokenizeResult>;
     cachePrefill(cachePath: string, messages: MlxMessage[], baseCachePath?: string, trimToTokens?: number, prefixOffsets?: number[], prefixHashes?: string[], tools?: MlxToolDefinition[], reasoningEffort?: 'low' | 'medium' | 'high'): Promise<MlxCachePrefillResult>;
+    /** @deprecated render + generate を使用すること */
     chat(messages: MlxMessage[], primer?: string, options?: MlxMlModelOptions, tools?: MlxToolDefinition[], images?: string[], maxImageSize?: number, reasoningEffort?: 'low' | 'medium' | 'high', cachePath?: string, cacheTrimTokens?: number): Promise<Readable>;
     completion(prompt: string, options?: MlxMlModelOptions, images?: string[], maxImageSize?: number): Promise<Readable>;
+    generate(prompt: string | number[], options?: MlxMlModelOptions, images?: string[], maxImageSize?: number, cachePath?: string, cacheTrimTokens?: number, primer?: string): Promise<Readable>;
     exit(): Promise<void>;
     cancelActiveRequest(): void;
     getStatus(): {

package/dist/mlx-ml/process/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EACV,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAOpB,YAAY,EACV,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,EAClB,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,qBAAa,UAAU;IACrB,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAuB;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IA6B1D;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,eAAe,IAAI,OAAO,CAAC,cAAc,CAAC;IAK1C,UAAU,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAK/F,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,KAAK,CAAC,EAAE,iBAAiB,EAAE,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKtI,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,iBAAiB,EAAE,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAKnQ,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,iBAAiB,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAK/P,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAKpH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,mBAAmB,IAAI,IAAI;IAK3B,SAAS;;;;;;CAQV"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/index.ts"],"names":[],"mappings":"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"}

package/dist/mlx-ml/process/index.js

@@ -1,84 +1,103 @@
 /**
  * MLX Driver 外部インターフェース
  *
- * mlx-ml.tsドライバーからアクセスされるメイン API
- * 機能をモジュール化し、役割を分離
+ * mlx-ml.ts ドライバーからアクセスされるメイン API。
+ * 通信層は LIP InferenceProcessClient に委譲する。
  */
-import { Logger } from '@modular-prompt/utils';
-import { QueueManager } from './queue.js';
-import { ProcessCommunication } from './process-communication.js';
-const logger = new Logger({ prefix: 'MLX', context: 'process' });
+import { getMlxPythonDir, getVenvPath, resolvePackageRootFromProcessModule, } from '../../runtime/index.js';
+import { InferenceProcessClient } from '../../local-inference/process-client.js';
+import { mapOptionsToPython } from './parameter-mapper.js';
+import { generateMergedPrompt } from './prompt-builder.js';
+const packageRoot = resolvePackageRootFromProcessModule(import.meta.url);
+const mlxPythonDir = getMlxPythonDir(packageRoot);
+const mlxVenvPath = getVenvPath('mlx');
+function buildMlxSpawnArgs(options) {
+    const args = [];
+    if (options?.backend && options.backend !== 'auto') {
+        args.push('--backend', options.backend);
+    }
+    else if (options?.textOnly) {
+        args.push('--text-only');
+    }
+    if (options?.drafterModel) {
+        args.push('--drafter', options.drafterModel);
+    }
+    if (options?.draftBlockSize !== undefined) {
+        args.push('--draft-block-size', options.draftBlockSize.toString());
+    }
+    return args;
+}
 export class MlxProcess {
     modelName;
-    queueManager;
-    processComm;
+    client;
     constructor(modelName, options) {
         this.modelName = modelName;
-        // コールバック設定
-        const processCallbacks = {
-            onJsonResponse: (jsonData) => this.queueManager.handleJsonResponse(jsonData),
-            onRequestCompleted: () => this.queueManager.onRequestCompleted(),
-            onProcessExit: (code, signal) => {
-                if (code !== 0) {
-                    const error = new Error(`MLX process exited unexpectedly (code=${code}, signal=${signal})`);
-                    logger.error(error.message);
-                    this.queueManager.rejectAll(error);
-                }
-            },
-        };
-        const queueCallbacks = {
-            sendToProcess: (data) => this.processComm.sendToProcess(data),
-            createNewStream: () => this.processComm.createNewStream(),
-            cancelActiveStream: () => this.processComm.cancelActiveStream(),
-        };
-        // 各コンポーネント初期化
-        this.processComm = new ProcessCommunication(modelName, processCallbacks, options);
-        this.queueManager = new QueueManager(queueCallbacks);
-    }
-    /**
-     * 初期化（何もしない - 互換性のために残す）
-     */
+        this.client = new InferenceProcessClient({
+            modelName,
+            pythonProjectDir: mlxPythonDir,
+            venvPath: mlxVenvPath,
+            runtimeProfile: 'mlx',
+            extraSpawnArgs: buildMlxSpawnArgs(options),
+            loggerPrefix: 'MLX',
+            mapSamplingOptions: (opts) => mapOptionsToPython(opts, true),
+            processExitErrorMessage: (code, signal) => `MLX process exited unexpectedly (code=${code}, signal=${signal})`,
+        });
+    }
     async ensureInitialized() {
-        // No-op for compatibility
+        return this.client.ensureInitialized();
     }
-    // API v2.0 Capabilities
     async getCapabilities() {
-        return this.queueManager.addCapabilitiesRequest();
+        return this.client.getCapabilities();
     }
-    // API v2.0 Format Test
     async formatTest(messages, options) {
-        return this.queueManager.addFormatTestRequest(messages, options);
+        return this.client.formatTest(messages, options);
+    }
+    async render(messages, options, tools, reasoningEffort) {
+        return this.client.render(messages, options, tools, reasoningEffort);
     }
-    // API v2.0 Tokenize
     async tokenize(messages, tools, reasoningEffort) {
-        return this.queueManager.addTokenizeRequest(messages, tools, reasoningEffort);
+        return this.client.tokenize(messages, tools, reasoningEffort);
     }
-    // Cache operations
     async cachePrefill(cachePath, messages, baseCachePath, trimToTokens, prefixOffsets, prefixHashes, tools, reasoningEffort) {
-        return this.queueManager.addCachePrefillRequest(cachePath, messages, baseCachePath, trimToTokens, prefixOffsets, prefixHashes, tools, reasoningEffort);
+        return this.client.cachePrefill(cachePath, messages, baseCachePath, trimToTokens, prefixOffsets, prefixHashes, tools, reasoningEffort);
     }
-    // API v2.0 Chat
+    /** @deprecated render + generate を使用すること */
     async chat(messages, primer, options, tools, images, maxImageSize, reasoningEffort, cachePath, cacheTrimTokens) {
-        return this.queueManager.addChatRequest(messages, primer, options, tools, images, maxImageSize, reasoningEffort, cachePath, cacheTrimTokens);
+        const capabilities = await this.getCapabilities();
+        let formattedPrompt;
+        if (capabilities.features.apply_chat_template) {
+            const renderResult = await this.render(messages, primer ? { ...options, primer } : options, tools, reasoningEffort);
+            if (renderResult.error || renderResult.formatted_prompt == null) {
+                throw new Error(renderResult.error ?? 'render failed');
+            }
+            formattedPrompt = String(renderResult.formatted_prompt);
+        }
+        else {
+            formattedPrompt = generateMergedPrompt(messages, capabilities.special_tokens);
+            if (primer) {
+                formattedPrompt += primer;
+            }
+        }
+        const generateOptions = options ? { ...options } : undefined;
+        if (generateOptions) {
+            delete generateOptions.trustRemoteCode;
+        }
+        return this.generate(formattedPrompt, generateOptions, images, maxImageSize, cachePath, cacheTrimTokens, primer);
     }
-    // API v2.0 Completion
     async completion(prompt, options, images, maxImageSize) {
-        return this.queueManager.addCompletionRequest(prompt, options, images, maxImageSize);
+        return this.client.completion(prompt, options, images, maxImageSize);
+    }
+    async generate(prompt, options, images, maxImageSize, cachePath, cacheTrimTokens, primer) {
+        return this.client.generate(prompt, options, images, maxImageSize, cachePath, cacheTrimTokens, primer);
     }
     async exit() {
-        await this.processComm.exit();
+        return this.client.exit();
     }
     cancelActiveRequest() {
-        this.queueManager.cancelActiveRequest();
+        this.client.cancelActiveRequest();
     }
-    // デバッグ・ステータス情報
     getStatus() {
-        return {
-            modelName: this.modelName,
-            queueLength: this.queueManager.length,
-            isStreamingActive: this.processComm.isStreamingActive(),
-            isJsonBuffering: this.processComm.isJsonBuffering()
-        };
+        return this.client.getStatus();
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/mlx-ml/process/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/index.ts"],"names":[],"mappings":"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"}

package/dist/mlx-ml/process/model-specific.d.ts

@@ -4,6 +4,7 @@
  * モデルごとの特殊なフォーマット処理、メッセージ変換、プロンプト生成を管理
  * Python側のapply_model_specific_processingをTypeScript側に移行
  */
+import type { ApiStrategy, QueryMode } from '../../types.js';
 import type { MlxMessage, MlxRuntimeInfo } from './types.js';
 type ChatRestrictions = MlxRuntimeInfo['chat_restrictions'];
 /**
@@ -15,7 +16,7 @@ type ChatRestrictions = MlxRuntimeInfo['chat_restrictions'];
  * 3. mode指定 → instruct=completion, chat=chat
  * 4. auto → chat templateがあればchat、なければcompletion
  */
-export declare function selectApi(strategy: string, mode: string | undefined, hasChatTemplate: boolean, hasCompletionProc: boolean): 'chat' | 'completion';
+export declare function selectApi(strategy: ApiStrategy, mode: QueryMode | undefined, hasChatTemplate: boolean, hasCompletionProc: boolean): 'chat' | 'completion';
 export interface ModelSpecificProcessor {
     /**
      * Chat API用のモデル固有処理

package/dist/mlx-ml/process/model-specific.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-specific.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7D,KAAK,gBAAgB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAC;AAE5D;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,eAAe,EAAE,OAAO,EACxB,iBAAiB,EAAE,OAAO,GACzB,MAAM,GAAG,YAAY,CAevB;AAED,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;IAElE;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1D;;OAEG;IACH,sBAAsB,IAAI,OAAO,CAAC;IAElC;;;;OAIG;IACH,gBAAgB,IAAI,OAAO,CAAC;IAE5B;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI,CAAC;CACrG;AAGD,qBAAa,6BAA8B,YAAW,sBAAsB;IAI9D,OAAO,CAAC,SAAS;IAH7B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,SAAS,CAA2B;gBAExB,SAAS,EAAE,MAAM;IAGrC,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI;IAKnG;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE;IAwBjE;;OAEG;IACH,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,OAAO;IAI3B;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAI1D;AAGD,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAChB,sBAAsB,CAGxB"}
+{"version":3,"file":"model-specific.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG7D,KAAK,gBAAgB,GAAG,cAAc,CAAC,mBAAmB,CAAC,CAAC;AAE5D;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,eAAe,EAAE,OAAO,EACxB,iBAAiB,EAAE,OAAO,GACzB,MAAM,GAAG,YAAY,CAevB;AAED,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,CAAC;IAElE;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1D;;OAEG;IACH,sBAAsB,IAAI,OAAO,CAAC;IAElC;;;;OAIG;IACH,gBAAgB,IAAI,OAAO,CAAC;IAE5B;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI,CAAC;CACrG;AAGD,qBAAa,6BAA8B,YAAW,sBAAsB;IAI9D,OAAO,CAAC,SAAS;IAH7B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,SAAS,CAA2B;gBAExB,SAAS,EAAE,MAAM;IAGrC,iBAAiB,CAAC,OAAO,EAAE;QAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QAAC,SAAS,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;KAAE,GAAG,IAAI;IAKnG;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;;OAGG;IACH,2BAA2B,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE;IAwBjE;;OAEG;IACH,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,OAAO;IAI3B;;;OAGG;IACH,iCAAiC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAI1D;AAGD,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAChB,sBAAsB,CAGxB"}

package/dist/mlx-ml/process/model-specific.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-specific.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-specific.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/model-specific.ts"],"names":[],"mappings":"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"}

package/dist/mlx-ml/process/prompt-builder.d.ts

@@ -0,0 +1,11 @@
+/**
+ * chat template 非対応モデル向けのプロンプト組立（Python generate_merged_prompt の TS 移植）
+ */
+import type { InferenceCapabilities, InferenceMessage } from '../../local-inference/protocol.js';
+type SpecialTokensMap = InferenceCapabilities['special_tokens'];
+/**
+ * apply_chat_template が使えない場合に special_tokens からプロンプトを組み立てる
+ */
+export declare function generateMergedPrompt(messages: InferenceMessage[], specialTokens: SpecialTokensMap): string;
+export {};
+//# sourceMappingURL=prompt-builder.d.ts.map

package/dist/mlx-ml/process/prompt-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../../../src/mlx-ml/process/prompt-builder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGjG,KAAK,gBAAgB,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;AAgBhE;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,aAAa,EAAE,gBAAgB,GAC9B,MAAM,CAiDR"}

package/dist/mlx-ml/process/prompt-builder.js

@@ -0,0 +1,51 @@
+/**
+ * chat template 非対応モデル向けのプロンプト組立（Python generate_merged_prompt の TS 移植）
+ */
+function messageContentToString(content) {
+    if (typeof content === 'string') {
+        return content;
+    }
+    return content
+        .filter((part) => part.type === 'text')
+        .map((part) => part.text)
+        .join('');
+}
+function isTokenPair(token) {
+    return !!token && typeof token === 'object' && 'start' in token;
+}
+/**
+ * apply_chat_template が使えない場合に special_tokens からプロンプトを組み立てる
+ */
+export function generateMergedPrompt(messages, specialTokens) {
+    const promptParts = [];
+    for (const msg of messages) {
+        const role = msg.role;
+        const roleUpper = role.toUpperCase();
+        const content = messageContentToString(msg.content).trim();
+        const roleToken = specialTokens[role];
+        if (isTokenPair(roleToken)) {
+            promptParts.push(roleToken.start.text, content, roleToken.end.text, '');
+            continue;
+        }
+        let blockToken;
+        for (const candidate of ['block', 'context', 'quote', 'section']) {
+            const token = specialTokens[candidate];
+            if (isTokenPair(token)) {
+                blockToken = token;
+                break;
+            }
+        }
+        if (blockToken) {
+            promptParts.push(`${blockToken.start.text}${roleUpper}:\n${content}`, blockToken.end.text, '');
+        }
+        else {
+            promptParts.push(`<!-- begin of ${roleUpper} -->`, content, `<!-- end of ${roleUpper} -->`, '');
+        }
+    }
+    if (promptParts.length === 0) {
+        return '';
+    }
+    promptParts.pop();
+    return promptParts.join('\n');
+}
+//# sourceMappingURL=prompt-builder.js.map

package/dist/mlx-ml/process/prompt-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../../../src/mlx-ml/process/prompt-builder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,SAAS,sBAAsB,CAAC,OAAoC;IAClE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,IAAI,EAA0C,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC;SAC9E,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACxB,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,KAAkD;IACrE,OAAO,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,CAAC;AAClE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAA4B,EAC5B,aAA+B;IAE/B,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAE3D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,WAAW,CAAC,IAAI,CACd,SAAS,CAAC,KAAK,CAAC,IAAI,EACpB,OAAO,EACP,SAAS,CAAC,GAAG,CAAC,IAAI,EAClB,EAAE,CACH,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,UAAwC,CAAC;QAC7C,KAAK,MAAM,SAAS,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAU,EAAE,CAAC;YAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,UAAU,GAAG,KAAK,CAAC;gBACnB,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,WAAW,CAAC,IAAI,CACd,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,MAAM,OAAO,EAAE,EACnD,UAAU,CAAC,GAAG,CAAC,IAAI,EACnB,EAAE,CACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CACd,iBAAiB,SAAS,MAAM,EAChC,OAAO,EACP,eAAe,SAAS,MAAM,EAC9B,EAAE,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,WAAW,CAAC,GAAG,EAAE,CAAC;IAClB,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC"}