dsh-subscriptions 0.2.0 → 0.2.2

package/lib/providers/catalog-store.js

@@ -25,7 +25,9 @@ export function modelsFilePath() {
 /** The per-account section of the file, or undefined when absent or malformed. */
 function accountSection(store, provider) {
     const accounts = store.accounts;
-    if (typeof accounts !== 'object' || accounts === null || Array.isArray(accounts))
+    if (typeof accounts !== 'object' ||
+        accounts === null ||
+        Array.isArray(accounts))
         return undefined;
     const section = accounts[provider];
     if (typeof section !== 'object' || section === null || Array.isArray(section))
@@ -45,24 +47,31 @@ function sanitizeReasoning(value) {
         if (typeof entry !== 'object' || entry === null)
             return undefined;
         const effort = entry;
-        if (typeof effort.id !== 'string' || effort.id.length === 0
-            || typeof effort.name !== 'string' || effort.name.length === 0
-            || (effort.description !== undefined && typeof effort.description !== 'string')
-            || seen.has(effort.id))
+        if (typeof effort.id !== 'string' ||
+            effort.id.length === 0 ||
+            typeof effort.name !== 'string' ||
+            effort.name.length === 0 ||
+            (effort.description !== undefined &&
+                typeof effort.description !== 'string') ||
+            seen.has(effort.id))
             return undefined;
         seen.add(effort.id);
         efforts.push({
             id: ReasoningEffortId(effort.id),
             name: effort.name,
-            ...effort.description === undefined ? {} : { description: effort.description },
+            ...(effort.description === undefined
+                ? {}
+                : { description: effort.description }),
         });
     }
-    if (raw.defaultEffort !== undefined
-        && (typeof raw.defaultEffort !== 'string' || !seen.has(raw.defaultEffort)))
+    if (raw.defaultEffort !== undefined &&
+        (typeof raw.defaultEffort !== 'string' || !seen.has(raw.defaultEffort)))
         return undefined;
     return {
         efforts,
-        ...raw.defaultEffort === undefined ? {} : { defaultEffort: ReasoningEffortId(raw.defaultEffort) },
+        ...(raw.defaultEffort === undefined
+            ? {}
+            : { defaultEffort: ReasoningEffortId(raw.defaultEffort) }),
     };
 }
 /** Validate one persisted model, or undefined when malformed. */
@@ -70,53 +79,80 @@ function sanitizeModel(value) {
     if (typeof value !== 'object' || value === null)
         return undefined;
     const raw = value;
-    if (typeof raw.id !== 'string' || raw.id.length === 0
-        || typeof raw.name !== 'string' || raw.name.length === 0
-        || (raw.description !== undefined && typeof raw.description !== 'string')
-        || (raw.contextWindow !== undefined
-            && (typeof raw.contextWindow !== 'number' || !Number.isInteger(raw.contextWindow) || raw.contextWindow <= 0))
-        || (raw.maxContextWindow !== undefined
-            && (typeof raw.maxContextWindow !== 'number' || !Number.isSafeInteger(raw.maxContextWindow) || raw.maxContextWindow <= 0))
-        || (raw.maxOutputTokens !== undefined
-            && (typeof raw.maxOutputTokens !== 'number' || !Number.isSafeInteger(raw.maxOutputTokens) || raw.maxOutputTokens <= 0))
-        || (raw.priority !== undefined
-            && (typeof raw.priority !== 'number' || !Number.isFinite(raw.priority))))
+    if (typeof raw.id !== 'string' ||
+        raw.id.length === 0 ||
+        typeof raw.name !== 'string' ||
+        raw.name.length === 0 ||
+        (raw.description !== undefined && typeof raw.description !== 'string') ||
+        (raw.contextWindow !== undefined &&
+            (typeof raw.contextWindow !== 'number' ||
+                !Number.isInteger(raw.contextWindow) ||
+                raw.contextWindow <= 0)) ||
+        (raw.maxContextWindow !== undefined &&
+            (typeof raw.maxContextWindow !== 'number' ||
+                !Number.isSafeInteger(raw.maxContextWindow) ||
+                raw.maxContextWindow <= 0)) ||
+        (raw.maxOutputTokens !== undefined &&
+            (typeof raw.maxOutputTokens !== 'number' ||
+                !Number.isSafeInteger(raw.maxOutputTokens) ||
+                raw.maxOutputTokens <= 0)) ||
+        (raw.priority !== undefined &&
+            (typeof raw.priority !== 'number' || !Number.isFinite(raw.priority))))
         return undefined;
     const reasoning = raw.reasoning === undefined ? undefined : sanitizeReasoning(raw.reasoning);
     if (raw.reasoning !== undefined && reasoning === undefined)
         return undefined;
     const thinkingType = raw.thinkingType;
-    if (thinkingType !== undefined && thinkingType !== 'enabled' && thinkingType !== 'adaptive')
+    if (thinkingType !== undefined &&
+        thinkingType !== 'enabled' &&
+        thinkingType !== 'adaptive')
         return undefined;
     const fastTier = raw.fastTier;
     if (fastTier !== undefined && typeof fastTier !== 'boolean')
         return undefined;
     const copilotWire = raw.copilotWire;
-    if (copilotWire !== undefined && copilotWire !== 'chat-completions' && copilotWire !== 'responses') {
+    if (copilotWire !== undefined &&
+        copilotWire !== 'chat-completions' &&
+        copilotWire !== 'responses') {
         return undefined;
     }
     const copilotResponses = raw.copilotResponses;
     if (copilotResponses !== undefined && typeof copilotResponses !== 'boolean')
         return undefined;
     const inputModalities = raw.inputModalities;
-    if (inputModalities !== undefined
-        && (!Array.isArray(inputModalities) || inputModalities.length === 0
-            || inputModalities.some(modality => modality !== 'text' && modality !== 'image')))
+    if (inputModalities !== undefined &&
+        (!Array.isArray(inputModalities) ||
+            inputModalities.length === 0 ||
+            inputModalities.some((modality) => modality !== 'text' && modality !== 'image')))
         return undefined;
     return {
         id: raw.id,
         name: raw.name,
-        ...raw.description === undefined ? {} : { description: raw.description },
-        ...raw.contextWindow === undefined ? {} : { contextWindow: raw.contextWindow },
-        ...raw.maxContextWindow === undefined ? {} : { maxContextWindow: raw.maxContextWindow },
-        ...raw.maxOutputTokens === undefined ? {} : { maxOutputTokens: raw.maxOutputTokens },
-        ...raw.priority === undefined ? {} : { priority: raw.priority },
-        ...reasoning === undefined ? {} : { reasoning },
-        ...thinkingType === undefined ? {} : { thinkingType: thinkingType },
-        ...fastTier === undefined ? {} : { fastTier },
-        ...copilotWire === undefined ? {} : { copilotWire: copilotWire },
-        ...copilotResponses === undefined ? {} : { copilotResponses },
-        ...inputModalities === undefined ? {} : { inputModalities: [...inputModalities] },
+        ...(raw.description === undefined
+            ? {}
+            : { description: raw.description }),
+        ...(raw.contextWindow === undefined
+            ? {}
+            : { contextWindow: raw.contextWindow }),
+        ...(raw.maxContextWindow === undefined
+            ? {}
+            : { maxContextWindow: raw.maxContextWindow }),
+        ...(raw.maxOutputTokens === undefined
+            ? {}
+            : { maxOutputTokens: raw.maxOutputTokens }),
+        ...(raw.priority === undefined ? {} : { priority: raw.priority }),
+        ...(reasoning === undefined ? {} : { reasoning }),
+        ...(thinkingType === undefined
+            ? {}
+            : { thinkingType: thinkingType }),
+        ...(fastTier === undefined ? {} : { fastTier }),
+        ...(copilotWire === undefined
+            ? {}
+            : { copilotWire: copilotWire }),
+        ...(copilotResponses === undefined ? {} : { copilotResponses }),
+        ...(inputModalities === undefined
+            ? {}
+            : { inputModalities: [...inputModalities] }),
     };
 }
 /**
@@ -164,13 +200,46 @@ async function readCatalogFile(path) {
         return {};
     }
 }
+/**
+ * Windows refuses to replace a file another handle holds open without
+ * `FILE_SHARE_DELETE` (an indexer, antivirus scan, or a second dsh profile
+ * reading the cache), surfacing as a transient `EPERM`/`EBUSY`/`EACCES` on
+ * `rename` (V1ki/dsh-plugin-subscriptions#129). On Windows only, retry
+ * briefly before giving the write up: on POSIX those codes are real
+ * failures, so retrying would only delay surfacing them.
+ */
+const RENAME_RETRY_CODES = new Set([
+    'EPERM',
+    'EBUSY',
+    'EACCES',
+]);
+const RENAME_RETRIES = 5;
+const RENAME_RETRY_DELAY_MS = 20;
+/** `rename` with a short bounded retry on Windows share-mode conflicts. */
+async function renameWithRetry(from, to) {
+    for (let attempt = 0;; attempt++) {
+        try {
+            await rename(from, to);
+            return;
+        }
+        catch (error) {
+            const code = error.code;
+            if (process.platform !== 'win32' ||
+                attempt >= RENAME_RETRIES ||
+                code === undefined ||
+                !RENAME_RETRY_CODES.has(code))
+                throw error;
+            await new Promise((resolve) => setTimeout(resolve, RENAME_RETRY_DELAY_MS * (attempt + 1)));
+        }
+    }
+}
 /** Persist the whole file atomically (tmp file + rename). */
 async function writeCatalogFile(store, path) {
     await mkdir(dirname(path), { recursive: true });
     const tmp = `${path}.tmp-${process.pid}-${Math.random().toString(36).slice(2)}`;
     try {
         await writeFile(tmp, JSON.stringify(store, null, 2));
-        await rename(tmp, path);
+        await renameWithRetry(tmp, path);
     }
     catch (error) {
         await rm(tmp, { force: true });
@@ -245,15 +314,22 @@ export function accountCatalogStore(provider, account, path = modelsFilePath())
     return {
         async load() {
             const section = accountSection(await readCatalogFile(path), provider);
-            return section !== undefined && Object.hasOwn(section, account) ? sanitizeSnapshot(section[account]) : undefined;
+            return section !== undefined && Object.hasOwn(section, account)
+                ? sanitizeSnapshot(section[account])
+                : undefined;
         },
         async save(snapshot) {
             return serialize(path, async () => {
                 const store = await readCatalogFile(path);
-                const accounts = typeof store.accounts === 'object' && store.accounts !== null && !Array.isArray(store.accounts)
+                const accounts = typeof store.accounts === 'object' &&
+                    store.accounts !== null &&
+                    !Array.isArray(store.accounts)
                     ? store.accounts
                     : {};
-                const section = { ...accountSection(store, provider) ?? {}, [account]: snapshot };
+                const section = {
+                    ...(accountSection(store, provider) ?? {}),
+                    [account]: snapshot,
+                };
                 store.accounts = { ...accounts, [provider]: section };
                 await writeCatalogFile(store, path);
             });
@@ -266,7 +342,10 @@ export function accountCatalogStore(provider, account, path = modelsFilePath())
                     return;
                 const rest = { ...section };
                 delete rest[account];
-                store.accounts = { ...store.accounts, [provider]: rest };
+                store.accounts = {
+                    ...store.accounts,
+                    [provider]: rest,
+                };
                 await writeCatalogFile(store, path);
             });
         },

package/lib/providers/claude-cli-version.js

@@ -16,9 +16,9 @@ export class ClaudeCliVersionCache extends NpmCliVersionCache {
             url: CLAUDE_CLI_VERSION_URL,
             label: 'Claude Code',
             floor: () => claudeCliVersionFloor(detect),
-            ...fetchFn === undefined ? {} : { fetchFn },
-            ...now === undefined ? {} : { now },
-            ...timeoutMs === undefined ? {} : { timeoutMs },
+            ...(fetchFn === undefined ? {} : { fetchFn }),
+            ...(now === undefined ? {} : { now }),
+            ...(timeoutMs === undefined ? {} : { timeoutMs }),
         });
     }
 }

package/lib/providers/claude.d.ts

@@ -137,6 +137,12 @@ export interface ClaudeAdapterOptions {
     resolveCliVersion?: () => Promise<string>;
     /** Cache breakpoint lifetime; absent means the API's five-minute default. */
     promptCacheTtl?: PromptCacheTtl;
+    /**
+     * The Settings page's per-route TTL override, consulted on every request so
+     * a saved change applies from the next turn without a restart. Returning
+     * undefined follows {@link ClaudeAdapterOptions.promptCacheTtl}.
+     */
+    promptCacheTtlOverride?: () => PromptCacheTtl | undefined;
 }
 /**
  * Inline image data a Claude request may carry, in base64 bytes. Every turn
@@ -161,8 +167,9 @@ export declare const CLAUDE_REQUEST_IMAGE_BUDGET: number;
  * @param effort - the reasoning effort, when the model advertises efforts.
  * @param cacheTtl - lifetime of every cache breakpoint; defaults to five minutes.
  * Requests that carry a `purpose` (compaction, session titles) always use five
- * minutes to preserve their existing auxiliary-request behavior. A five-minute
- * mark can still read an entry a one-hour mark wrote.
+ * minutes to preserve their existing auxiliary-request behavior — the override
+ * changes the TTL for ordinary turns only, never the auxiliary floor. A
+ * five-minute mark can still read an entry a one-hour mark wrote.
  * @returns the JSON body to POST.
  */
 export declare function claudeRequestBody(options: GenerateOptions, messages: readonly TranslatableMessage[], maxTokens: number, thinking?: Record<string, unknown>, effort?: string, cacheTtl?: PromptCacheTtl): Record<string, unknown>;