@goodandready/dsh-subscriptions 0.6.45 → 0.6.47

package/lib/adapter.js

@@ -309,7 +309,19 @@ export class SubscriptionAdapter extends LlmAdapter {
             }
             throw err
           } finally {
-            if (errorCaught) {
+            const isFinishError = finishReason && (
+              finishReason.kind === 'error' ||
+              finishReason === 'error' ||
+              (typeof finishReason === 'object' && Boolean(finishReason.failure))
+            )
+            if (errorCaught || isFinishError) {
+              if (!errorCaught && isFinishError) {
+                errorCaught = new Error(
+                  typeof finishReason === 'object' && finishReason.failure
+                    ? (finishReason.failure.message || finishReason.failure.code || 'stream finished with error')
+                    : 'stream finished with error'
+                )
+              }
               finalizeOnce('error')
             } else if (opts && opts._runawayState && opts._runawayState.tripped) {
               finalizeOnce('runaway')

package/lib/subscriptions.js

@@ -2,6 +2,7 @@ import { isProvider } from "./refs.js"
 import { pickAccount, markCooldown, isSwitchableError, modelFamily } from "./rotate.js"
 import { quotaSnapshot } from "./ratelimit.js"
 import { pickFetch } from "./proxy.js"
+import { fetchWithTimeout } from "./http.js"
 
 // ponytail: allowlist per provider — add path to extend without touching request logic
 export const ALLOWLIST = {
@@ -75,7 +76,7 @@ export function createSubscriptionsService(deps) {
       }
       return out
     },
-    async request({ provider, path, method = "GET", headers = {}, body, signal }) {
+    async request({ provider, path, method = "GET", headers = {}, body, signal, timeoutMs }) {
       if (!isProvider(provider)) {
         const err = new Error("unknown provider: " + provider)
         err.code = "PROVIDER"
@@ -144,8 +145,9 @@ export function createSubscriptionsService(deps) {
           const url = p
           const extraHeaders = headersFor(provider, blob, cfg)
           const fetchImpl = pickFetch(deps, account.ref)
+          const requestTimeoutMs = Number(timeoutMs) > 0 ? Number(timeoutMs) : 30000
           const t0 = Date.now()
-          const res = await fetchImpl(url, {
+          const res = await fetchWithTimeout(fetchImpl, url, {
             method,
             headers: {
               Authorization: "Bearer " + blob.accessToken,
@@ -156,7 +158,7 @@ export function createSubscriptionsService(deps) {
             },
             body: body && typeof body === "object" && !(body instanceof Uint8Array) && typeof body !== "string" ? JSON.stringify(body) : body,
             signal,
-          })
+          }, { timeoutMs: requestTimeoutMs })
           // capture quota
           try {
             const snap = quotaSnapshot(provider, res.headers, null, Date.now())

package/lib/tools-normalizer.js

@@ -35,8 +35,8 @@ export function normalizeJsonSchema(schema, depth = 0) {
     out.type = "object"
   } else if (schema.items) {
     out.type = "array"
-  } else if (schema.anyOf || schema.oneOf || schema.allOf) {
-    // Schema combinator without explicit type
+  } else if (schema.anyOf || schema.oneOf || schema.allOf || schema.$ref || schema.const !== undefined) {
+    // Schema combinator, reference, or const without explicit type
   } else {
     out.type = depth === 0 ? "object" : "string"
   }
@@ -53,6 +53,26 @@ export function normalizeJsonSchema(schema, depth = 0) {
     out.default = schema.default
   }
 
+  if (typeof schema.$ref === "string") {
+    out.$ref = schema.$ref
+  }
+
+  if (schema.const !== undefined) {
+    out.const = schema.const
+  }
+
+  const defs = schema.$defs || schema.definitions
+  if (defs && typeof defs === "object" && !Array.isArray(defs)) {
+    const normDefs = {}
+    for (const [k, v] of Object.entries(defs)) {
+      if (typeof k === "string" && k) {
+        normDefs[k] = normalizeJsonSchema(v, depth + 1)
+      }
+    }
+    if (schema.$defs) out.$defs = normDefs
+    if (schema.definitions) out.definitions = normDefs
+  }
+
   if (out.type === "object" || (!out.type && (schema.properties || schema.required || schema.additionalProperties !== undefined))) {
     if (schema.properties && typeof schema.properties === "object" && !Array.isArray(schema.properties)) {
       out.properties = {}

package/lib/vendors/codex.js

@@ -1,4 +1,4 @@
-import { isTimeoutError } from "../http.js"
+import { isTimeoutError, fetchWithTimeout } from "../http.js"
 import { randomUUID, createHash } from 'node:crypto'
 import { buildAuthorizeUrl } from '../oauth.js'
 import { codexResponsesBody, modelCatalog } from '../messages.js'
@@ -152,9 +152,9 @@ export async function listModels(blob, cfg, fetchImpl) {
   try {
     const base = (cfg.baseUrl || defaults().baseUrl).replace(/\/$/, '')
     const version = cfg.clientVersion || defaults().clientVersion
-    const res = await impl(`${base}/models?client_version=${encodeURIComponent(version)}`, {
+    const res = await fetchWithTimeout(impl, `${base}/models?client_version=${encodeURIComponent(version)}`, {
       headers: identityHeaders(blob, cfg, { Accept: 'application/json' }),
-    })
+    }, { timeoutMs: 15000 })
     const json = await readJson(res)
     const rows = []
     for (const entry of json.models || json.data || []) {
@@ -186,9 +186,9 @@ export async function check(blob, cfg, fetchImpl) {
   const base = (cfg.baseUrl || defaults().baseUrl).replace(/\/$/, "")
   const version = cfg.clientVersion || defaults().clientVersion
   const impl = fetchImpl || fetch
-  const res = await impl(base + "/models?client_version=" + encodeURIComponent(version), {
+  const res = await fetchWithTimeout(impl, base + "/models?client_version=" + encodeURIComponent(version), {
     headers: identityHeaders(blob, cfg, { Accept: "application/json" }),
-  })
+  }, { timeoutMs: 15000 })
   if (!res.ok) throw httpError(res.status, await res.text())
   const json = await readJson(res)
   // quota headers may contain limits
@@ -197,7 +197,7 @@ export async function check(blob, cfg, fetchImpl) {
 
 export async function usage(blob, cfg, fetchImpl) {
   try {
-    const res = await (fetchImpl || fetch)(USAGE, {
+    const res = await fetchWithTimeout(fetchImpl || fetch, USAGE, {
       headers: identityHeaders(blob, cfg, { Accept: 'application/json' }),
     })
     const json = await readJson(res)

package/lib/wire.js

@@ -88,7 +88,7 @@ export function toTokenUsage(raw) {
     "inputTokens" in raw || "input_tokens" in raw || "promptTokens" in raw || "prompt_tokens" in raw || "input" in raw ||
     "outputTokens" in raw || "output_tokens" in raw || "completionTokens" in raw || "completion_tokens" in raw || "output" in raw ||
     "totalTokens" in raw || "total_tokens" in raw || "totalTokenCount" in raw ||
-    "promptTokenCount" in raw || "candidatesTokenCount" in raw
+    "promptTokenCount" in raw || "candidatesTokenCount" in raw || "thoughtsTokenCount" in raw
   )
   if (!hasKnownField) return null
 
@@ -135,7 +135,8 @@ export function toTokenUsage(raw) {
     raw.reasoningTokens ??
     raw.output_token_details?.reasoning_tokens ??
     raw.completion_tokens_details?.reasoning_tokens ??
-    raw.reasoning_tokens
+    raw.reasoning_tokens ??
+    raw.thoughtsTokenCount
   )
   const rawTotal = toCount(raw.totalTokens ?? raw.total_tokens ?? raw.totalTokenCount)
 
@@ -150,7 +151,7 @@ export function toTokenUsage(raw) {
   if (cacheWriteTokens > 0 || raw.cacheWriteTokens !== undefined || raw.cache_creation_input_tokens !== undefined) {
     out.cacheWriteTokens = cacheWriteTokens
   }
-  if (reasoningTokens > 0 || raw.reasoningTokens !== undefined || raw.output_token_details?.reasoning_tokens !== undefined || raw.completion_tokens_details?.reasoning_tokens !== undefined) {
+  if (reasoningTokens > 0 || raw.reasoningTokens !== undefined || raw.output_token_details?.reasoning_tokens !== undefined || raw.completion_tokens_details?.reasoning_tokens !== undefined || raw.thoughtsTokenCount !== undefined) {
     out.reasoningTokens = reasoningTokens
   }
   if (rawTotal > 0 || raw.totalTokens !== undefined || raw.total_tokens !== undefined || raw.totalTokenCount !== undefined) {

package/package.json

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