@goodandready/dsh-subscriptions 0.7.41 → 0.7.42

package/lib/accounts.js

@@ -50,6 +50,7 @@ import { accountIdentityKey, credentialState } from './account-reliability.js'
 import { recordSwitch, recordExhaust, recordBroken, computeHealthScore, healthBadge } from './health.js'
 import { executeWithRetry } from './backoff.js'
 import { getVendor } from './vendors/index.js'
+import { versionForProvider } from './client-version-service.js'
 
 const SKEW_MS = 60 * 1000
 const USAGE_TTL_MS = 2 * 60 * 1000
@@ -99,6 +100,8 @@ export function vendorConfig(provider, cfg) {
     return String(value).trim()
   }
   const modelsKey = `${provider}Models`
+  const manualVersion = provider === 'claude' ? pick('CcVersion', '') : pick('ClientVersion', '')
+  const resolvedVersion = versionForProvider(provider, manualVersion, d.clientVersion || d.claudeCcVersion || '')
   return {
     clientId: pick('ClientId', d.clientId),
     clientSecret: pick('ClientSecret', d.clientSecret || ''),
@@ -106,7 +109,8 @@ export function vendorConfig(provider, cfg) {
     baseUrl: pick('BaseUrl', d.baseUrl || ''),
     originator: pick('Originator', d.originator || ''),
     systemPrefix: pick('SystemPrefix', d.systemPrefix || ''),
-    clientVersion: pick('ClientVersion', d.clientVersion || ''),
+    clientVersion: resolvedVersion.version,
+    ...(provider === 'claude' ? { claudeCcVersion: resolvedVersion.version } : {}),
     // #93/#92: per-vendor request shaping (codex only consumes these today).
     verbosity: pick('Verbosity', ''),
     fastMode: !!(cfg && cfg[`${provider}FastMode`]),

package/lib/client-version-service.js

@@ -0,0 +1,73 @@
+import { execFileSync } from 'node:child_process'
+import { resolveClientVersion } from './client-version.js'
+
+const PACKAGES = { codex: '@openai/codex', claude: '@anthropic-ai/claude-code' }
+const BINARIES = { codex: 'codex', claude: 'claude' }
+const TTL_MS = 6 * 60 * 60 * 1000
+const state = {
+  codex: { npm: '', local: '', at: 0 },
+  claude: { npm: '', local: '', at: 0 },
+}
+let inflight = null
+
+function npmMetaUrl(name) {
+  return 'https://registry.npmjs.org/' + encodeURIComponent(name) + '/latest'
+}
+
+function localVersion(binary) {
+  try {
+    const out = execFileSync(binary, ['--version'], { encoding: 'utf8', timeout: 1500, stdio: ['ignore', 'pipe', 'ignore'] })
+    const m = /\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/.exec(String(out))
+    return m ? m[0] : ''
+  } catch { return '' }
+}
+
+async function npmVersion(name, fetchImpl, signal) {
+  try {
+    const res = await fetchImpl(npmMetaUrl(name), { headers: { Accept: 'application/json' }, signal })
+    if (!res.ok) return ''
+    const json = await res.json()
+    return typeof json?.version === 'string' ? json.version : ''
+  } catch { return '' }
+}
+
+export function clientVersionInfo(fallbacks = {}, configs = {}) {
+  const out = {}
+  for (const provider of Object.keys(PACKAGES)) {
+    const npm = state[provider].npm
+    const local = state[provider].local
+    out[provider] = resolveClientVersion({
+      configValue: configs[provider] || '',
+      npmVersion: npm,
+      localVersion: local,
+      fallback: fallbacks[provider] || '',
+    })
+  }
+  return out
+}
+
+/** @param {{ fetchImpl?: typeof fetch, force?: boolean, signal?: AbortSignal, localVersionFn?: (binary: string) => string }} [options] */
+export async function refreshClientVersions({ fetchImpl = fetch, force = false, signal, localVersionFn = localVersion } = {}) {
+  const now = Date.now()
+  if (!force && Object.values(state).every((row) => row.at && now - row.at < TTL_MS)) return clientVersionInfo()
+  if (inflight) return inflight
+  inflight = (async () => {
+    for (const [provider, name] of Object.entries(PACKAGES)) {
+      const npm = await npmVersion(name, fetchImpl, signal)
+      const local = localVersionFn(BINARIES[provider])
+      state[provider] = { npm, local, at: now }
+    }
+    return clientVersionInfo()
+  })().finally(() => { inflight = null })
+  return inflight
+}
+
+export function resetClientVersionCache() {
+  for (const key of Object.keys(state)) state[key] = { npm: '', local: '', at: 0 }
+  inflight = null
+}
+
+export function versionForProvider(provider, configValue, fallback) {
+  const cached = state[provider] || {}
+  return resolveClientVersion({ configValue, npmVersion: cached.npm, localVersion: cached.local, fallback })
+}

package/lib/client-version.js

@@ -1,4 +1,6 @@
-/** #798: choose a client version with deterministic source precedence. */
+/** #798: choose a client version with deterministic source precedence.
+ * @param {{ configValue?: string, npmVersion?: string, localVersion?: string, fallback?: string }} [options]
+ */
 export function resolveClientVersion({ configValue, npmVersion, localVersion, fallback } = {}) {
   const values = [
     ['config', configValue],

package/lib/client.js

@@ -249,6 +249,7 @@ window.__ModuleLoader__.load({
       "subsLogged": "connected",
       "subsNotLogged": "not connected",
       "subsCooldown": "cooldown",
+      "clientVersions": "Client versions",
       "settingsLoading": "Loading settings…",
       "settingsUnavailable": "Settings are unavailable",
       "settingsRetry": "Retry",
@@ -656,6 +657,7 @@ window.__ModuleLoader__.load({
       "subsLogged": "已连接",
       "subsNotLogged": "未连接",
       "subsCooldown": "冷却中",
+      "clientVersions": "客户端版本",
       "settingsLoading": "正在加载设置…",
       "settingsUnavailable": "设置加载失败",
       "settingsRetry": "重试",
@@ -1103,6 +1105,7 @@ window.__ModuleLoader__.load({
       const [accounts, setAccounts] = React.useState([])
       const [providers, setProviders] = React.useState([])
       const [modelsCatalog, setModelsCatalog] = React.useState([])
+      const [clientVersions, setClientVersions] = React.useState(null)
       const [modelQuery, setModelQuery] = React.useState('')
       const [modelSort, setModelSort] = React.useState('name')
       const [modelLimit, setModelLimit] = React.useState(40)
@@ -1490,6 +1493,7 @@ window.__ModuleLoader__.load({
         setAccounts((data && data.accounts) || [])
         setProviders((data && data.providers) || [])
         setModelsCatalog((data && data.modelsCatalog) || [])
+        setClientVersions((data && data.clientVersions) || null)
       }
 
       let reloadSeq = 0
@@ -1969,6 +1973,14 @@ window.__ModuleLoader__.load({
           className: updater.message.includes(t('updateSuccessRestart')) ? 'dsub-alert-ok' : 'dsub-alert-bad',
           style: { marginBottom: '12px' }
         }, updater.message) : null,
+        clientVersions ? h('div', {
+          'data-pane': 'overview',
+          className: 'dsub-sub',
+          style: { marginBottom: '10px' },
+        }, t('clientVersions') + ': ' + ['codex', 'claude'].map((provider) => {
+          const row = clientVersions[provider]
+          return provider + ' ' + (row && row.version ? row.version : '?') + ' (' + (row && row.source || 'none') + ')'
+        }).join(' · ')) : null,
         smoke.result ? h('div', {
           'data-pane': 'overview',
           className: smoke.result.ok ? 'dsub-alert-ok' : 'dsub-alert-bad',

package/lib/compat.js

@@ -1,7 +1,7 @@
 /** #816: normalize host API shape differences in one place. */
 export function toolCallId(value) {
   if (!value || typeof value !== 'object') return ''
-  return String(value.toolCallId || value.tool_call_id || value.callId || value.call_id || value.id || '')
+  return String(value.toolCallId || value.tool_call_id || value.toolUseId || value.tool_use_id || value.callId || value.call_id || value.id || '')
 }
 
 export function normalizeRpcResult(value) {
@@ -14,6 +14,7 @@ export function normalizeRpcResult(value) {
 
 export function hostCompatibilityError(detail) {
   const suffix = detail ? `: ${String(detail)}` : ''
+  /** @type {Error & { code?: string }} */
   const err = new Error(`unsupported DSH host API${suffix}`)
   err.code = 'DSH_HOST_INCOMPATIBLE'
   return err

package/lib/config-schema.js

@@ -117,7 +117,11 @@ export const Config = z.object({
   codexRedirectUri: z.string().volatile().default(''),
   codexBaseUrl: z.string().volatile().default(''),
   codexClientVersion: z.string().volatile().default('')
-    .description('Codex CLI identity version for /models catalog gating (e.g. 0.160.0). Empty uses the built-in default.'),
+    .description('Codex CLI identity version for /models catalog gating (e.g. 0.160.0). Empty uses npm/local/built-in resolution.'),
+  codexWebSearch: z.boolean().volatile().default(true)
+    .description('#815 Expose Codex subscription search as the host web_search provider. Off releases the seam.'),
+  codexWebSearchModel: z.string().volatile().default('gpt-5.6-luna')
+    .description('#815 Model used for Codex web-search turns.'),
   claudeClientId: z.string().volatile().default(''),
   claudeRedirectUri: z.string().volatile().default(''),
   grokClientId: z.string().volatile().default(''),

package/lib/index.js

@@ -24,6 +24,11 @@ import { createResetCreditService } from './reset-credits.js'
 import { maskEmail, maskLabel } from './mask.js'
 import { proxyFetch } from './proxy.js'
 import { shouldBypassProxy } from './feature-helpers.js'
+import { refreshClientVersions } from './client-version-service.js'
+import { normalizeRpcResult, hostCompatibilityError } from './compat.js'
+import { CodexWebSearchProvider } from './web-search-provider.js'
+import { identityHeaders } from './vendors/codex.js'
+import { webSearchRetryDelay } from './feature-helpers.js'
 import { HistoryStore, resolveHistoryDir } from './history.js'
 import { createDiagnosticsReport } from './diagnostics.js'
 import { createAccountsView } from './accounts-view.js'
@@ -49,7 +54,7 @@ export { pushToWebdav, pullFromWebdav, pushToGist, pullFromGist, buildS3SigV4Hea
 import { syncVaultPush, syncVaultPull, getVaultSyncStatus } from './vault-sync.js'
 
 export const name = '@goodandready/dsh-subscriptions'
-export const inject = ['llm', 'credentials', 'webServer', 'settings', 'tools']
+export const inject = ['llm', 'credentials', 'webServer', 'settings', 'tools', 'web']
 
 const NS = 'dsh-subscriptions'
 
@@ -168,11 +173,16 @@ export function apply(ctx, rawConfig) {
       const parsed = plainConfig(next)
       const prevConfig = cachedConfig
       try {
+        let rpc
         if (typeof settingsSvc?.update === 'function') {
-          await settingsSvc.update(NS, structuredClone(parsed), expectedRevision !== undefined ? expectedRevision : describeRow()?.revision)
+          rpc = await settingsSvc.update(NS, structuredClone(parsed), expectedRevision !== undefined ? expectedRevision : describeRow()?.revision)
         } else if (typeof settingsSvc?.replace === 'function') {
-          await settingsSvc.replace(NS, structuredClone(parsed), expectedRevision !== undefined ? expectedRevision : describeRow()?.revision)
+          rpc = await settingsSvc.replace(NS, structuredClone(parsed), expectedRevision !== undefined ? expectedRevision : describeRow()?.revision)
+        } else {
+          throw hostCompatibilityError('settings.update/replace is missing')
         }
+        const result = rpc === undefined ? { ok: true } : normalizeRpcResult(rpc)
+        if (!result.ok) throw new Error('settings update was not acknowledged by the host')
         cachedConfig = parsed
         clearKeyRotationCache()
         clearOllamaHealthCache()
@@ -214,6 +224,9 @@ export function apply(ctx, rawConfig) {
       const row = describeRow()
       if (row && row.value) syncSnapshot(plainConfig(Config(plainConfig(row.value))))
       else syncSnapshot()
+      if ((live().slots || []).some((slot) => slot && (slot.provider === 'codex' || slot.provider === 'claude'))) {
+        refreshClientVersions({ fetchImpl: fetch }).catch(() => {})
+      }
       reconcileSlots().catch(() => {})
     } catch { /* keep existing snapshot on error */ }
   }
@@ -228,10 +241,14 @@ export function apply(ctx, rawConfig) {
     }, 'dsh-subscriptions: settings change listener')
   }
 
-  Promise.resolve().then(() => {
+  Promise.resolve().then(async () => {
     reconcileSlots().catch((err) => {
       if (logger && logger.warn) logger.warn('[dsh-subscriptions] reconcileSlots initial error: ' + (err && err.message || err))
     })
+    const logged = await store.loggedInProviders().catch(() => [])
+    if (logged.some((provider) => provider === 'codex' || provider === 'claude')) {
+      refreshClientVersions({ fetchImpl: fetch }).catch(() => {})
+    }
   })
 
   const fetchForRef = (ref) => {
@@ -280,6 +297,47 @@ export function apply(ctx, rawConfig) {
   }
   const recordHistory = (entry) => history.add(entry)
 
+  // #815: register Codex subscription search behind the host web seam.
+  if (ctx.web && typeof ctx.web.registerSearchProvider === 'function') {
+    const provider = new CodexWebSearchProvider({
+      available: () => !!live().codexWebSearch,
+      search: async (request, signal) => {
+        const rows = await store.listAccounts('codex')
+        const row = (rows || []).find((account) => account && account.hasToken && account.ref)
+        if (!row) throw new Error('Codex web search requires a connected Codex account')
+        const raw = await store.resolveRaw(row.ref)
+        if (!raw) throw new Error('Codex web search requires a connected Codex account')
+        const blob = await store.ensureFresh('codex', parseBlob(raw), row.ref)
+        const cfg = vendorConfig('codex', live())
+        const base = (cfg.baseUrl || 'https://chatgpt.com/backend-api/codex').replace(/\/$/, '')
+        const fetchFn = fetchForRef(row.ref) || fetch
+        let attempt = 0
+        for (;;) {
+          const res = await fetchFn(base + '/responses', {
+            method: 'POST',
+            headers: identityHeaders(blob, cfg, { 'Content-Type': 'application/json', Accept: 'application/json' }),
+            body: JSON.stringify({
+              model: live().codexWebSearchModel || 'gpt-5.6-luna',
+              input: [{ role: 'user', content: [{ type: 'input_text', text: String(request.query || '') }] }],
+              tools: [{ type: 'web_search' }],
+              stream: false,
+            }),
+            signal,
+          })
+          if (res.ok) return res.json()
+          const delay = webSearchRetryDelay(attempt, res.status)
+          if (delay == null) throw new Error('Codex web search failed: HTTP ' + res.status)
+          await new Promise((resolve) => setTimeout(resolve, delay))
+          attempt += 1
+        }
+      },
+    })
+    ctx.effect(() => {
+      const dispose = ctx.web.registerSearchProvider(provider)
+      return () => { if (typeof dispose === 'function') dispose() }
+    }, 'dsh-subscriptions: codex web search provider')
+  }
+
   // #85: host-only reset credit service for Codex accounts.
   const resetCredits = createResetCreditService({ loadBlob: (ref) => store.loadBlob(ref) })
   function refForSlot(provider, indexOrAlias) {

package/lib/messages.js

@@ -2,6 +2,7 @@ import { createHash } from 'node:crypto'
 import { extractImages, toOpenAiImage, toAnthropicImage, toGeminiImage, toCodexImage } from './images.js'
 import { normalizeTools } from './tools-normalizer.js'
 import { geminiFunctionDeclarations } from './gemini-schema.js'
+import { toolCallId as callIdOf } from './compat.js'
 
 function flattenText(content) {
   if (typeof content === 'string') return content
@@ -45,7 +46,7 @@ export function openaiMessages(options) {
           function: { name: block.name, arguments: block.arguments || '{}' },
         })),
         ...((message.tool_calls || message.toolCalls || []).map((c) => ({
-          id: c.id || c.call_id,
+          id: callIdOf(c),
           type: 'function',
           function: {
             name: c.name || (c.function && c.function.name),
@@ -61,7 +62,7 @@ export function openaiMessages(options) {
       continue
     }
     if (message.role === 'tool') {
-      const toolCallId = String(message.toolCallId || message.tool_call_id || message.call_id || message.id || '')
+      const toolCallId = callIdOf(message)
       const content = typeof message.content === 'string'
         ? message.content
         : (flattenText(message.content) || JSON.stringify(message.content || ''))
@@ -89,7 +90,7 @@ export function openaiMessages(options) {
     for (const result of results) {
       out.push({
         role: 'tool',
-        tool_call_id: String(result.toolCallId || result.tool_call_id || result.call_id || result.id || ''),
+        tool_call_id: callIdOf(result),
         content: typeof result.content === 'string' ? result.content : (flattenText(result.content) || '(no output)'),
       })
     }
@@ -213,7 +214,7 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
       const calls = [
         ...toolCalls(message.content),
         ...((message.tool_calls || message.toolCalls || []).map((c) => ({
-          id: c.id || c.call_id,
+          id: callIdOf(c),
           name: c.name || (c.function && c.function.name),
           arguments: typeof c.arguments === 'string' ? c.arguments : (c.function && c.function.arguments) || c.arguments || '{}',
         }))),
@@ -232,7 +233,7 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
     }
     if (message.role === 'tool') {
       flush()
-      const callId = String(message.toolCallId || message.tool_call_id || message.call_id || message.id || '')
+      const callId = callIdOf(message)
       const outText = typeof message.content === 'string'
         ? message.content
         : (flattenText(message.content) || JSON.stringify(message.content || ''))
@@ -259,7 +260,7 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
     }
     for (const result of results) {
       flush()
-      const callId = String(result.toolCallId || result.tool_call_id || result.call_id || result.id || '')
+      const callId = callIdOf(result)
       const outText = typeof result.content === 'string'
         ? result.content
         : (flattenText(result.content) || (result.output != null ? (typeof result.output === 'string' ? result.output : JSON.stringify(result.output)) : ''))
@@ -324,7 +325,7 @@ export function anthropicPayload(options, extraSystem) {
       const calls = [
         ...toolCalls(message.content),
         ...((message.tool_calls || message.toolCalls || []).map((c) => ({
-          id: c.id || c.call_id,
+          id: callIdOf(c),
           name: c.name || (c.function && c.function.name),
           arguments: c.arguments || (c.function && c.function.arguments) || "{}",
         }))),
@@ -342,7 +343,7 @@ export function anthropicPayload(options, extraSystem) {
       continue
     }
     if (message.role === "tool") {
-      const toolUseId = String(message.toolCallId || message.tool_call_id || message.tool_use_id || message.id || "")
+      const toolUseId = callIdOf(message)
       const images = extractImages(message.content)
       let content = typeof message.content === "string"
         ? message.content
@@ -375,7 +376,7 @@ export function anthropicPayload(options, extraSystem) {
       if (blk) blocks.push(blk)
     }
     for (const result of toolResults(message.content)) {
-      const toolUseId = String(result.toolCallId || result.tool_call_id || result.tool_use_id || result.id || "")
+      const toolUseId = callIdOf(result)
       const content = typeof result.content === "string"
         ? result.content
         : (flattenText(result.content) || (result.output != null ? (typeof result.output === "string" ? result.output : JSON.stringify(result.output)) : ""))

package/lib/routes/status.js

@@ -30,6 +30,7 @@ import { assessHealth } from '../health-report.js'
 import { probeOllama } from '../ollama-health.js'
 import { defaultSnapshotStore } from '../vault-snapshots.js'
 import { collectSourceChain } from './sources.js'
+import { clientVersionInfo } from '../client-version-service.js'
 
 export function registerStatusRoutes(ctx, state) {
   const {
@@ -71,6 +72,13 @@ export function registerStatusRoutes(ctx, state) {
         liveConfig: live(),
         hideDeprecated: !!live().hideDeprecatedModels,
       }),
+      clientVersions: clientVersionInfo({
+        codex: getVendor('codex').defaults().clientVersion,
+        claude: getVendor('claude').defaults().clientVersion,
+      }, {
+        codex: live().codexClientVersion,
+        claude: live().claudeCcVersion,
+      }),
       queue: defaultConcurrencyQueue.stats(),
     }
   }

package/lib/vendors/codex.js

@@ -60,7 +60,7 @@ export function authorizeUrl(cfg, pkce) {
   })
 }
 
-function identityHeaders(blob, config, extra) {
+export function identityHeaders(blob, config, extra) {
   const originator = headerSafeValue(config.originator || 'codex_cli_rs')
   const activeOrgId = headerSafeValue(blob.selectedOrgId || blob.accountId || '')
   return {

package/lib/web-search-provider.js

@@ -0,0 +1,64 @@
+const MAX_BYTES = 64 * 1024
+
+function outputText(payload) {
+  if (typeof payload?.output_text === 'string') return payload.output_text
+  if (!Array.isArray(payload?.output)) return ''
+  return payload.output
+    .flatMap((item) => Array.isArray(item?.content) ? item.content : [])
+    .filter((block) => block && (block.type === 'output_text' || block.type === 'text'))
+    .map((block) => String(block.text || ''))
+    .join('')
+}
+
+function citationSources(payload) {
+  const sources = []
+  const seen = new Set()
+  const visit = (value) => {
+    if (!value || typeof value !== 'object') return
+    if (Array.isArray(value)) { value.forEach(visit); return }
+    for (const key of Object.keys(value)) {
+      if (key !== 'content' && key !== 'annotations' && key !== 'citations') continue
+      const nested = value[key]
+      if (!Array.isArray(nested)) continue
+      for (const item of nested) {
+        if (item && typeof item === 'object') visit(item)
+      }
+    }
+    const annotations = Array.isArray(value.annotations) ? value.annotations : []
+    for (const annotation of annotations) {
+      const url = String(annotation?.url || annotation?.link || '')
+      if (!url || seen.has(url)) continue
+      seen.add(url)
+      sources.push({ url, ...(annotation.title ? { title: String(annotation.title) } : {}) })
+    }
+  }
+  visit(payload?.output)
+  visit(payload?.citations)
+  return sources
+}
+
+/** #815: map a Codex responses payload into the host WebSearchResult contract. */
+export function normalizeCodexSearch(payload, maxBytes = MAX_BYTES) {
+  return {
+    content: String(outputText(payload) || '').slice(0, maxBytes),
+    sources: citationSources(payload).slice(0, 50),
+    truncated: false,
+  }
+}
+
+export class CodexWebSearchProvider {
+  constructor({ available, search }) {
+    this.id = 'subscriptions-codex'
+    this._available = available
+    this._search = search
+  }
+
+  available() {
+    try { return !!this._available() } catch { return false }
+  }
+
+  async search(request, signal) {
+    if (!this.available()) throw new Error('Codex web search is not available')
+    return normalizeCodexSearch(await this._search(request, signal))
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.7.41",
+  "version": "0.7.42",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",