@trydreamstate/cli 1.3.13 → 1.3.15

package/dist/tableFilePreview.js

@@ -203,7 +203,7 @@ function unzipEntries(buffer) {
         const localOffset = buffer.readUInt32LE(offset + 42);
         const name = buffer.toString('utf8', offset + 46, offset + 46 + nameLength);
         offset += 46 + nameLength + extraLength + commentLength;
-        if (!/xl\/(sharedStrings\.xml|worksheets\/sheet\d+\.xml)$/.test(name))
+        if (!/xl\/(sharedStrings\.xml|workbook\.xml|_rels\/workbook\.xml\.rels|worksheets\/sheet\d+\.xml)$/.test(name))
             continue;
         if (localOffset + 30 > buffer.length)
             throw new Error('xlsx local header is outside the file');
@@ -243,9 +243,23 @@ function sharedStringTable(xml) {
  */
 function readXlsxRows(buffer, rowLimit) {
     const entries = unzipEntries(buffer);
-    const sheetName = [...entries.keys()]
+    let sheetName = [...entries.keys()]
         .filter((name) => /xl\/worksheets\/sheet\d+\.xml$/.test(name))
         .sort()[0];
+    const workbook = entries.get('xl/workbook.xml');
+    const relationships = entries.get('xl/_rels/workbook.xml.rels');
+    if (workbook && relationships) {
+        const sheet = /<(?:[\w-]+:)?sheet\b([^>]*)\/?\s*>/.exec(workbook.toString('utf8'));
+        const id = /\br:id=["']([^"']+)["']/.exec(sheet?.[1] ?? '')?.[1];
+        const relationship = [...relationships.toString('utf8').matchAll(/<(?:[\w-]+:)?Relationship\b([^>]*)\/?\s*>/g)]
+            .find((match) => /\bId=["']([^"']+)["']/.exec(match[1])?.[1] === id);
+        const target = /\bTarget=["']([^"']+)["']/.exec(relationship?.[1] ?? '')?.[1];
+        if (!id || !target)
+            throw new Error('xlsx file has an invalid first worksheet relationship');
+        sheetName = target.startsWith('/') ? target.slice(1) : `xl/${target.replace(/^\.\//, '')}`;
+        if (!entries.has(sheetName))
+            throw new Error('xlsx file has a missing first worksheet');
+    }
     if (!sheetName)
         throw new Error('xlsx file has no worksheet');
     const sheet = entries.get(sheetName).toString('utf8');
@@ -282,7 +296,11 @@ function readXlsxRows(buffer, rowLimit) {
     const rowNumbers = [...grid.keys()].sort((left, right) => left - right);
     if (rowNumbers.length === 0)
         throw new Error('File has no header row');
-    const width = Math.max(...[...grid.values()].map((cells) => Math.max(-1, ...cells.keys()))) + 1;
+    let width = 0;
+    for (const cells of grid.values())
+        for (const k of cells.keys())
+            if (k + 1 > width)
+                width = k + 1;
     const toRow = (cells) => Array.from({ length: width }, (_, index) => cells?.get(index) ?? '');
     const totalRows = [...sheet.matchAll(/<(?:[\w-]+:)?row\b/g)].length;
     return { rows: rowNumbers.map((number) => toRow(grid.get(number))), totalRows };

package/dist/tablesImport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tablesImport.d.ts","sourceRoot":"","sources":["../src/tablesImport.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlE;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AACtC,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,UAAY,CAAC;AAC3C,wEAAwE;AACxE,eAAO,MAAM,eAAe,MAAM,CAAC;AACnC,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAY3C,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoB1E;AAMD,6HAA6H;AAC7H,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACzC,OAAO,EAAE,QAAQ,GAAG,SAAS,GAC5B,MAAM,GAAG,IAAI,CAMf;AAkCD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiJ1H"}
+{"version":3,"file":"tablesImport.d.ts","sourceRoot":"","sources":["../src/tablesImport.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlE;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AACtC,kFAAkF;AAClF,eAAO,MAAM,iBAAiB,UAAY,CAAC;AAC3C,wEAAwE;AACxE,eAAO,MAAM,eAAe,MAAM,CAAC;AACnC,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,SAAU,CAAC;AAY3C,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoB1E;AAMD,6HAA6H;AAC7H,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACzC,OAAO,EAAE,QAAQ,GAAG,SAAS,GAC5B,MAAM,GAAG,IAAI,CAMf;AAkCD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0J1H"}

package/dist/tablesImport.js

@@ -209,18 +209,28 @@ async function importLocalTable(context, options) {
     if (!uploadId)
         throw new client_1.CliError('csv_upload_create returned no upload_id.', 'invalid_response', 0, { details: { import_step: 'create' } });
     const mapping = { ...(record(created.suggested_mapping) ?? {}) };
+    const definitions = Array.isArray(created.column_definitions) ? created.column_definitions.map(record) : [];
+    if (definitions.length !== file.headers.length || definitions.some((definition) => typeof definition?.source_header !== 'string')) {
+        throw new client_1.CliError('csv_upload_create returned invalid column definitions.', 'invalid_response', 0);
+    }
+    const sourceHeaders = definitions.map((definition) => definition.source_header);
+    let upsertHeader;
     if (options.upsertKey) {
         if (!file.headers.includes(options.upsertKey)) {
             throw new errors_1.CliUsageError(`--upsert-key "${options.upsertKey}" is not a column of ${fileName}. Columns: ${file.headers.join(', ')}.`);
         }
-        if (!mapping[options.upsertKey]) {
+        const matches = file.headers.flatMap((header, index) => header === options.upsertKey ? [index] : []);
+        if (matches.length > 1)
+            throw new errors_1.CliUsageError(`--upsert-key "${options.upsertKey}" matches multiple columns: ${matches.map((index) => index + 1).join(', ')}. Rename the columns.`);
+        upsertHeader = sourceHeaders[matches[0]];
+        if (!mapping[upsertHeader]) {
             if (Object.values(mapping).includes('external_id')) {
                 throw new errors_1.CliUsageError(`--upsert-key "${options.upsertKey}" is not mapped to a field and external_id is already used by another column. Rename the key column to a mappable name (email, linkedin_url, external_id).`);
             }
-            mapping[options.upsertKey] = 'external_id';
+            mapping[upsertHeader] = 'external_id';
         }
     }
-    const identityColumn = options.upsertKey ?? chooseIdentityColumn(file.headers, mapping, rowKind);
+    const identityColumn = upsertHeader ?? chooseIdentityColumn(sourceHeaders, mapping, rowKind);
     if (!identityColumn || Object.keys(mapping).length === 0) {
         throw new errors_1.CliUsageError(`No column of ${fileName} could be matched to an identity field (email, linkedin_url, external_id${rowKind === 'company' ? ', domain' : ''}). The upload ${uploadId} was opened and stays unattached. Pass --upsert-key <column> to choose the identity column.`);
     }

package/dist/turnCache.d.ts

@@ -21,7 +21,18 @@ export declare function reusableTurn(path: string, baseUrl: string, apiKey: stri
     rows?: number | null;
     credits?: string | null;
 } | null>;
+/**
+ * The turn token stored for this exact quote_hash. Null when that quote is
+ * absent or its fingerprint is not this input: never hand back another quote's token.
+ */
+export declare function reusableTurnForQuote(path: string, baseUrl: string, apiKey: string, capabilityId: string, quoteHash: string, fingerprint: string, now?: number, onWarning?: CacheWarning): Promise<{
+    token: string;
+    quote_hash: string;
+    maximum_credits: number | null;
+    rows?: number | null;
+    credits?: string | null;
+} | null>;
 export declare function rememberTurnToken(path: string, baseUrl: string, apiKey: string, capabilityId: string, token: string, now?: number, onWarning?: CacheWarning, quote?: CachedQuote): Promise<void>;
-export declare function forgetTurnToken(path: string, baseUrl: string, apiKey: string, capabilityId: string, onWarning?: CacheWarning): Promise<void>;
+export declare function forgetTurnToken(path: string, baseUrl: string, apiKey: string, capabilityId: string, onWarning?: CacheWarning, quoteHash?: string): Promise<void>;
 export {};
 //# sourceMappingURL=turnCache.d.ts.map

package/dist/turnCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turnCache.d.ts","sourceRoot":"","sources":["../src/turnCache.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,aAAa,QAAa,CAAC;AAExC,wPAAwP;AACxP,MAAM,MAAM,WAAW,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAGtJ,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,IAAI,CAAC;AAE3D,wBAAgB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAE7D;AA2BD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GAC9G,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GACnI,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,CAa7I;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,EAC9H,KAAK,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,YAAY,GAC5F,OAAO,CAAC,IAAI,CAAC,CAMf"}
+{"version":3,"file":"turnCache.d.ts","sourceRoot":"","sources":["../src/turnCache.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,aAAa,QAAa,CAAC;AAExC,wPAAwP;AACxP,MAAM,MAAM,WAAW,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAItJ,KAAK,YAAY,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,KAAK,IAAI,CAAC;AAE3D,wBAAgB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAE7D;AAgED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GAC9G,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAGxB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GACnI,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,CAU7I;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,GACtJ,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,CAMtI;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAa,EAAE,SAAS,CAAC,EAAE,YAAY,EAC9H,KAAK,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAChH,OAAO,CAAC,IAAI,CAAC,CAsBf"}

package/dist/turnCache.js

@@ -4,6 +4,7 @@ exports.TURN_REUSE_MS = void 0;
 exports.turnCachePath = turnCachePath;
 exports.reusableTurnToken = reusableTurnToken;
 exports.reusableTurn = reusableTurn;
+exports.reusableTurnForQuote = reusableTurnForQuote;
 exports.rememberTurnToken = rememberTurnToken;
 exports.forgetTurnToken = forgetTurnToken;
 const node_crypto_1 = require("node:crypto");
@@ -17,7 +18,9 @@ const node_path_1 = require("node:path");
 // refused four times in a row). The cache therefore keeps the rehearsal's turn
 // token together with its quote_hash and a fingerprint of the exact input that
 // was priced, so a later `--live` of the same input can echo it and a changed
-// input never inherits a price it was not shown.
+// input never inherits a price it was not shown. One capability keeps a quote
+// per quote_hash: parallel dry runs of different params must not overwrite
+// each other's token.
 // The server turn lives 10 minutes; reuse for 9 so a cached token never
 // expires mid-request.
 exports.TURN_REUSE_MS = 9 * 60_000;
@@ -49,6 +52,39 @@ async function persist(path, entries, onWarning) {
         onWarning?.(error);
     }
 }
+/** Re-load immediately before persist. `mutate` may change only its own key. */
+async function modifyCache(path, onWarning, mutate) {
+    const fresh = await load(path, onWarning);
+    if (!mutate(fresh))
+        return;
+    await persist(path, fresh, onWarning);
+}
+function slots(entry, now) {
+    const out = [];
+    const seen = new Set();
+    for (const slot of Object.values(entry.quotes ?? {})) {
+        if (!slot || typeof slot.token !== 'string' || typeof slot.quote?.quote_hash !== 'string')
+            continue;
+        if (now - slot.at >= exports.TURN_REUSE_MS)
+            continue;
+        seen.add(slot.quote.quote_hash);
+        out.push(slot);
+    }
+    if (entry.quote?.quote_hash && typeof entry.token === 'string' && now - entry.at < exports.TURN_REUSE_MS && !seen.has(entry.quote.quote_hash)) {
+        out.push({ token: entry.token, at: entry.at, quote: entry.quote });
+    }
+    return out;
+}
+function present(slot) {
+    const quote = slot.quote;
+    return {
+        token: slot.token,
+        quote_hash: quote.quote_hash,
+        maximum_credits: typeof quote.maximum_credits === 'number' ? quote.maximum_credits : null,
+        ...(quote.rows !== undefined ? { rows: quote.rows } : {}),
+        ...(quote.credits !== undefined ? { credits: quote.credits } : {}),
+    };
+}
 async function reusableTurnToken(path, baseUrl, apiKey, capabilityId, now = Date.now(), onWarning) {
     const entry = (await load(path, onWarning))[entryKey(baseUrl, apiKey, capabilityId)];
     return entry && typeof entry.token === 'string' && now - entry.at < exports.TURN_REUSE_MS ? entry.token : null;
@@ -59,33 +95,76 @@ async function reusableTurnToken(path, baseUrl, apiKey, capabilityId, now = Date
  */
 async function reusableTurn(path, baseUrl, apiKey, capabilityId, fingerprint, now = Date.now(), onWarning) {
     const entry = (await load(path, onWarning))[entryKey(baseUrl, apiKey, capabilityId)];
-    if (!entry || typeof entry.token !== 'string' || now - entry.at >= exports.TURN_REUSE_MS)
+    if (!entry || typeof entry.token !== 'string')
         return null;
-    const quote = entry.quote && entry.quote.fingerprint === fingerprint && typeof entry.quote.quote_hash === 'string'
-        ? entry.quote
-        : null;
-    return {
-        token: entry.token,
-        quote_hash: quote ? quote.quote_hash : null,
-        maximum_credits: quote && typeof quote.maximum_credits === 'number' ? quote.maximum_credits : null,
-        ...(quote && quote.rows !== undefined ? { rows: quote.rows } : {}),
-        ...(quote && quote.credits !== undefined ? { credits: quote.credits } : {}),
-    };
+    const found = slots(entry, now);
+    const match = found.find((slot) => slot.quote.fingerprint === fingerprint);
+    if (match)
+        return present(match);
+    // A quote minted for a different input must not lend its turn token.
+    if (found.length > 0)
+        return null;
+    if (now - entry.at >= exports.TURN_REUSE_MS)
+        return null;
+    return { token: entry.token, quote_hash: null, maximum_credits: null };
+}
+/**
+ * The turn token stored for this exact quote_hash. Null when that quote is
+ * absent or its fingerprint is not this input: never hand back another quote's token.
+ */
+async function reusableTurnForQuote(path, baseUrl, apiKey, capabilityId, quoteHash, fingerprint, now = Date.now(), onWarning) {
+    const entry = (await load(path, onWarning))[entryKey(baseUrl, apiKey, capabilityId)];
+    if (!entry)
+        return null;
+    const match = slots(entry, now).find((slot) => slot.quote.quote_hash === quoteHash);
+    if (!match || match.quote.fingerprint !== fingerprint)
+        return null;
+    return present(match);
 }
 async function rememberTurnToken(path, baseUrl, apiKey, capabilityId, token, now = Date.now(), onWarning, quote) {
-    const entries = await load(path, onWarning);
-    for (const [key, entry] of Object.entries(entries)) {
-        if (!entry || now - entry.at >= exports.TURN_REUSE_MS)
-            delete entries[key];
-    }
-    entries[entryKey(baseUrl, apiKey, capabilityId)] = { token, at: now, ...(quote ? { quote } : {}) };
-    await persist(path, entries, onWarning);
+    const key = entryKey(baseUrl, apiKey, capabilityId);
+    await modifyCache(path, onWarning, (entries) => {
+        for (const [entryKeyName, entry] of Object.entries(entries)) {
+            if (!entry || now - entry.at >= exports.TURN_REUSE_MS)
+                delete entries[entryKeyName];
+        }
+        const existing = entries[key];
+        const quotes = {};
+        for (const slot of slots(existing ?? { token, at: now }, now))
+            quotes[slot.quote.quote_hash] = slot;
+        if (quote?.quote_hash)
+            quotes[quote.quote_hash] = { token, at: now, quote };
+        entries[key] = {
+            token,
+            at: now,
+            ...(quote ? { quote } : existing?.quote ? { quote: existing.quote } : {}),
+            ...(Object.keys(quotes).length > 0 ? { quotes } : {}),
+        };
+        return true;
+    });
 }
-async function forgetTurnToken(path, baseUrl, apiKey, capabilityId, onWarning) {
-    const entries = await load(path, onWarning);
+async function forgetTurnToken(path, baseUrl, apiKey, capabilityId, onWarning, quoteHash) {
     const key = entryKey(baseUrl, apiKey, capabilityId);
-    if (!(key in entries))
-        return;
-    delete entries[key];
-    await persist(path, entries, onWarning);
+    await modifyCache(path, onWarning, (entries) => {
+        const entry = entries[key];
+        if (!entry)
+            return false;
+        if (!quoteHash) {
+            delete entries[key];
+            return true;
+        }
+        const quotes = {};
+        for (const slot of slots(entry, Date.now())) {
+            if (slot.quote.quote_hash !== quoteHash)
+                quotes[slot.quote.quote_hash] = slot;
+        }
+        const remaining = Object.values(quotes);
+        if (remaining.length === 0) {
+            delete entries[key];
+            return true;
+        }
+        const kept = remaining[remaining.length - 1];
+        entries[key] = { token: kept.token, at: kept.at, quote: kept.quote, quotes };
+        return true;
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trydreamstate/cli",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "description": "Live command-line client for the Dreamstate v1 API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",