@goodandready/dsh-subscriptions 0.6.20 → 0.6.21

package/lib/adapter.js

@@ -43,15 +43,16 @@ export class SubscriptionAdapter extends LlmAdapter {
 
   async listModels(provider) {
     const accounts = await this.deps.listAccounts(provider)
-    if (!accounts.some((a) => a.hasToken)) return []
+    const targetAccount = accounts.find((a) => a.hasToken)
+    if (!targetAccount) return []
     const cfg = this.deps.vendorConfig(provider)
-    const fetchImpl = this.deps.fetchImpl || fetch
+    const fetchImpl = pickFetch(this.deps, targetAccount.ref)
     let models = null
     try {
       const blob = await this.deps.ensureFresh(
         provider,
-        await this.deps.loadBlob(accounts.find((a) => a.hasToken).ref),
-        accounts.find((a) => a.hasToken).ref,
+        await this.deps.loadBlob(targetAccount.ref),
+        targetAccount.ref,
       )
       const live = await getVendor(provider).listModels(blob, cfg, fetchImpl)
       if (Array.isArray(live) && live.length) models = live

package/lib/messages.js

@@ -10,11 +10,13 @@ function flattenText(content) {
 }
 
 function toolResults(content) {
-  return Array.isArray(content) ? content.filter((b) => b && b.type === 'tool-result') : []
+  if (!Array.isArray(content)) return []
+  return content.filter((b) => b && (b.type === 'tool-result' || b.type === 'tool_result' || b.type === 'function_call_output'))
 }
 
 function toolCalls(content) {
-  return Array.isArray(content) ? content.filter((b) => b && b.type === 'tool-call') : []
+  if (!Array.isArray(content)) return []
+  return content.filter((b) => b && (b.type === 'tool-call' || b.type === 'tool_use' || b.type === 'function_call'))
 }
 
 export function openaiMessages(options) {
@@ -26,11 +28,21 @@ export function openaiMessages(options) {
       continue
     }
     if (message.role === 'assistant') {
-      const calls = toolCalls(message.content).map((block) => ({
-        id: block.id,
-        type: 'function',
-        function: { name: block.name, arguments: block.arguments || '{}' },
-      }))
+      const calls = [
+        ...toolCalls(message.content).map((block) => ({
+          id: block.id,
+          type: 'function',
+          function: { name: block.name, arguments: block.arguments || '{}' },
+        })),
+        ...((message.tool_calls || message.toolCalls || []).map((c) => ({
+          id: c.id || c.call_id,
+          type: 'function',
+          function: {
+            name: c.name || (c.function && c.function.name),
+            arguments: typeof c.arguments === 'string' ? c.arguments : (c.function && c.function.arguments) || '{}',
+          },
+        }))),
+      ]
       out.push({
         role: 'assistant',
         content: flattenText(message.content) || (calls.length ? null : ''),
@@ -38,14 +50,26 @@ export function openaiMessages(options) {
       })
       continue
     }
+    if (message.role === 'tool') {
+      const toolCallId = String(message.toolCallId || message.tool_call_id || message.call_id || message.id || '')
+      const content = typeof message.content === 'string'
+        ? message.content
+        : (flattenText(message.content) || JSON.stringify(message.content || ''))
+      out.push({
+        role: 'tool',
+        tool_call_id: toolCallId,
+        content: content || '(no output)',
+      })
+      continue
+    }
     const results = toolResults(message.content)
     const text = flattenText(message.content)
     if (text || !results.length) out.push({ role: 'user', content: text })
     for (const result of results) {
       out.push({
         role: 'tool',
-        tool_call_id: result.toolCallId,
-        content: flattenText(result.content) || '(no output)',
+        tool_call_id: String(result.toolCallId || result.tool_call_id || result.call_id || result.id || ''),
+        content: typeof result.content === 'string' ? result.content : (flattenText(result.content) || '(no output)'),
       })
     }
   }
@@ -65,16 +89,74 @@ export function openaiTools(options) {
   }))
 }
 
+export function reconcileResponsesInput(items) {
+  const result = []
+  const callsSeen = new Set()
+  const outputsSeen = new Set()
+
+  for (const it of items) {
+    if (it && it.type === 'function_call_output' && it.call_id) {
+      outputsSeen.add(it.call_id)
+    }
+  }
+
+  const pendingCalls = []
+  for (const it of items) {
+    if (!it) continue
+    if (it.type === 'function_call') {
+      if (it.call_id) {
+        callsSeen.add(it.call_id)
+        if (!outputsSeen.has(it.call_id)) {
+          pendingCalls.push(it.call_id)
+        }
+      }
+      result.push(it)
+      continue
+    }
+    if (it.type === 'function_call_output') {
+      // Drop orphan output if no matching preceding call
+      if (it.call_id && callsSeen.has(it.call_id)) {
+        result.push(it)
+      }
+      continue
+    }
+    // Flush synthetic outputs for any calls that did not get output before user/assistant turn
+    while (pendingCalls.length) {
+      const orphanId = pendingCalls.shift()
+      result.push({
+        type: 'function_call_output',
+        call_id: orphanId,
+        output: '{"status":"interrupted"}',
+      })
+    }
+    result.push(it)
+  }
+
+  while (pendingCalls.length) {
+    const orphanId = pendingCalls.shift()
+    result.push({
+      type: 'function_call_output',
+      call_id: orphanId,
+      output: '{"status":"interrupted"}',
+    })
+  }
+
+  if (!result.length) {
+    result.push({ role: 'user', content: [{ type: 'input_text', text: '' }] })
+  }
+  return result
+}
+
 export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
   const systemParts = []
   if (options.system) systemParts.push(options.system)
-  const input = []
+  const rawInput = []
   let pendingRole = null
   let pendingContent = []
   function flush() {
     if (!pendingRole) return
     const type = pendingRole === 'assistant' ? 'output_text' : 'input_text'
-    input.push({
+    rawInput.push({
       role: pendingRole,
       content: pendingContent.length ? pendingContent : [{ type, text: '' }],
     })
@@ -95,30 +177,61 @@ export function codexResponsesBody(options, fallbackInstructions, vendorCfg) {
     if (message.role === 'assistant') {
       const text = flattenText(message.content)
       if (text) addText('assistant', text)
-      for (const call of toolCalls(message.content)) {
+      const calls = [
+        ...toolCalls(message.content),
+        ...((message.tool_calls || message.toolCalls || []).map((c) => ({
+          id: c.id || c.call_id,
+          name: c.name || (c.function && c.function.name),
+          arguments: typeof c.arguments === 'string' ? c.arguments : (c.function && c.function.arguments) || c.arguments || '{}',
+        }))),
+      ]
+      for (const call of calls) {
+        if (!call.id) continue
         flush()
-        input.push({
+        rawInput.push({
           type: 'function_call',
-          call_id: String(call.id || ''),
+          call_id: String(call.id),
           name: call.name,
           arguments: typeof call.arguments === 'string' ? call.arguments : JSON.stringify(call.arguments || {}),
         })
       }
       continue
     }
+    if (message.role === 'tool') {
+      flush()
+      const callId = String(message.toolCallId || message.tool_call_id || message.call_id || message.id || '')
+      const outText = typeof message.content === 'string'
+        ? message.content
+        : (flattenText(message.content) || JSON.stringify(message.content || ''))
+      if (callId) {
+        rawInput.push({
+          type: 'function_call_output',
+          call_id: callId,
+          output: outText,
+        })
+      }
+      continue
+    }
+    const results = toolResults(message.content)
     const text = flattenText(message.content)
     if (text) addText('user', text)
-    for (const result of toolResults(message.content)) {
+    for (const result of results) {
       flush()
-      input.push({
-        type: 'function_call_output',
-        call_id: String(result.toolCallId || ''),
-        output: flattenText(result.content) || '',
-      })
+      const callId = String(result.toolCallId || result.tool_call_id || result.call_id || result.id || '')
+      const outText = typeof result.content === 'string'
+        ? result.content
+        : (flattenText(result.content) || (result.output != null ? (typeof result.output === 'string' ? result.output : JSON.stringify(result.output)) : ''))
+      if (callId) {
+        rawInput.push({
+          type: 'function_call_output',
+          call_id: callId,
+          output: outText,
+        })
+      }
     }
   }
   flush()
-  if (!input.length) input.push({ role: 'user', content: [{ type: 'input_text', text: '' }] })
+  const input = reconcileResponsesInput(rawInput)
   const tools = openaiTools(options)
   const responsesTools = tools && tools.map((tool) => ({
     type: 'function',
@@ -160,7 +273,16 @@ export function anthropicPayload(options, extraSystem) {
       const blocks = []
       const text = flattenText(message.content)
       if (text) blocks.push({ type: 'text', text })
-      for (const call of toolCalls(message.content)) {
+      const calls = [
+        ...toolCalls(message.content),
+        ...((message.tool_calls || message.toolCalls || []).map((c) => ({
+          id: c.id || c.call_id,
+          name: c.name || (c.function && c.function.name),
+          arguments: c.arguments || (c.function && c.function.arguments) || '{}',
+        }))),
+      ]
+      for (const call of calls) {
+        if (!call.id) continue
         blocks.push({
           type: 'tool_use',
           id: call.id,
@@ -171,14 +293,33 @@ export function anthropicPayload(options, extraSystem) {
       messages.push({ role: 'assistant', content: blocks.length ? blocks : [{ type: 'text', text: '' }] })
       continue
     }
+    if (message.role === 'tool') {
+      const toolUseId = String(message.toolCallId || message.tool_call_id || message.tool_use_id || message.id || '')
+      const content = typeof message.content === 'string'
+        ? message.content
+        : (flattenText(message.content) || JSON.stringify(message.content || ''))
+      messages.push({
+        role: 'user',
+        content: [{
+          type: 'tool_result',
+          tool_use_id: toolUseId,
+          content: content || '',
+        }],
+      })
+      continue
+    }
     const blocks = []
     const text = flattenText(message.content)
     if (text) blocks.push({ type: 'text', text })
     for (const result of toolResults(message.content)) {
+      const toolUseId = String(result.toolCallId || result.tool_call_id || result.tool_use_id || result.id || '')
+      const content = typeof result.content === 'string'
+        ? result.content
+        : (flattenText(result.content) || (result.output != null ? (typeof result.output === 'string' ? result.output : JSON.stringify(result.output)) : ''))
       blocks.push({
         type: 'tool_result',
-        tool_use_id: result.toolCallId,
-        content: flattenText(result.content) || '',
+        tool_use_id: toolUseId,
+        content: content || '',
       })
     }
     messages.push({ role: 'user', content: blocks.length ? blocks : [{ type: 'text', text: '' }] })
@@ -210,18 +351,45 @@ export function googleContents(options) {
       systemParts.push({ text: flattenText(message.content) })
       continue
     }
+    if (message.role === 'tool') {
+      const name = message.toolName || message.name || 'tool'
+      const output = typeof message.content === 'string'
+        ? message.content
+        : (flattenText(message.content) || JSON.stringify(message.content || ''))
+      contents.push({
+        role: 'user',
+        parts: [{
+          functionResponse: {
+            name,
+            response: { output },
+          },
+        }],
+      })
+      continue
+    }
     const role = message.role === 'assistant' ? 'model' : 'user'
     const parts = []
     const text = flattenText(message.content)
     if (text) parts.push({ text })
-    for (const call of toolCalls(message.content)) {
+    const calls = [
+      ...toolCalls(message.content),
+      ...((message.tool_calls || message.toolCalls || []).map((c) => ({
+        name: c.name || (c.function && c.function.name),
+        arguments: c.arguments || (c.function && c.function.arguments) || '{}',
+      }))),
+    ]
+    for (const call of calls) {
       parts.push({ functionCall: { name: call.name, args: safeJson(call.arguments) } })
     }
     for (const result of toolResults(message.content)) {
+      const name = result.toolName || result.name || 'tool'
+      const output = typeof result.content === 'string'
+        ? result.content
+        : (flattenText(result.content) || (result.output != null ? (typeof result.output === 'string' ? result.output : JSON.stringify(result.output)) : ''))
       parts.push({
         functionResponse: {
-          name: result.toolName || result.name || 'tool',
-          response: { output: flattenText(result.content) },
+          name,
+          response: { output },
         },
       })
     }
@@ -242,24 +410,32 @@ export function googleContents(options) {
 }
 
 function safeJson(text) {
-  if (text && typeof text === 'object') return text
-  try { return JSON.parse(text || '{}') } catch { return {} }
+  if (typeof text === 'object' && text !== null) return text
+  try { return JSON.parse(text) } catch { return {} }
 }
 
-export function modelCatalog(provider, entries) {
-  return (entries || []).map((entry) => {
-    if (!entry) return null
-    if (typeof entry === 'string') return { provider, id: entry, name: entry }
-    const id = entry.id || entry.slug || entry.name
-    if (!id) return null
-    return {
-      provider,
-      id,
-      name: entry.name || entry.display_name || id,
-      ...(entry.description ? { description: entry.description } : {}),
-      ...(entry.contextWindow ? { contextWindow: entry.contextWindow } : {}),
-      ...(entry.inputModalities ? { inputModalities: entry.inputModalities } : {}),
-      ...(entry.reasoning ? { reasoning: entry.reasoning } : {}),
+export function modelCatalog(provider, list) {
+  if (!Array.isArray(list)) return []
+  const out = []
+  for (const entry of list) {
+    if (!entry) continue
+    if (typeof entry === 'string') {
+      out.push({ provider, id: entry, name: entry })
+      continue
     }
-  }).filter(Boolean)
-}
+    if (typeof entry === 'object') {
+      const id = entry.id || entry.slug || entry.name
+      if (!id) continue
+      out.push({
+        provider,
+        id,
+        name: entry.name || entry.display_name || id,
+        ...(entry.description ? { description: entry.description } : {}),
+        ...(entry.contextWindow || entry.context_window ? { contextWindow: entry.contextWindow || entry.context_window } : {}),
+        ...(entry.reasoning != null ? { reasoning: entry.reasoning } : {}),
+        ...(entry.inputModalities || entry.input_modalities ? { inputModalities: entry.inputModalities || entry.input_modalities } : {}),
+      })
+    }
+  }
+  return out
+}

package/lib/vendors/codex.js

@@ -30,6 +30,9 @@ export function defaults() {
     baseUrl: 'https://chatgpt.com/backend-api/codex',
     originator: 'codex_cli_rs',
     models: [
+      { id: 'gpt-5.6-luna', name: 'GPT-5.6 Luna' },
+      { id: 'gpt-5.3-codex', name: 'GPT-5.3 Codex' },
+      { id: 'gpt-5.2-codex', name: 'GPT-5.2 Codex' },
       { id: 'gpt-5.1-codex', name: 'GPT-5.1 Codex' },
       { id: 'gpt-5.1-codex-mini', name: 'GPT-5.1 Codex Mini' },
       { id: 'gpt-5.1', name: 'GPT-5.1' },
@@ -141,7 +144,8 @@ export async function refresh(cfg, blob, fetchImpl) {
 }
 
 export async function listModels(blob, cfg, fetchImpl) {
-  const catalog = modelCatalog(id, cfg.models || defaults().models)
+  const rawModels = (cfg && cfg.models && cfg.models.length) ? cfg.models : defaults().models
+  const catalog = modelCatalog(id, rawModels)
   const impl = fetchImpl || fetch
   try {
     const base = (cfg.baseUrl || defaults().baseUrl).replace(/\/$/, '')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.20",
+  "version": "0.6.21",
   "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",