@modular-prompt/extract 0.2.0 → 0.3.0

package/dist/create-mlx-extract-runtime.js

@@ -1,22 +1,52 @@
-import { MlxCacheController, MlxDriver, } from '@modular-prompt/driver';
+import { MlxCacheController, } from '@modular-prompt/driver';
+import { createDriver } from './model-resolution.js';
+/**
+ * Runtime construction failed after resources started being created.
+ * Cleanup must not replace the error that explains why construction failed.
+ */
+async function closeFailedRuntime(driver, cacheController) {
+    try {
+        if (driver) {
+            await driver.close();
+        }
+    }
+    catch {
+        // Preserve the original runtime construction/capabilities error.
+    }
+    try {
+        await cacheController.close();
+    }
+    catch {
+        // Preserve the original runtime construction/capabilities error.
+    }
+}
 export async function createMlxExtractRuntime(options) {
     const cacheController = new MlxCacheController(options.cacheDir ? { cacheDir: options.cacheDir } : undefined);
-    const driver = new MlxDriver({
-        model: options.model,
-        backend: 'lm',
-        cacheController,
-    });
-    if ('getCapabilities' in driver && typeof driver.getCapabilities === 'function') {
-        await driver.getCapabilities();
+    let driverForCleanup;
+    try {
+        const resolved = await createDriver(options.model, { cacheController });
+        const driver = resolved.driver;
+        driverForCleanup = driver;
+        if ('getCapabilities' in driver && typeof driver.getCapabilities === 'function') {
+            await driver.getCapabilities();
+        }
+        return {
+            driver,
+            cacheController,
+            model: resolved.spec.model,
+            async close() {
+                try {
+                    await driver.close();
+                }
+                finally {
+                    await cacheController.close();
+                }
+            },
+        };
+    }
+    catch (error) {
+        await closeFailedRuntime(driverForCleanup, cacheController);
+        throw error;
     }
-    return {
-        driver,
-        cacheController,
-        model: options.model,
-        async close() {
-            await driver.close();
-            await cacheController.close();
-        },
-    };
 }
 //# sourceMappingURL=create-mlx-extract-runtime.js.map

package/dist/create-mlx-extract-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-mlx-extract-runtime.js","sourceRoot":"","sources":["../src/create-mlx-extract-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,SAAS,GAGV,MAAM,wBAAwB,CAAC;AAqBhC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAAiC;IAEjC,MAAM,eAAe,GAAG,IAAI,kBAAkB,CAC5C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAC9D,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC;QAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,IAAI;QACb,eAAe;KAChB,CAAC,CAAC;IAEH,IAAI,iBAAiB,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;QAChF,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;IACjC,CAAC;IAED,OAAO;QACL,MAAM;QACN,eAAe;QACf,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,KAAK,CAAC,KAAK;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;QAChC,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"create-mlx-extract-runtime.js","sourceRoot":"","sources":["../src/create-mlx-extract-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,GAGnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAsBrD;;;GAGG;AACH,KAAK,UAAU,kBAAkB,CAC/B,MAA4B,EAC5B,eAAsC;IAEtC,IAAI,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,iEAAiE;IACnE,CAAC;IAED,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,iEAAiE;IACnE,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAAiC;IAEjC,MAAM,eAAe,GAAG,IAAI,kBAAkB,CAC5C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAC9D,CAAC;IACF,IAAI,gBAAsC,CAAC;IAC3C,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/B,gBAAgB,GAAG,MAAM,CAAC;QAE1B,IAAI,iBAAiB,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;YAChF,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC;QAED,OAAO;YACL,MAAM;YACN,eAAe;YACf,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;YAC1B,KAAK,CAAC,KAAK;gBACT,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;wBAAS,CAAC;oBACT,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/default-models.d.ts

@@ -0,0 +1,14 @@
+/**
+ * extract 同梱の models 設定
+ *
+ * user の ~/.modular-prompt/models.yaml から alias や default を上書きできる。
+ */
+import type { ModelsConfig } from '@modular-prompt/driver';
+/**
+ * extract が -m なしで使用する同梱デフォルトモデル。
+ * MLX_MODEL は既存利用者向けに後方互換でサポートし、user yaml が優先される。
+ */
+export declare const BUNDLED_DEFAULT_MODEL: string;
+/** 同梱モデル設定（user models.yaml より低い優先度） */
+export declare const BUNDLED_MODELS_CONFIG: ModelsConfig;
+//# sourceMappingURL=default-models.d.ts.map

package/dist/default-models.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-models.d.ts","sourceRoot":"","sources":["../src/default-models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QACgC,CAAC;AAEnE,wCAAwC;AACxC,eAAO,MAAM,qBAAqB,EAAE,YAOnC,CAAC"}

package/dist/default-models.js

@@ -0,0 +1,20 @@
+/**
+ * extract 同梱の models 設定
+ *
+ * user の ~/.modular-prompt/models.yaml から alias や default を上書きできる。
+ */
+/**
+ * extract が -m なしで使用する同梱デフォルトモデル。
+ * MLX_MODEL は既存利用者向けに後方互換でサポートし、user yaml が優先される。
+ */
+export const BUNDLED_DEFAULT_MODEL = process.env.MLX_MODEL ?? 'prism-ml/Ternary-Bonsai-1.7B-mlx-2bit';
+/** 同梱モデル設定（user models.yaml より低い優先度） */
+export const BUNDLED_MODELS_CONFIG = {
+    models: {
+        default: {
+            provider: 'mlx',
+            model: BUNDLED_DEFAULT_MODEL,
+        },
+    },
+};
+//# sourceMappingURL=default-models.js.map

package/dist/default-models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"default-models.js","sourceRoot":"","sources":["../src/default-models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAChC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,uCAAuC,CAAC;AAEnE,wCAAwC;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAiB;IACjD,MAAM,EAAE;QACN,OAAO,EAAE;YACP,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,qBAAqB;SAC7B;KACF;CACF,CAAC"}

package/dist/extract-store.d.ts

@@ -0,0 +1,53 @@
+import type { MaterialInput } from './extract-elements.js';
+import { type ExtractCacheManifest } from './cli/manifest.js';
+export interface PrepareExtractCacheOptions {
+    /** Directory containing the persistent cache files. */
+    cacheDir: string;
+    /** MLX model alias or resolved model ID. */
+    model?: string;
+    /** Corpus to prefill into the cache. */
+    materials: readonly MaterialInput[];
+}
+/**
+ * Prepare the persistent corpus cache and release all runtime resources.
+ *
+ * The caller owns the manifest transaction. This operation only creates or
+ * extends the cache in `cacheDir` and returns the model ID resolved by MLX.
+ */
+export declare function prepareExtractCache(options: PrepareExtractCacheOptions): Promise<string>;
+/**
+ * Merge newly loaded materials into an existing corpus.
+ *
+ * File-based materials use their absolute path as `id`. Re-adding the same
+ * content is idempotent; changing the content behind an existing id is
+ * rejected because the persisted KV cache can no longer be trusted.
+ */
+export declare function mergeMaterials(existing: readonly MaterialInput[], incoming: readonly MaterialInput[]): MaterialInput[];
+/** Read and validate a named store manifest with a user-facing missing-store error. */
+export declare function readExtractStoreManifest(storeDir: string, storename: string): Promise<ExtractCacheManifest>;
+export interface AppendToExtractStoreOptions {
+    /** Existing named store directory. */
+    storeDir: string;
+    /** Store name used in actionable error messages. */
+    storename: string;
+    /** Materials loaded from the files supplied to `add`. */
+    incomingMaterials: readonly MaterialInput[];
+    /** Manifest read by the CLI before loading files, when available. */
+    existingManifest?: ExtractCacheManifest;
+    /** Injectable clock for deterministic callers and tests. */
+    now?: () => string;
+}
+export interface AppendToExtractStoreResult {
+    manifest: ExtractCacheManifest;
+    model: string;
+    addedMaterials: number;
+}
+/**
+ * Append materials to a persistent extract store transactionally.
+ *
+ * Prefill happens in a copied staging directory. The original store is only
+ * swapped after the new cache and manifest are both ready, so failures leave
+ * the old corpus/KV pair intact.
+ */
+export declare function appendToExtractStore(options: AppendToExtractStoreOptions): Promise<AppendToExtractStoreResult>;
+//# sourceMappingURL=extract-store.d.ts.map

package/dist/extract-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract-store.d.ts","sourceRoot":"","sources":["../src/extract-store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,0BAA0B;IACzC,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAC;CACrC;AAeD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,MAAM,CAAC,CA8BjB;AAYD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,QAAQ,EAAE,SAAS,aAAa,EAAE,GACjC,aAAa,EAAE,CA6BjB;AASD,uFAAuF;AACvF,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAS/B;AAED,MAAM,WAAW,2BAA2B;IAC1C,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,iBAAiB,EAAE,SAAS,aAAa,EAAE,CAAC;IAC5C,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IACxC,4DAA4D;IAC5D,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AA+BD;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,0BAA0B,CAAC,CAuCrC"}

package/dist/extract-store.js

@@ -0,0 +1,174 @@
+import { randomUUID } from 'node:crypto';
+import { cp, mkdtemp, rename, rm } from 'node:fs/promises';
+import { basename, dirname, join, resolve } from 'node:path';
+import { isDeepStrictEqual } from 'node:util';
+import { createExtractSession } from './create-extract-session.js';
+import { createMlxExtractRuntime } from './create-mlx-extract-runtime.js';
+import { CACHE_PREPARE_CUE } from './cli/constants.js';
+import { manifestExists, readManifest, writeManifest, } from './cli/manifest.js';
+import { storeExists } from './cli/store.js';
+async function closeRuntimePreservingError(runtime, operationError) {
+    try {
+        await runtime.close();
+    }
+    catch (closeError) {
+        if (operationError === undefined) {
+            throw closeError;
+        }
+    }
+}
+/**
+ * Prepare the persistent corpus cache and release all runtime resources.
+ *
+ * The caller owns the manifest transaction. This operation only creates or
+ * extends the cache in `cacheDir` and returns the model ID resolved by MLX.
+ */
+export async function prepareExtractCache(options) {
+    const runtime = await createMlxExtractRuntime({
+        model: options.model,
+        cacheDir: options.cacheDir,
+    });
+    let operationError;
+    try {
+        const session = createExtractSession({
+            driver: runtime.driver,
+            cacheController: runtime.cacheController,
+            model: runtime.model,
+            corpus: { materials: options.materials },
+            cachePreparation: 'required',
+        });
+        await session.extract({
+            cue: CACHE_PREPARE_CUE,
+            options: { maxTokens: 1, temperature: 0 },
+        });
+        await session.close({ releaseCache: false });
+        return runtime.model;
+    }
+    catch (error) {
+        operationError = error;
+        throw error;
+    }
+    finally {
+        // Keep the prefill/session error as the primary failure. A close error
+        // is still surfaced when the operation itself succeeded.
+        await closeRuntimePreservingError(runtime, operationError);
+    }
+}
+function materialKey(material) {
+    return material.id ?? material.title;
+}
+function hasSameContent(left, right) {
+    return left.title === right.title
+        && left.usage === right.usage
+        && isDeepStrictEqual(left.content, right.content);
+}
+/**
+ * Merge newly loaded materials into an existing corpus.
+ *
+ * File-based materials use their absolute path as `id`. Re-adding the same
+ * content is idempotent; changing the content behind an existing id is
+ * rejected because the persisted KV cache can no longer be trusted.
+ */
+export function mergeMaterials(existing, incoming) {
+    const merged = [...existing];
+    const indexById = new Map();
+    for (const [index, material] of existing.entries()) {
+        if (!indexById.has(materialKey(material))) {
+            indexById.set(materialKey(material), index);
+        }
+    }
+    for (const material of incoming) {
+        const id = materialKey(material);
+        const existingIndex = indexById.get(id);
+        if (existingIndex === undefined) {
+            indexById.set(id, merged.length);
+            merged.push(material);
+            continue;
+        }
+        const previous = merged[existingIndex];
+        if (previous && !hasSameContent(previous, material)) {
+            throw new Error(`Material content differs for duplicate id '${id}'. `
+                + 'Run `modular-extract clean <storename>` and create the store again.');
+        }
+    }
+    return merged;
+}
+function missingStoreError(storeDir, storename) {
+    return new Error(`Store not found: ${storeDir}\n`
+        + `Run \`modular-extract create ${storename} <files...>\` first.`);
+}
+/** Read and validate a named store manifest with a user-facing missing-store error. */
+export async function readExtractStoreManifest(storeDir, storename) {
+    const resolvedStoreDir = resolve(storeDir);
+    if (!(await storeExists(resolvedStoreDir))) {
+        throw missingStoreError(resolvedStoreDir, storename);
+    }
+    if (!(await manifestExists(resolvedStoreDir))) {
+        throw new Error(`Store manifest not found: ${resolvedStoreDir}`);
+    }
+    return readManifest(resolvedStoreDir);
+}
+async function replaceStoreWithStaging(storeDir, stagingDir) {
+    const backupDir = join(dirname(storeDir), `.${basename(storeDir)}.backup-${randomUUID()}`);
+    await rename(storeDir, backupDir);
+    try {
+        await rename(stagingDir, storeDir);
+    }
+    catch (error) {
+        try {
+            await rename(backupDir, storeDir);
+        }
+        catch (rollbackError) {
+            throw new AggregateError([error, rollbackError], `Failed to replace store and roll back ${storeDir}`);
+        }
+        throw error;
+    }
+    // The new store is already committed. A failure to remove the old snapshot
+    // must not turn a successful add into a reported failure.
+    await rm(backupDir, { recursive: true, force: true }).catch(() => { });
+}
+/**
+ * Append materials to a persistent extract store transactionally.
+ *
+ * Prefill happens in a copied staging directory. The original store is only
+ * swapped after the new cache and manifest are both ready, so failures leave
+ * the old corpus/KV pair intact.
+ */
+export async function appendToExtractStore(options) {
+    const storeDir = resolve(options.storeDir);
+    if (!(await storeExists(storeDir))) {
+        throw missingStoreError(storeDir, options.storename);
+    }
+    const previousManifest = options.existingManifest
+        ?? await readExtractStoreManifest(storeDir, options.storename);
+    const materials = mergeMaterials(previousManifest.materials, options.incomingMaterials);
+    const stagingDir = await mkdtemp(join(dirname(storeDir), `.${basename(storeDir)}.add-`));
+    let committed = false;
+    try {
+        await cp(storeDir, stagingDir, { recursive: true, force: true });
+        const model = await prepareExtractCache({
+            cacheDir: stagingDir,
+            model: previousManifest.model,
+            materials,
+        });
+        const nextManifest = {
+            ...previousManifest,
+            materials,
+            updatedAt: (options.now ?? (() => new Date().toISOString()))(),
+        };
+        await writeManifest(stagingDir, nextManifest);
+        await replaceStoreWithStaging(storeDir, stagingDir);
+        committed = true;
+        return {
+            manifest: nextManifest,
+            model,
+            addedMaterials: materials.length - previousManifest.materials.length,
+        };
+    }
+    finally {
+        if (!committed) {
+            await rm(stagingDir, { recursive: true, force: true });
+        }
+    }
+}
+//# sourceMappingURL=extract-store.js.map

package/dist/extract-store.js.map

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

package/dist/index.d.ts

@@ -1,6 +1,9 @@
 export { createExtractSession } from './create-extract-session.js';
 export { createMlxExtractRuntime } from './create-mlx-extract-runtime.js';
+export { createDriver, resolveMergedModels, resolveModelSpec, } from './model-resolution.js';
 export { resolveSessionModules } from './resolve-session-modules.js';
+export { resolveDefaultContainerDir, } from './cli/constants.js';
+export { resolveStoreDir, validateStorename } from './cli/store.js';
 export { compileExtractPrompt } from './compile-extract-prompt.js';
 export { buildExtractContext } from './extract-context.js';
 export { inputChunk, inputChunksFromJson, normalizeChunkInput, normalizeInputs, normalizeMaterial, normalizeMaterials, normalizeMessage, normalizeMessages, } from './extract-elements.js';
@@ -10,4 +13,5 @@ export type { ExtractContext } from './extract-context.js';
 export type { ChunkInput, ChunkInputValue, InputsInput, MaterialInput, MaterialsInput, MessageInput, MessagesInput, StandardMessageInput, ToolResultMessageInput, } from './extract-elements.js';
 export type { ExtractCorpus, ExtractRequest, ExtractResult, ExtractSession, ExtractSessionCloseOptions, ExtractSessionOptions, } from './types.js';
 export type { MlxExtractRuntime, MlxExtractRuntimeOptions, } from './create-mlx-extract-runtime.js';
+export type { ExtractDriverOptions, ExtractDriverResult, } from './model-resolution.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACX,aAAa,EACb,cAAc,EACd,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,cAAc,EACd,0BAA0B,EAC1B,qBAAqB,GACtB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EACL,0BAA0B,GAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACX,aAAa,EACb,cAAc,EACd,YAAY,EACZ,aAAa,EACb,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,cAAc,EACd,0BAA0B,EAC1B,qBAAqB,GACtB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,iCAAiC,CAAC;AACzC,YAAY,EACV,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC"}

package/dist/index.js

@@ -1,6 +1,9 @@
 export { createExtractSession } from './create-extract-session.js';
 export { createMlxExtractRuntime } from './create-mlx-extract-runtime.js';
+export { createDriver, resolveMergedModels, resolveModelSpec, } from './model-resolution.js';
 export { resolveSessionModules } from './resolve-session-modules.js';
+export { resolveDefaultContainerDir, } from './cli/constants.js';
+export { resolveStoreDir, validateStorename } from './cli/store.js';
 export { compileExtractPrompt } from './compile-extract-prompt.js';
 export { buildExtractContext } from './extract-context.js';
 export { inputChunk, inputChunksFromJson, normalizeChunkInput, normalizeInputs, normalizeMaterial, normalizeMaterials, normalizeMessage, normalizeMessages, } from './extract-elements.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EACL,0BAA0B,GAC3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC"}

package/dist/model-resolution.d.ts

@@ -0,0 +1,25 @@
+import { type AIDriver, type ModelSpec, type ModelsConfig, type PromptCacheController } from '@modular-prompt/driver';
+/** createDriver に渡す extract 固有の runtime オプション */
+export interface ExtractDriverOptions {
+    /** セッションと共有する KV cache controller */
+    cacheController?: PromptCacheController;
+}
+export interface ExtractDriverResult {
+    driver: AIDriver;
+    /** alias 解決後の生 model ID */
+    spec: ModelSpec;
+}
+/** bundled + user models.yaml を解決する（user の default/alias が優先）。 */
+export declare function resolveMergedModels(): ModelsConfig;
+/**
+ * extract で使用する ModelSpec を解決する。
+ *
+ * 優先順位は明示 model（alias または生 ID）→ models.default → models の先頭。
+ */
+export declare function resolveModelSpec(model: string | undefined, models?: ModelsConfig): ModelSpec;
+/**
+ * ModelSpec を AIService 経由で MLX driver に変換する。
+ * runtime が作成した cache controller は driver と共有する。
+ */
+export declare function createDriver(model: string | undefined, options?: ExtractDriverOptions): Promise<ExtractDriverResult>;
+//# sourceMappingURL=model-resolution.d.ts.map

package/dist/model-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-resolution.d.ts","sourceRoot":"","sources":["../src/model-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,QAAQ,EAEb,KAAK,SAAS,EACd,KAAK,YAAY,EAEjB,KAAK,qBAAqB,EAC3B,MAAM,wBAAwB,CAAC;AAGhC,iDAAiD;AACjD,MAAM,WAAW,oBAAoB;IACnC,qCAAqC;IACrC,eAAe,CAAC,EAAE,qBAAqB,CAAC;CACzC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,QAAQ,CAAC;IACjB,2BAA2B;IAC3B,IAAI,EAAE,SAAS,CAAC;CACjB;AAWD,kEAAkE;AAClE,wBAAgB,mBAAmB,IAAI,YAAY,CAElD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,GAAE,YAAoC,GAC3C,SAAS,CAgBX;AAyBD;;;GAGG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAK9B"}

package/dist/model-resolution.js

@@ -0,0 +1,57 @@
+import { AIService, resolveDefaultModelFromConfig, resolveModelName, resolveModelReference, } from '@modular-prompt/driver';
+import { BUNDLED_MODELS_CONFIG } from './default-models.js';
+function inferProvider(_model) {
+    // extract runtime は MLX 専用。生の model ID は MLX model として扱う。
+    return 'mlx';
+}
+function createAIService() {
+    return AIService.fromMergedConfig(BUNDLED_MODELS_CONFIG, undefined, { mode: 'merge' });
+}
+/** bundled + user models.yaml を解決する（user の default/alias が優先）。 */
+export function resolveMergedModels() {
+    return createAIService().modelsConfig;
+}
+/**
+ * extract で使用する ModelSpec を解決する。
+ *
+ * 優先順位は明示 model（alias または生 ID）→ models.default → models の先頭。
+ */
+export function resolveModelSpec(model, models = resolveMergedModels()) {
+    const explicitModel = model?.trim();
+    if (explicitModel) {
+        return resolveModelReference({ ref: explicitModel }, models)
+            ?? resolveModelName(explicitModel, models, inferProvider);
+    }
+    const fallback = resolveDefaultModelFromConfig(models);
+    if (fallback) {
+        return fallback;
+    }
+    throw new Error('No extract model configured: specify -m <model-id-or-alias> '
+        + 'or define models.default in ~/.modular-prompt/models.yaml');
+}
+function withExtractDriverOptions(spec, options) {
+    if (spec.provider !== 'mlx') {
+        throw new Error(`Extract requires an MLX model, but '${spec.model}' uses provider '${spec.provider}'`);
+    }
+    const driverOptions = {
+        ...spec.driverOptions,
+        backend: 'lm',
+        ...(options.cacheController ? { cacheController: options.cacheController } : {}),
+    };
+    return {
+        ...spec,
+        backend: 'lm',
+        driverOptions,
+    };
+}
+/**
+ * ModelSpec を AIService 経由で MLX driver に変換する。
+ * runtime が作成した cache controller は driver と共有する。
+ */
+export async function createDriver(model, options = {}) {
+    const ai = createAIService();
+    const spec = withExtractDriverOptions(resolveModelSpec(model, ai.modelsConfig), options);
+    const driver = await ai.createDriver(spec);
+    return { driver, spec };
+}
+//# sourceMappingURL=model-resolution.js.map

package/dist/model-resolution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-resolution.js","sourceRoot":"","sources":["../src/model-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,6BAA6B,EAC7B,gBAAgB,EAChB,qBAAqB,GAOtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAc5D,SAAS,aAAa,CAAC,MAAc;IACnC,0DAA0D;IAC1D,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,SAAS,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AACzF,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,mBAAmB;IACjC,OAAO,eAAe,EAAE,CAAC,YAAY,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAC9B,KAAyB,EACzB,SAAuB,mBAAmB,EAAE;IAE5C,MAAM,aAAa,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACpC,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,qBAAqB,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC;eACvD,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,QAAQ,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,KAAK,CACb,8DAA8D;UAC5D,2DAA2D,CAC9D,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,IAAe,EACf,OAA6B;IAE7B,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,KAAK,oBAAoB,IAAI,CAAC,QAAQ,GAAG,CACtF,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAA0B;QAC3C,GAAI,IAAI,CAAC,aAAmD;QAC5D,OAAO,EAAE,IAAI;QACb,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjF,CAAC;IAEF,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE,IAAI;QACb,aAAa;KACd,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAAyB,EACzB,UAAgC,EAAE;IAElC,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,wBAAwB,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC1B,CAAC"}

package/dist/types.d.ts

@@ -30,6 +30,11 @@ export interface ExtractSessionOptions<TContext = ExtractContext> {
     corpus: ExtractCorpus;
     /** Output schema (Phase 3: structured output). Accepted at session creation. */
     schema?: object;
+    /**
+     * Cache preparation policy. Normal sessions are best-effort; store
+     * preparation uses `required` so an empty cache handle cannot be committed.
+     */
+    cachePreparation?: 'best-effort' | 'required';
 }
 export interface ExtractRequest {
     /** Extraction focus for this call (output / cue section). */

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACzG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,oEAAoE;AACpE,MAAM,WAAW,aAAa;IAC5B,oCAAoC;IACpC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,iCAAiC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB,CAAC,QAAQ,GAAG,cAAc;IAC9D,MAAM,EAAE,QAAQ,CAAC;IACjB,kDAAkD;IAClD,eAAe,EAAE,qBAAqB,CAAC;IACvC,kEAAkE;IAClE,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,kDAAkD;IAClD,MAAM,EAAE,aAAa,CAAC;IACtB,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,6DAA6D;IAC7D,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;IAC7B,6CAA6C;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACzD,UAAU,IAAI,aAAa,CAAC,aAAa,CAAC,CAAC;IAC3C,KAAK,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,qBAAqB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACzG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,aAAa,EACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,oEAAoE;AACpE,MAAM,WAAW,aAAa;IAC5B,oCAAoC;IACpC,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,iCAAiC;IACjC,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAqB,CAAC,QAAQ,GAAG,cAAc;IAC9D,MAAM,EAAE,QAAQ,CAAC;IACjB,kDAAkD;IAClD,eAAe,EAAE,qBAAqB,CAAC;IACvC,kEAAkE;IAClE,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,UAAU,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,kDAAkD;IAClD,MAAM,EAAE,aAAa,CAAC;IACtB,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,aAAa,GAAG,UAAU,CAAC;CAC/C;AAED,MAAM,WAAW,cAAc;IAC7B,6DAA6D;IAC7D,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;IAC7B,6CAA6C;IAC7C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,0BAA0B;IACzC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACzD,UAAU,IAAI,aAAa,CAAC,aAAa,CAAC,CAAC;IAC3C,KAAK,CAAC,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-prompt/extract",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Document extraction session API for modular prompt framework",
   "type": "module",
   "main": "./dist/index.js",
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "@modular-prompt/core": "0.3.0",
-    "@modular-prompt/driver": "0.15.0"
+    "@modular-prompt/driver": "0.16.0"
   },
   "devDependencies": {
     "@eslint/js": "9.39.2",