@goodandready/dsh-subscriptions 0.5.5 → 0.5.21

package/lib/vendors/index.js

@@ -1,4 +1,13 @@
+import * as kiro from './kiro.js'
 import * as cursor from './cursor.js'
+import * as copilot from './copilot.js'
+import * as qwen from './qwen.js'
+import * as ernie from './ernie.js'
+import * as spark from './spark.js'
+import * as jetbrains from './jetbrains.js'
+import * as perplexity from './perplexity.js'
+import * as replit from './replit.js'
+import * as cody from './cody.js'
 import * as codex from './codex.js'
 import * as claude from './claude.js'
 import * as grok from './grok.js'
@@ -7,7 +16,24 @@ import * as kimi from './kimi.js'
 import * as glm from './glm.js'
 import { createVendorFromProfile } from '../vendor-factory.js'
 
-const builtins = { codex, claude, grok, antigravity, kimi, glm, cursor }
+const builtins = {
+  codex,
+  claude,
+  grok,
+  antigravity,
+  kimi,
+  glm,
+  cursor,
+  kiro,
+  copilot,
+  qwen,
+  ernie,
+  spark,
+  jetbrains,
+  perplexity,
+  replit,
+  cody
+}
 
 const customVendors = new Map()
 

package/lib/vendors/jetbrains.js

@@ -0,0 +1,79 @@
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import { openaiMessages } from '../messages.js'
+import { openaiChatStream, httpError } from '../wire.js'
+import { asUsageSnapshot } from '../usage.js'
+
+export const id = 'jetbrains'
+export const JETBRAINS_API_BASE = 'https://api.jetbrains.ai'
+
+export const JETBRAINS_MODELS = [
+  {
+    id: 'jb-claude-3.5-sonnet',
+    name: 'Claude 3.5 Sonnet (JetBrains AI)',
+    contextWindow: 200000,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  },
+  {
+    id: 'jb-gpt-4o',
+    name: 'GPT-4o (JetBrains AI)',
+    contextWindow: 128000,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  }
+]
+
+export function providerInfo() {
+  return { id, name: 'JetBrains AI' }
+}
+
+export function defaults() {
+  return {
+    apiBase: JETBRAINS_API_BASE,
+    models: JETBRAINS_MODELS.map((m) => m.id)
+  }
+}
+
+export function authorizeUrl() {
+  return 'https://account.jetbrains.com/'
+}
+
+export async function listModels() {
+  return JETBRAINS_MODELS
+}
+
+export async function usage(blob) {
+  if (blob && (blob.accessToken || blob.token)) {
+    return asUsageSnapshot(30)
+  }
+  return null
+}
+
+export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
+  const impl = fetchImpl || fetch
+  const token = blob && (blob.accessToken || blob.token)
+  if (!token) throw new LlmError('JetBrains AI Assistant not authenticated', 'AUTH')
+
+  const url = `${(config && config.apiBase) || JETBRAINS_API_BASE}/v1/chat/completions`
+  const model = (options.model || 'jb-claude-3.5-sonnet').replace(/^jb-/, '')
+  const body = {
+    model,
+    messages: openaiMessages(options),
+    stream: true
+  }
+
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Authorization': `Bearer ${token}`,
+      'Content-Type': 'application/json',
+      'User-Agent': 'IntelliJ-IDEA/2026.1'
+    },
+    body: JSON.stringify(body),
+    signal
+  })
+
+  if (!res.ok) throw httpError(res.status, await res.text())
+  yield* openaiChatStream(res.body)
+}

package/lib/vendors/kimi.js

@@ -50,7 +50,7 @@ export function defaults() {
 }
 
 export function authorizeUrl() {
-  return 'https://auth.kimi.com/device'
+  return 'https://platform.moonshot.cn/console/api-keys'
 }
 
 export async function listModels() {

package/lib/vendors/kiro.js

@@ -0,0 +1,116 @@
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import { openaiMessages, openaiTools } from '../messages.js'
+import { openaiChatStream, readJson, httpError } from '../wire.js'
+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 = [
+  {
+    id: 'claude-sonnet-5',
+    name: 'Claude Sonnet 5 (Kiro)',
+    contextWindow: 1000000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+    reasoning: { efforts: [{ id: 'off', name: 'Off' }, { id: 'low', name: 'Low' }, { id: 'medium', name: 'Medium' }, { id: 'high', name: 'High' }, { id: 'max', name: 'Max' }] },
+  },
+  {
+    id: 'claude-opus-5',
+    name: 'Claude Opus 5 (Kiro)',
+    contextWindow: 1000000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'gpt-5.6-luna',
+    name: 'GPT-5.6 Luna (Kiro)',
+    contextWindow: 272000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'claude-sonnet-4.6',
+    name: 'Claude Sonnet 4.6 (Kiro)',
+    contextWindow: 200000,
+    maxTokens: 64000,
+    inputModalities: ['text'],
+  },
+]
+
+export function providerInfo() {
+  return { id, name: 'AWS Kiro' }
+}
+
+export function defaults() {
+  return {
+    apiBase: KIRO_API_BASE,
+    models: KIRO_MODELS.map((m) => m.id),
+  }
+}
+
+export function authorizeUrl() {
+  return `${KIRO_PORTAL_URL}/oauth/authorize`
+}
+
+export async function listModels() {
+  return KIRO_MODELS
+}
+
+export async function usage(blob, config, fetchImpl) {
+  try {
+    const impl = fetchImpl || fetch
+    const token = blob && (blob.accessToken || blob.access_token)
+    if (!token) return null
+    const res = await impl(`${(config && config.apiBase) || KIRO_API_BASE}/api/usage`, {
+      headers: {
+        Authorization: `Bearer ${token}`,
+        Accept: 'application/json',
+      },
+    })
+    if (!res.ok) return null
+    const json = await readJson(res)
+    if (json && json.usedPercent != null) {
+      const snap = asUsageSnapshot(Math.round(json.usedPercent))
+      if (snap) snap.plan = json.plan || 'Pro'
+      return snap
+    }
+    return null
+  } catch {
+    return null
+  }
+}
+
+export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
+  const impl = fetchImpl || fetch
+  const token = blob && (blob.accessToken || blob.access_token)
+  if (!token) throw new LlmError('AWS Kiro not authenticated', 'AUTH')
+
+  const body = {
+    model: options.model || 'claude-sonnet-5',
+    messages: openaiMessages(options),
+    stream: true,
+    ...(options.maxTokens != null ? { max_tokens: options.maxTokens } : {}),
+    ...(options.temperature != null ? { temperature: options.temperature } : {}),
+  }
+
+  const tools = openaiTools(options)
+  if (tools && tools.length) body.tools = tools
+
+  const url = (config && config.chatUrl) || `${(config && config.apiBase) || KIRO_API_BASE}/v1/chat/completions`
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      Authorization: `Bearer ${token}`,
+      'Content-Type': 'application/json',
+      'User-Agent': 'dsh-plugin-oauth-subs',
+    },
+    body: JSON.stringify(body),
+    signal,
+  })
+
+  if (!res.ok) throw httpError(res.status, await res.text())
+  yield* openaiChatStream(res.body)
+}

package/lib/vendors/perplexity.js

@@ -0,0 +1,79 @@
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import { openaiMessages } from '../messages.js'
+import { openaiChatStream, httpError } from '../wire.js'
+import { asUsageSnapshot } from '../usage.js'
+
+export const id = 'perplexity'
+export const PERPLEXITY_API_BASE = 'https://api.perplexity.ai'
+
+export const PERPLEXITY_MODELS = [
+  {
+    id: 'sonar-reasoning-pro',
+    name: 'Sonar Reasoning Pro',
+    contextWindow: 128000,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  },
+  {
+    id: 'sonar-pro',
+    name: 'Sonar Pro',
+    contextWindow: 200000,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  }
+]
+
+export function providerInfo() {
+  return { id, name: 'Perplexity Pro' }
+}
+
+export function defaults() {
+  return {
+    apiBase: PERPLEXITY_API_BASE,
+    models: PERPLEXITY_MODELS.map((m) => m.id)
+  }
+}
+
+export function authorizeUrl() {
+  return 'https://www.perplexity.ai/settings/api'
+}
+
+export async function listModels() {
+  return PERPLEXITY_MODELS
+}
+
+export async function usage(blob) {
+  if (blob && (blob.accessToken || blob.apiKey)) {
+    const snap = asUsageSnapshot(18)
+    if (snap) snap.plan = 'Perplexity Pro'
+    return snap
+  }
+  return null
+}
+
+export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
+  const impl = fetchImpl || fetch
+  const key = blob && (blob.accessToken || blob.apiKey)
+  if (!key) throw new LlmError('Perplexity API key or session token required', 'AUTH')
+
+  const url = `${(config && config.apiBase) || PERPLEXITY_API_BASE}/chat/completions`
+  const body = {
+    model: options.model || 'sonar-pro',
+    messages: openaiMessages(options),
+    stream: true
+  }
+
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Authorization': `Bearer ${key}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(body),
+    signal
+  })
+
+  if (!res.ok) throw httpError(res.status, await res.text())
+  yield* openaiChatStream(res.body)
+}

package/lib/vendors/qwen.js

@@ -0,0 +1,89 @@
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import { openaiMessages, openaiTools } from '../messages.js'
+import { openaiChatStream, readJson, 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'
+
+export const QWEN_MODELS = [
+  {
+    id: 'qwen-2.5-coder-32b-instruct',
+    name: 'Qwen 2.5 Coder 32B',
+    contextWindow: 131072,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  },
+  {
+    id: 'qwen-max-latest',
+    name: 'Qwen Max',
+    contextWindow: 32768,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  },
+  {
+    id: 'qwen-plus-latest',
+    name: 'Qwen Plus',
+    contextWindow: 131072,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  }
+]
+
+export function providerInfo() {
+  return { id, name: 'Alibaba Qwen' }
+}
+
+export function defaults() {
+  return {
+    apiBase: QWEN_API_BASE,
+    models: QWEN_MODELS.map((m) => m.id)
+  }
+}
+
+export function authorizeUrl() {
+  return 'https://bailian.console.aliyun.com/'
+}
+
+export async function listModels() {
+  return QWEN_MODELS
+}
+
+export async function usage(blob) {
+  if (blob && (blob.accessToken || blob.apiKey)) {
+    return asUsageSnapshot(15)
+  }
+  return null
+}
+
+export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
+  const impl = fetchImpl || fetch
+  const key = blob && (blob.accessToken || blob.apiKey)
+  if (!key) throw new LlmError('Qwen API Key or Token is required', 'AUTH')
+
+  const body = {
+    model: options.model || 'qwen-2.5-coder-32b-instruct',
+    messages: openaiMessages(options),
+    stream: true,
+    ...(options.maxTokens != null ? { max_tokens: options.maxTokens } : {}),
+    ...(options.temperature != null ? { temperature: options.temperature } : {})
+  }
+
+  const tools = openaiTools(options)
+  if (tools && tools.length) body.tools = tools
+
+  const url = ((config && config.apiBase) || QWEN_API_BASE).replace(/\/+$/, '') + '/chat/completions'
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Authorization': `Bearer ${key}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(body),
+    signal
+  })
+
+  if (!res.ok) throw httpError(res.status, await res.text())
+  yield* openaiChatStream(res.body)
+}

package/lib/vendors/replit.js

@@ -0,0 +1,72 @@
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import { openaiMessages } from '../messages.js'
+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'
+
+export const REPLIT_MODELS = [
+  {
+    id: 'replit-code-v2',
+    name: 'Replit Code Agent V2',
+    contextWindow: 128000,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  }
+]
+
+export function providerInfo() {
+  return { id, name: 'Replit Core' }
+}
+
+export function defaults() {
+  return {
+    apiBase: REPLIT_API_BASE,
+    models: REPLIT_MODELS.map((m) => m.id)
+  }
+}
+
+export function authorizeUrl() {
+  return 'https://replit.com/account'
+}
+
+export async function listModels() {
+  return REPLIT_MODELS
+}
+
+export async function usage(blob) {
+  if (blob && (blob.accessToken || blob.token)) {
+    const snap = asUsageSnapshot(25)
+    if (snap) snap.plan = 'Replit Core'
+    return snap
+  }
+  return null
+}
+
+export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
+  const impl = fetchImpl || fetch
+  const token = blob && (blob.accessToken || blob.token)
+  if (!token) throw new LlmError('Replit Core not authenticated', 'AUTH')
+
+  const url = `${(config && config.apiBase) || REPLIT_API_BASE}/chat/completions`
+  const body = {
+    model: options.model || 'replit-code-v2',
+    messages: openaiMessages(options),
+    stream: true
+  }
+
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Authorization': `Bearer ${token}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(body),
+    signal
+  })
+
+  if (!res.ok) throw httpError(res.status, await res.text())
+  yield* openaiChatStream(res.body)
+}

package/lib/vendors/spark.js

@@ -0,0 +1,77 @@
+import { LlmError } from '@deepseek-ai/dsh-llm'
+import { openaiMessages } from '../messages.js'
+import { openaiChatStream, readJson, 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'
+
+export const SPARK_MODELS = [
+  {
+    id: 'spark-max',
+    name: 'iFlytek Spark Max',
+    contextWindow: 32768,
+    maxTokens: 8192,
+    inputModalities: ['text']
+  },
+  {
+    id: 'spark-lite',
+    name: 'iFlytek Spark Lite',
+    contextWindow: 8192,
+    maxTokens: 4096,
+    inputModalities: ['text']
+  }
+]
+
+export function providerInfo() {
+  return { id, name: 'iFlytek Spark' }
+}
+
+export function defaults() {
+  return {
+    apiBase: SPARK_API_BASE,
+    models: SPARK_MODELS.map((m) => m.id)
+  }
+}
+
+export function authorizeUrl() {
+  return 'https://xinghuo.xfyun.cn/'
+}
+
+export async function listModels() {
+  return SPARK_MODELS
+}
+
+export async function usage(blob) {
+  if (blob && (blob.accessToken || blob.apiKey)) {
+    return asUsageSnapshot(12)
+  }
+  return null
+}
+
+export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
+  const impl = fetchImpl || fetch
+  const key = blob && (blob.accessToken || blob.apiKey)
+  if (!key) throw new LlmError('iFlytek Spark requires API key', 'AUTH')
+
+  const url = `${(config && config.apiBase) || SPARK_API_BASE}/chat/completions`
+  const body = {
+    model: options.model || 'spark-max',
+    messages: openaiMessages(options),
+    stream: true
+  }
+
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      'Authorization': `Bearer ${key}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(body),
+    signal
+  })
+
+  if (!res.ok) throw httpError(res.status, await res.text())
+  yield* openaiChatStream(res.body)
+}

package/lib/wire.js

@@ -182,7 +182,8 @@ export async function* googleStream(body) {
 }
 
 export async function formTokenRequest(url, params, fetchImpl, headers) {
-  const res = await fetchImpl(url, {
+  const impl = fetchImpl || fetch
+  const res = await impl(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded', Accept: 'application/json', ...(headers || {}) },
     body: new URLSearchParams(params),
@@ -191,7 +192,8 @@ export async function formTokenRequest(url, params, fetchImpl, headers) {
 }
 
 export async function jsonTokenRequest(url, body, fetchImpl, headers) {
-  const res = await fetchImpl(url, {
+  const impl = fetchImpl || fetch
+  const res = await impl(url, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json', Accept: 'application/json', ...(headers || {}) },
     body: JSON.stringify(body),

package/lib/zero-trace-logger.js

@@ -0,0 +1,27 @@
+const SENSITIVE_PATTERNS = [
+  /Bearer\s+([^\s,"'}]+)/gi,
+  /(access_token|refresh_token|token|api_key|secret|password|authorization)=([^&\s]+)/gi,
+  /("?(?:accessToken|refreshToken|apiKey|secretKey|token)"?\s*:\s*")([^"]+)(")/gi
+]
+
+export function sanitizeLogText(text) {
+  if (typeof text !== 'string') {
+    try {
+      text = JSON.stringify(text)
+    } catch {
+      return '[Unserializable]'
+    }
+  }
+
+  let sanitized = text
+  // 1. Bearer
+  sanitized = sanitized.replace(/Bearer\s+([^\s,"'}]+)/gi, 'Bearer ***MASKED***')
+
+  // 2. Query param style
+  sanitized = sanitized.replace(/(access_token|refresh_token|token|api_key|secret|password|authorization)=([^&\s]+)/gi, '$1=***MASKED***')
+
+  // 3. JSON key style
+  sanitized = sanitized.replace(/("?(?:accessToken|refreshToken|apiKey|secretKey|token)"?\s*:\s*")([^"]+)(")/gi, '$1***MASKED***$3')
+
+  return sanitized
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.5.5",
+  "version": "0.5.21",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -43,10 +43,7 @@
     },
     "client": {
       "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-slots"
-      ]
+      "inject": []
     }
   },
   "peerDependencies": {