@thebtf/dsh-cliproxyapi-provider 0.4.3 → 0.4.4

package/src/catalog.js

@@ -1,129 +1,129 @@
-import { credentialField } from './secrets.js'
-
-const CANONICAL_REASONING_LEVELS = new Set([
-  'off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max',
-])
-
-function positiveInteger(...values) {
-  for (const value of values) {
-    if (typeof value === 'number' && Number.isInteger(value) && value > 0) return value
-  }
-}
-
-function nonEmptyString(...values) {
-  for (const value of values) {
-    if (typeof value === 'string' && value.trim()) return value.trim()
-  }
-}
-
-function normalizeReasoningLevel(value) {
-  const wire = nonEmptyString(value)?.toLowerCase()
-  if (!wire) return undefined
-  if (wire === 'none' || wire === 'off') return { canonical: 'off', wire: 'none' }
-  if (wire === 'ultra') return { canonical: 'max', wire }
-  if (!CANONICAL_REASONING_LEVELS.has(wire)) return undefined
-  return { canonical: wire, wire }
-}
-
-export function reasoningEffortsOf(entry) {
-  if (!Array.isArray(entry?.supported_reasoning_levels)) return undefined
-  const efforts = {}
-  for (const raw of entry.supported_reasoning_levels) {
-    const normalized = normalizeReasoningLevel(typeof raw === 'string' ? raw : raw?.effort)
-    if (normalized && !(normalized.canonical in efforts)) efforts[normalized.canonical] = normalized.wire
-  }
-  // llm-pi-ai rejects a capability map that offers only "off". Omitting the
-  // field correctly describes a non-reasoning model for a hand-declared route.
-  if (Object.keys(efforts).every((level) => level === 'off')) return undefined
-  return Object.keys(efforts).length ? efforts : undefined
-}
-
-function inputModalitiesOf(entry, fallback) {
-  if (!Array.isArray(entry?.input_modalities)) return [...fallback]
-  const modalities = []
-  const seen = new Set()
-  for (const raw of entry.input_modalities) {
-    const value = nonEmptyString(raw)?.toLowerCase()
-    if ((value === 'text' || value === 'image') && !seen.has(value)) {
-      seen.add(value)
-      modalities.push(value)
-    }
-  }
-  return modalities.length ? modalities : [...fallback]
-}
-function safeMetadata(value) {
-  if (Array.isArray(value)) return value.map(safeMetadata)
-  if (!value || typeof value !== 'object') return value
-  return Object.fromEntries(Object.entries(value).map(([key, item]) => [
-    key,
-    credentialField(key) ? '[redacted]' : safeMetadata(item),
-  ]))
-}
-
-
-export function modelProfileOf(entry, options = {}) {
-  const id = nonEmptyString(entry?.slug, entry?.id, entry?.model)
-  if (!id || (!options.includeHiddenModels && entry?.visibility === 'hide')) return undefined
-  const reasoningEfforts = reasoningEffortsOf(entry)
-  return {
-    id,
-    name: nonEmptyString(entry?.display_name, entry?.name, entry?.description, id),
-    contextWindow: positiveInteger(entry?.max_context_window, entry?.context_window, entry?.context_length, options.defaultContextWindow),
-    maxTokens: positiveInteger(entry?.max_output_tokens, entry?.max_completion_tokens, entry?.max_tokens, options.defaultMaxTokens),
-    input: inputModalitiesOf(entry, options.defaultInput ?? ['text']),
-    ...(reasoningEfforts ? { reasoningEfforts } : {}),
-  }
-}
-
-export function readCodexCatalogWithMetadata(body, options = {}) {
-  if (!body || !Array.isArray(body.models)) throw new TypeError('CLIProxyAPI model catalog has no "models" array')
-  const models = []
-  const discovery = []
-  const seen = new Set()
-  for (const entry of body.models) {
-    const model = modelProfileOf(entry, options)
-    if (!model || seen.has(model.id)) continue
-    seen.add(model.id)
-    const override = options.overrides?.[model.id] ?? {}
-    const overrideContext = positiveInteger(override.contextWindow)
-    const overrideMax = positiveInteger(override.maxTokens)
-    const overrideInput = Array.isArray(override.inputModalities) && override.inputModalities.length && override.inputModalities.every((value) => value === 'text' || value === 'image') ? [...new Set(override.inputModalities)] : undefined
-    const overrideEfforts = override.reasoningEfforts && typeof override.reasoningEfforts === 'object' && !Array.isArray(override.reasoningEfforts) ? Object.fromEntries(Object.entries(override.reasoningEfforts).filter(([level, wire]) => CANONICAL_REASONING_LEVELS.has(level) && (typeof wire === 'string' && wire.length > 0 || level === 'off' && wire === null))) : undefined
-    if (overrideContext) model.contextWindow = overrideContext
-    if (typeof override.name === 'string' && override.name) model.name = override.name
-    if (override.reasoningEfforts === false) delete model.reasoningEfforts
-    if (override.compat && typeof override.compat === 'object') model.compat = override.compat
-    if (overrideMax) model.maxTokens = overrideMax
-    if (overrideInput) model.input = overrideInput
-    if (overrideEfforts && Object.keys(overrideEfforts).some((level) => level !== 'off')) model.reasoningEfforts = overrideEfforts
-    const defaultEffort = normalizeReasoningLevel(override.defaultReasoningEffort ?? entry.default_reasoning_level)?.canonical
-    models.push(model)
-    discovery.push({
-      ...model,
-      inputModalities: [...model.input],
-      ...(defaultEffort && model.reasoningEfforts?.[defaultEffort] !== undefined ? { defaultReasoningEffort: defaultEffort } : {}),
-      catalogMetadata: safeMetadata(entry),
-      catalogSources: {
-        contextWindow: overrideContext ? 'override' : positiveInteger(entry.max_context_window, entry.context_window, entry.context_length) ? 'cpa' : 'default',
-        maxTokens: overrideMax ? 'override' : positiveInteger(entry.max_output_tokens, entry.max_completion_tokens, entry.max_tokens) ? 'cpa' : 'default',
-        inputModalities: overrideInput ? 'override' : Array.isArray(entry.input_modalities) && entry.input_modalities.some((value) => ['text', 'image'].includes(nonEmptyString(value)?.toLowerCase())) ? 'cpa' : 'default',
-        reasoningEfforts: overrideEfforts && Object.keys(overrideEfforts).some((level) => level !== 'off') ? 'override' : reasoningEffortsOf(entry) ? 'cpa' : 'default',
-      },
-    })
-  }
-  if (!models.length) throw new TypeError('CLIProxyAPI model catalog contains no usable models')
-  return { models, discovery }
-}
-
-export function readCodexCatalog(body, options = {}) {
-  return readCodexCatalogWithMetadata(body, options).models
-}
-
-export function catalogURL(baseURL) {
-  const base = String(baseURL ?? '').trim()
-  if (!base) throw new TypeError('CLIProxyAPI baseURL must not be empty')
-  const url = new URL(base)
-  url.pathname = url.pathname.replace(/\/+$/, '') + '/models'
-  url.searchParams.set('client_version', 'dsh-cliproxyapi-provider')
-  return url.toString()
-}
+import { credentialField } from './secrets.js'
+
+const CANONICAL_REASONING_LEVELS = new Set([
+  'off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max',
+])
+
+function positiveInteger(...values) {
+  for (const value of values) {
+    if (typeof value === 'number' && Number.isInteger(value) && value > 0) return value
+  }
+}
+
+function nonEmptyString(...values) {
+  for (const value of values) {
+    if (typeof value === 'string' && value.trim()) return value.trim()
+  }
+}
+
+function normalizeReasoningLevel(value) {
+  const wire = nonEmptyString(value)?.toLowerCase()
+  if (!wire) return undefined
+  if (wire === 'none' || wire === 'off') return { canonical: 'off', wire: 'none' }
+  if (wire === 'ultra') return { canonical: 'max', wire }
+  if (!CANONICAL_REASONING_LEVELS.has(wire)) return undefined
+  return { canonical: wire, wire }
+}
+
+export function reasoningEffortsOf(entry) {
+  if (!Array.isArray(entry?.supported_reasoning_levels)) return undefined
+  const efforts = {}
+  for (const raw of entry.supported_reasoning_levels) {
+    const normalized = normalizeReasoningLevel(typeof raw === 'string' ? raw : raw?.effort)
+    if (normalized && !(normalized.canonical in efforts)) efforts[normalized.canonical] = normalized.wire
+  }
+  // llm-pi-ai rejects a capability map that offers only "off". Omitting the
+  // field correctly describes a non-reasoning model for a hand-declared route.
+  if (Object.keys(efforts).every((level) => level === 'off')) return undefined
+  return Object.keys(efforts).length ? efforts : undefined
+}
+
+function inputModalitiesOf(entry, fallback) {
+  if (!Array.isArray(entry?.input_modalities)) return [...fallback]
+  const modalities = []
+  const seen = new Set()
+  for (const raw of entry.input_modalities) {
+    const value = nonEmptyString(raw)?.toLowerCase()
+    if ((value === 'text' || value === 'image') && !seen.has(value)) {
+      seen.add(value)
+      modalities.push(value)
+    }
+  }
+  return modalities.length ? modalities : [...fallback]
+}
+function safeMetadata(value) {
+  if (Array.isArray(value)) return value.map(safeMetadata)
+  if (!value || typeof value !== 'object') return value
+  return Object.fromEntries(Object.entries(value).map(([key, item]) => [
+    key,
+    credentialField(key) ? '[redacted]' : safeMetadata(item),
+  ]))
+}
+
+
+export function modelProfileOf(entry, options = {}) {
+  const id = nonEmptyString(entry?.slug, entry?.id, entry?.model)
+  if (!id || (!options.includeHiddenModels && entry?.visibility === 'hide')) return undefined
+  const reasoningEfforts = reasoningEffortsOf(entry)
+  return {
+    id,
+    name: nonEmptyString(entry?.display_name, entry?.name, entry?.description, id),
+    contextWindow: positiveInteger(entry?.max_context_window, entry?.context_window, entry?.context_length, options.defaultContextWindow),
+    maxTokens: positiveInteger(entry?.max_output_tokens, entry?.max_completion_tokens, entry?.max_tokens, options.defaultMaxTokens),
+    input: inputModalitiesOf(entry, options.defaultInput ?? ['text']),
+    ...(reasoningEfforts ? { reasoningEfforts } : {}),
+  }
+}
+
+export function readCodexCatalogWithMetadata(body, options = {}) {
+  if (!body || !Array.isArray(body.models)) throw new TypeError('CLIProxyAPI model catalog has no "models" array')
+  const models = []
+  const discovery = []
+  const seen = new Set()
+  for (const entry of body.models) {
+    const model = modelProfileOf(entry, options)
+    if (!model || seen.has(model.id)) continue
+    seen.add(model.id)
+    const override = options.overrides?.[model.id] ?? {}
+    const overrideContext = positiveInteger(override.contextWindow)
+    const overrideMax = positiveInteger(override.maxTokens)
+    const overrideInput = Array.isArray(override.inputModalities) && override.inputModalities.length && override.inputModalities.every((value) => value === 'text' || value === 'image') ? [...new Set(override.inputModalities)] : undefined
+    const overrideEfforts = override.reasoningEfforts && typeof override.reasoningEfforts === 'object' && !Array.isArray(override.reasoningEfforts) ? Object.fromEntries(Object.entries(override.reasoningEfforts).filter(([level, wire]) => CANONICAL_REASONING_LEVELS.has(level) && (typeof wire === 'string' && wire.length > 0 || level === 'off' && wire === null))) : undefined
+    if (overrideContext) model.contextWindow = overrideContext
+    if (typeof override.name === 'string' && override.name) model.name = override.name
+    if (override.reasoningEfforts === false) delete model.reasoningEfforts
+    if (override.compat && typeof override.compat === 'object') model.compat = override.compat
+    if (overrideMax) model.maxTokens = overrideMax
+    if (overrideInput) model.input = overrideInput
+    if (overrideEfforts && Object.keys(overrideEfforts).some((level) => level !== 'off')) model.reasoningEfforts = overrideEfforts
+    const defaultEffort = normalizeReasoningLevel(override.defaultReasoningEffort ?? entry.default_reasoning_level)?.canonical
+    models.push(model)
+    discovery.push({
+      ...model,
+      inputModalities: [...model.input],
+      ...(defaultEffort && model.reasoningEfforts?.[defaultEffort] !== undefined ? { defaultReasoningEffort: defaultEffort } : {}),
+      catalogMetadata: safeMetadata(entry),
+      catalogSources: {
+        contextWindow: overrideContext ? 'override' : positiveInteger(entry.max_context_window, entry.context_window, entry.context_length) ? 'cpa' : 'default',
+        maxTokens: overrideMax ? 'override' : positiveInteger(entry.max_output_tokens, entry.max_completion_tokens, entry.max_tokens) ? 'cpa' : 'default',
+        inputModalities: overrideInput ? 'override' : Array.isArray(entry.input_modalities) && entry.input_modalities.some((value) => ['text', 'image'].includes(nonEmptyString(value)?.toLowerCase())) ? 'cpa' : 'default',
+        reasoningEfforts: overrideEfforts && Object.keys(overrideEfforts).some((level) => level !== 'off') ? 'override' : reasoningEffortsOf(entry) ? 'cpa' : 'default',
+      },
+    })
+  }
+  if (!models.length) throw new TypeError('CLIProxyAPI model catalog contains no usable models')
+  return { models, discovery }
+}
+
+export function readCodexCatalog(body, options = {}) {
+  return readCodexCatalogWithMetadata(body, options).models
+}
+
+export function catalogURL(baseURL) {
+  const base = String(baseURL ?? '').trim()
+  if (!base) throw new TypeError('CLIProxyAPI baseURL must not be empty')
+  const url = new URL(base)
+  url.pathname = url.pathname.replace(/\/+$/, '') + '/models'
+  url.searchParams.set('client_version', 'dsh-cliproxyapi-provider')
+  return url.toString()
+}

package/src/connection-store.js

@@ -1,98 +1,98 @@
-import { createHash, randomUUID } from 'node:crypto'
-import { mkdir, open, rename, unlink, writeFile } from 'node:fs/promises'
-import { basename, dirname } from 'node:path'
-import { dshHomePath } from '@deepseek-ai/dsh-home-paths'
-import { ConnectionError, validateEndpoint } from './connection.js'
-
-// A connection snapshot that only this plugin owns. The settings row lives in
-// the profile patch file and can disappear when the host profile is rebuilt, a
-// row is denied by a core-compatibility gate, or the user reinstalls the
-// bundle. The snapshot is the reconnect source of truth for those cases.
-const MAX_SNAPSHOT_BYTES = 256 * 1024
-const IDENTITY_TYPES = new Set(['none', 'reference', 'record'])
-
-function snapshotPath(documentPath) {
-  // Keyed by the profile, not by the profile path: a rebuilt profile has a new
-  // patch file path but keeps its name, so the snapshot must survive the rebuild.
-  const profile = documentPath ? basename(dirname(documentPath)) : 'default'
-  const name = /^[\w.-]{1,64}$/.test(profile) ? profile : createHash('sha256').update(profile).digest('hex').slice(0, 16)
-  return dshHomePath('llm-cliproxyapi', name + '.json')
-}
-
-function validIdentity(identity) {
-  if (!identity || typeof identity !== 'object' || Array.isArray(identity)) return false
-  if (!IDENTITY_TYPES.has(identity.type)) return false
-  if (identity.type === 'reference') return typeof identity.ref === 'string' && identity.ref.length > 0
-  if (identity.type === 'record') return typeof identity.key === 'string' && identity.key.length > 0
-  return Object.keys(identity).length === 1
-}
-
-const plain = (value) => value !== null && typeof value === 'object' && !Array.isArray(value)
-
-export function snapshotOf(value) {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new TypeError('A connection is required')
-  if (typeof value.baseURL !== 'string' || !value.baseURL) throw new TypeError('A connection endpoint is required')
-  if (typeof value.generation !== 'string' || !/^[a-f0-9]{64}$/.test(value.generation)) throw new TypeError('A connection generation is required')
-  if (!validIdentity(value.authIdentity)) throw new TypeError('A connection identity is required')
-  validateEndpoint(value.baseURL)
-  if (value.policy !== undefined && !plain(value.policy)) throw new TypeError('A connection policy must be an object')
-  if (value.overrides !== undefined && !plain(value.overrides)) throw new TypeError('Connection overrides must be an object')
-  if (value.modelSelection !== undefined && (!plain(value.modelSelection) || Object.values(value.modelSelection).some((selected) => typeof selected !== 'boolean'))) throw new TypeError('A model selection must contain booleans')
-  return {
-    schemaVersion: 1,
-    baseURL: value.baseURL,
-    authIdentity: structuredClone(value.authIdentity),
-    enabled: value.enabled !== false,
-    policy: structuredClone(value.policy ?? {}),
-    modelSelection: structuredClone(value.modelSelection ?? {}),
-    overrides: structuredClone(value.overrides ?? {}),
-    generation: value.generation,
-    ...(typeof value.operationId === 'string' && value.operationId ? { operationId: value.operationId } : {}),
-  }
-}
-
-export async function writeConnectionSnapshot(documentPath, value) {
-  const snapshot = { ...snapshotOf(value), savedAt: Date.now() }
-  const contents = JSON.stringify(snapshot)
-  if (Buffer.byteLength(contents) > MAX_SNAPSHOT_BYTES) throw new RangeError('Connection snapshot exceeds 256 KiB')
-  const file = snapshotPath(documentPath)
-  await mkdir(dirname(file), { recursive: true })
-  const temporary = `${file}.${randomUUID()}.tmp`
-  try {
-    await writeFile(temporary, contents, { encoding: 'utf8', flag: 'wx', mode: 0o600 })
-    await rename(temporary, file)
-  } catch (error) {
-    await unlink(temporary).catch(() => { })
-    throw error
-  }
-  return snapshot
-}
-
-export async function readConnectionSnapshot(documentPath) {
-  let data
-  try {
-    const handle = await open(snapshotPath(documentPath), 'r')
-    try {
-      const buffer = Buffer.alloc(MAX_SNAPSHOT_BYTES + 1)
-      const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0)
-      if (bytesRead > MAX_SNAPSHOT_BYTES) return undefined
-      data = buffer.subarray(0, bytesRead)
-    } finally {
-      await handle.close()
-    }
-  } catch (error) {
-    if (error?.code === 'ENOENT') return undefined
-    throw error
-  }
-  let value
-  try { value = JSON.parse(data.toString('utf8')) } catch { return undefined }
-  if (!value || value.schemaVersion !== 1 || !Number.isFinite(value.savedAt)) return undefined
-  try { return snapshotOf(value) } catch { return undefined }
-}
-
-export async function removeConnectionSnapshot(documentPath) {
-  try { await unlink(snapshotPath(documentPath)); return true } catch (error) {
-    if (error?.code === 'ENOENT') return false
-    throw new ConnectionError('SNAPSHOT_UNAVAILABLE', 'Connection snapshot could not be removed')
-  }
-}
+import { createHash, randomUUID } from 'node:crypto'
+import { mkdir, open, rename, unlink, writeFile } from 'node:fs/promises'
+import { basename, dirname } from 'node:path'
+import { dshHomePath } from '@deepseek-ai/dsh-home-paths'
+import { ConnectionError, validateEndpoint } from './connection.js'
+
+// A connection snapshot that only this plugin owns. The settings row lives in
+// the profile patch file and can disappear when the host profile is rebuilt, a
+// row is denied by a core-compatibility gate, or the user reinstalls the
+// bundle. The snapshot is the reconnect source of truth for those cases.
+const MAX_SNAPSHOT_BYTES = 256 * 1024
+const IDENTITY_TYPES = new Set(['none', 'reference', 'record'])
+
+function snapshotPath(documentPath) {
+  // Keyed by the profile, not by the profile path: a rebuilt profile has a new
+  // patch file path but keeps its name, so the snapshot must survive the rebuild.
+  const profile = documentPath ? basename(dirname(documentPath)) : 'default'
+  const name = /^[\w.-]{1,64}$/.test(profile) ? profile : createHash('sha256').update(profile).digest('hex').slice(0, 16)
+  return dshHomePath('llm-cliproxyapi', name + '.json')
+}
+
+function validIdentity(identity) {
+  if (!identity || typeof identity !== 'object' || Array.isArray(identity)) return false
+  if (!IDENTITY_TYPES.has(identity.type)) return false
+  if (identity.type === 'reference') return typeof identity.ref === 'string' && identity.ref.length > 0
+  if (identity.type === 'record') return typeof identity.key === 'string' && identity.key.length > 0
+  return Object.keys(identity).length === 1
+}
+
+const plain = (value) => value !== null && typeof value === 'object' && !Array.isArray(value)
+
+export function snapshotOf(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new TypeError('A connection is required')
+  if (typeof value.baseURL !== 'string' || !value.baseURL) throw new TypeError('A connection endpoint is required')
+  if (typeof value.generation !== 'string' || !/^[a-f0-9]{64}$/.test(value.generation)) throw new TypeError('A connection generation is required')
+  if (!validIdentity(value.authIdentity)) throw new TypeError('A connection identity is required')
+  validateEndpoint(value.baseURL)
+  if (value.policy !== undefined && !plain(value.policy)) throw new TypeError('A connection policy must be an object')
+  if (value.overrides !== undefined && !plain(value.overrides)) throw new TypeError('Connection overrides must be an object')
+  if (value.modelSelection !== undefined && (!plain(value.modelSelection) || Object.values(value.modelSelection).some((selected) => typeof selected !== 'boolean'))) throw new TypeError('A model selection must contain booleans')
+  return {
+    schemaVersion: 1,
+    baseURL: value.baseURL,
+    authIdentity: structuredClone(value.authIdentity),
+    enabled: value.enabled !== false,
+    policy: structuredClone(value.policy ?? {}),
+    modelSelection: structuredClone(value.modelSelection ?? {}),
+    overrides: structuredClone(value.overrides ?? {}),
+    generation: value.generation,
+    ...(typeof value.operationId === 'string' && value.operationId ? { operationId: value.operationId } : {}),
+  }
+}
+
+export async function writeConnectionSnapshot(documentPath, value) {
+  const snapshot = { ...snapshotOf(value), savedAt: Date.now() }
+  const contents = JSON.stringify(snapshot)
+  if (Buffer.byteLength(contents) > MAX_SNAPSHOT_BYTES) throw new RangeError('Connection snapshot exceeds 256 KiB')
+  const file = snapshotPath(documentPath)
+  await mkdir(dirname(file), { recursive: true })
+  const temporary = `${file}.${randomUUID()}.tmp`
+  try {
+    await writeFile(temporary, contents, { encoding: 'utf8', flag: 'wx', mode: 0o600 })
+    await rename(temporary, file)
+  } catch (error) {
+    await unlink(temporary).catch(() => { })
+    throw error
+  }
+  return snapshot
+}
+
+export async function readConnectionSnapshot(documentPath) {
+  let data
+  try {
+    const handle = await open(snapshotPath(documentPath), 'r')
+    try {
+      const buffer = Buffer.alloc(MAX_SNAPSHOT_BYTES + 1)
+      const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0)
+      if (bytesRead > MAX_SNAPSHOT_BYTES) return undefined
+      data = buffer.subarray(0, bytesRead)
+    } finally {
+      await handle.close()
+    }
+  } catch (error) {
+    if (error?.code === 'ENOENT') return undefined
+    throw error
+  }
+  let value
+  try { value = JSON.parse(data.toString('utf8')) } catch { return undefined }
+  if (!value || value.schemaVersion !== 1 || !Number.isFinite(value.savedAt)) return undefined
+  try { return snapshotOf(value) } catch { return undefined }
+}
+
+export async function removeConnectionSnapshot(documentPath) {
+  try { await unlink(snapshotPath(documentPath)); return true } catch (error) {
+    if (error?.code === 'ENOENT') return false
+    throw new ConnectionError('SNAPSHOT_UNAVAILABLE', 'Connection snapshot could not be removed')
+  }
+}