@goodandready/dsh-subscriptions 0.6.32 → 0.6.34

package/lib/index.js

@@ -65,7 +65,7 @@ const OK_HTML = `<!doctype html>
 </html>`
 
 export function apply(ctx, rawConfig) {
-  const logger = typeof ctx.logger === 'function' ? ctx.logger('subscriptions') : (ctx.logger || ctx.log)
+  const logger = typeof ctx.logger === 'function' ? ctx.logger('subscriptions') : (ctx.logger || undefined)
   let settingsApi
 
   let cachedConfig = Config(rawConfig || {})

package/lib/updater.js

@@ -172,7 +172,9 @@ export function readLockPid(lockPath) {
     try {
       const parsed = JSON.parse(content)
       if (parsed && typeof parsed.pid === "number") return parsed.pid
-    } catch {}
+    } catch {
+      // Ignore invalid JSON lockfile format; fall through to numeric/regex parsing
+    }
     const num = parseInt(content, 10)
     if (!isNaN(num) && num > 0) return num
     const match = /\b(\d{1,8})\b/.exec(content)
@@ -220,7 +222,9 @@ export function checkAndCleanLock(profileDir, childPid) {
     try {
       rmSync(lockPath, { recursive: true, force: true })
       return { locked: false, cleaned: true }
-    } catch {}
+    } catch {
+      // Ignore lockfile removal failure on fallback cleanup
+    }
   }
   return { locked: true }
 }
@@ -252,9 +256,9 @@ export async function installExactPackage(target, packageSpec, options = {}) {
     const timeoutMs = options.timeoutMs ?? UPDATE_TIMEOUT_MS
     const timer = setTimeout(() => {
       timedOut = true
-      try { child.kill('SIGTERM') } catch {}
+      try { child.kill('SIGTERM') } catch { /* ignore if process is already terminated */ }
       setTimeout(() => {
-        try { child.kill('SIGKILL') } catch {}
+        try { child.kill('SIGKILL') } catch { /* ignore if process is already terminated */ }
         checkAndCleanLock(target.profileDir, child.pid)
       }, 500).unref?.()
       reject(new Error('Update timed out; use the normal DSH update flow.'))

package/lib/vendors/cody.js

@@ -4,9 +4,9 @@ import { openaiChatStream, httpError } from '../wire.js'
 import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'cody'
-export const CODY_API_BASE = 'https://sourcegraph.com/.api'
+const CODY_API_BASE = 'https://sourcegraph.com/.api'
 
-export const CODY_MODELS = [
+const CODY_MODELS = [
   {
     id: 'cody-claude-3.5-sonnet',
     name: 'Claude 3.5 Sonnet (Sourcegraph Cody)',
@@ -17,7 +17,7 @@ export const CODY_MODELS = [
 ]
 
 /** Catalog id -> Sourcegraph model name. */
-export const CODY_MODEL_ALIASES = {
+const CODY_MODEL_ALIASES = {
   'cody-claude-3.5-sonnet': 'claude-3-5-sonnet',
 }
 

package/lib/vendors/copilot.js

@@ -8,11 +8,11 @@ export const id = "copilot"
 export const COPILOT_CLIENT_ID = "Iv1.b507a08c87ecfe98"
 export const COPILOT_DEVICE_CODE_URL = "https://github.com/login/device/code"
 export const COPILOT_DEVICE_TOKEN_URL = "https://github.com/login/oauth/access_token"
-export const COPILOT_TOKEN_URL = "https://api.github.com/copilot_internal/v2/token"
-export const COPILOT_API_URL = "https://api.githubcopilot.com/chat/completions"
-export const COPILOT_USER_URL = "https://api.github.com/user"
+const COPILOT_TOKEN_URL = "https://api.github.com/copilot_internal/v2/token"
+const COPILOT_API_URL = "https://api.githubcopilot.com/chat/completions"
+const COPILOT_USER_URL = "https://api.github.com/user"
 
-export const COPILOT_MODELS = [
+const COPILOT_MODELS = [
   {
     id: "claude-3.7-sonnet",
     name: "Claude 3.7 Sonnet (Copilot)",
@@ -198,7 +198,7 @@ export async function refresh(cfg, blob, fetchImpl) {
   }
 }
 
-export async function exchangeCopilotToken(githubToken, fetchImpl) {
+async function exchangeCopilotToken(githubToken, fetchImpl) {
   const impl = fetchImpl || fetch
   const res = await impl(COPILOT_TOKEN_URL, {
     method: "GET",

package/lib/vendors/cursor.js

@@ -5,12 +5,12 @@ import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'cursor'
 
-export const CURSOR_API_BASE = 'https://api2.cursor.sh'
-export const CURSOR_USAGE_URL = 'https://api2.cursor.sh/aiserver.v1.DashboardService/GetCurrentPeriodUsage'
-export const CURSOR_AGENT_URL = 'https://agentn.us.api5.cursor.sh/agent.v1.AgentService/Run'
-export const CURSOR_CLIENT_VERSION = 'cli-2026.05.01-eea359f'
+const CURSOR_API_BASE = 'https://api2.cursor.sh'
+const CURSOR_USAGE_URL = 'https://api2.cursor.sh/aiserver.v1.DashboardService/GetCurrentPeriodUsage'
+const CURSOR_AGENT_URL = 'https://agentn.us.api5.cursor.sh/agent.v1.AgentService/Run'
+const CURSOR_CLIENT_VERSION = 'cli-2026.05.01-eea359f'
 
-export const CURSOR_MODELS = [
+const CURSOR_MODELS = [
   {
     id: 'composer-2.5',
     name: 'Composer 2.5 Fast',

package/lib/vendors/ernie.js

@@ -5,9 +5,9 @@ import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'ernie'
 export const ERNIE_OAUTH_URL = 'https://aip.baidubce.com/oauth/2.0/token'
-export const ERNIE_BASE_URL = 'https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat'
+const ERNIE_BASE_URL = 'https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat'
 
-export const ERNIE_MODELS = [
+const ERNIE_MODELS = [
   {
     id: 'ernie-speed-128k',
     name: 'ERNIE Speed 128K',
@@ -43,7 +43,7 @@ export async function listModels() {
   return ERNIE_MODELS
 }
 
-export async function refreshErnieToken(apiKey, secretKey, fetchImpl) {
+async function refreshErnieToken(apiKey, secretKey, fetchImpl) {
   const impl = fetchImpl || fetch
   const url = `${ERNIE_OAUTH_URL}?grant_type=client_credentials&client_id=${encodeURIComponent(apiKey)}&client_secret=${encodeURIComponent(secretKey)}`
   const res = await impl(url, { method: 'POST' })

package/lib/vendors/glm.js

@@ -5,11 +5,11 @@ import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'glm'
 
-export const GLM_CODING_URL = 'https://api.z.ai/api/coding/paas/v4/chat/completions'
-export const GLM_QUOTA_URL = 'https://api.z.ai/api/monitor/usage/quota/limit'
-export const GLM_USER_AGENT = 'ZCode/3.10.1'
+const GLM_CODING_URL = 'https://api.z.ai/api/coding/paas/v4/chat/completions'
+const GLM_QUOTA_URL = 'https://api.z.ai/api/monitor/usage/quota/limit'
+const GLM_USER_AGENT = 'ZCode/3.10.1'
 
-export const GLM_MODELS = [
+const GLM_MODELS = [
   {
     id: 'glm-4-plus',
     name: 'GLM-4-Plus (Coding Plan)',

package/lib/vendors/jetbrains.js

@@ -4,9 +4,9 @@ import { openaiChatStream, httpError } from '../wire.js'
 import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'jetbrains'
-export const JETBRAINS_API_BASE = 'https://api.jetbrains.ai'
+const JETBRAINS_API_BASE = 'https://api.jetbrains.ai'
 
-export const JETBRAINS_MODELS = [
+const JETBRAINS_MODELS = [
   {
     id: 'jb-claude-3.5-sonnet',
     name: 'Claude 3.5 Sonnet (JetBrains AI)',

package/lib/vendors/kimi.js

@@ -5,12 +5,12 @@ import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'kimi'
 
-export const KIMI_CLIENT_ID = '17e5f671-d194-4dfb-9706-5516cb48c098'
-export const KIMI_DEVICE_URL = 'https://auth.kimi.com/api/oauth/device_authorization'
-export const KIMI_TOKEN_URL = 'https://auth.kimi.com/api/oauth/token'
-export const KIMI_API_BASE = 'https://api.kimi.com/coding/v1'
+const KIMI_CLIENT_ID = '17e5f671-d194-4dfb-9706-5516cb48c098'
+const KIMI_DEVICE_URL = 'https://auth.kimi.com/api/oauth/device_authorization'
+const KIMI_TOKEN_URL = 'https://auth.kimi.com/api/oauth/token'
+const KIMI_API_BASE = 'https://api.kimi.com/coding/v1'
 
-export const KIMI_MODELS = [
+const KIMI_MODELS = [
   {
     id: 'kimi-for-coding',
     name: 'Kimi for Coding (256k)',

package/lib/vendors/kiro.js

@@ -5,9 +5,9 @@ import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'kiro'
 
-export const KIRO_PORTAL_URL = 'https://app.kiro.dev'
-export const KIRO_API_BASE = 'https://prod.us-east-1.auth.desktop.kiro.dev'
-export const KIRO_MODELS = [
+const KIRO_PORTAL_URL = 'https://app.kiro.dev'
+const KIRO_API_BASE = 'https://prod.us-east-1.auth.desktop.kiro.dev'
+const KIRO_MODELS = [
   {
     id: 'claude-sonnet-5',
     name: 'Claude Sonnet 5 (Kiro)',

package/lib/vendors/perplexity.js

@@ -4,9 +4,9 @@ import { openaiChatStream, httpError } from '../wire.js'
 import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'perplexity'
-export const PERPLEXITY_API_BASE = 'https://api.perplexity.ai'
+const PERPLEXITY_API_BASE = 'https://api.perplexity.ai'
 
-export const PERPLEXITY_MODELS = [
+const PERPLEXITY_MODELS = [
   {
     id: 'sonar-reasoning-pro',
     name: 'Sonar Reasoning Pro',

package/lib/vendors/qwen.js

@@ -4,9 +4,9 @@ import { openaiChatStream, httpError } from '../wire.js'
 import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'qwen'
-export const QWEN_API_BASE = 'https://dashscope.aliyuncs.com/compatible-mode/v1'
+const QWEN_API_BASE = 'https://dashscope.aliyuncs.com/compatible-mode/v1'
 
-export const QWEN_MODELS = [
+const QWEN_MODELS = [
   {
     id: 'qwen-2.5-coder-32b-instruct',
     name: 'Qwen 2.5 Coder 32B',

package/lib/vendors/replit.js

@@ -4,9 +4,9 @@ import { openaiChatStream, httpError } from '../wire.js'
 import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'replit'
-export const REPLIT_API_BASE = 'https://replit.com/api/v1/ai'
+const REPLIT_API_BASE = 'https://replit.com/api/v1/ai'
 
-export const REPLIT_MODELS = [
+const REPLIT_MODELS = [
   {
     id: 'replit-code-v2',
     name: 'Replit Code Agent V2',

package/lib/vendors/spark.js

@@ -4,9 +4,9 @@ import { openaiChatStream, httpError } from '../wire.js'
 import { asUsageSnapshot } from '../usage.js'
 
 export const id = 'spark'
-export const SPARK_API_BASE = 'https://spark-api-open.xf-yun.com/v1'
+const SPARK_API_BASE = 'https://spark-api-open.xf-yun.com/v1'
 
-export const SPARK_MODELS = [
+const SPARK_MODELS = [
   {
     id: 'spark-max',
     name: 'iFlytek Spark Max',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.32",
+  "version": "0.6.34",
   "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",
@@ -54,10 +54,10 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-credentials": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2 || ^0.2.0-rc.1",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "publishConfig": {