@goodandready/dsh-subscriptions 0.5.4 → 0.5.6

package/lib/import-auth.js

@@ -97,6 +97,44 @@ export async function discoverLocalCliSessions() {
     }
   }
 
+  
+  // 6. Cursor Token (env or CLI)
+  if (process.env.CURSOR_ACCESS_TOKEN) {
+    detected.cursor = {
+      provider: 'cursor',
+      path: 'CURSOR_ACCESS_TOKEN env',
+      email: 'Cursor IDE User',
+      hasRefreshToken: false,
+    }
+  }
+
+  
+  // 7. AWS Kiro
+  const kiroPaths = [
+    homeFile('.kiro', 'credentials.json'),
+    homeFile('.aws', 'sso', 'cache', 'kiro-auth-token.json'),
+  ]
+  for (const p of kiroPaths) {
+    const k = await readJson(p)
+    if (k && (k.accessToken || k.access_token || k.token)) {
+      detected.kiro = {
+        provider: 'kiro',
+        path: p,
+        email: k.email || k.account || 'AWS Kiro User',
+        hasRefreshToken: !!(k.refreshToken || k.refresh_token),
+      }
+      break
+    }
+  }
+  if (!detected.kiro && process.env.KIRO_API_KEY) {
+    detected.kiro = {
+      provider: 'kiro',
+      path: 'KIRO_API_KEY env',
+      email: 'AWS Kiro API Key',
+      hasRefreshToken: false,
+    }
+  }
+
   return detected
 }
 
@@ -159,5 +197,27 @@ export async function loadLocalCliBlob(provider) {
     }
   }
 
+  
+  if (provider === 'cursor') {
+    const token = process.env.CURSOR_ACCESS_TOKEN || (raw && (raw.accessToken || raw.access_token)) || ''
+    return {
+      accessToken: token,
+      refreshToken: '',
+      expiresAt: Date.now() + 30 * 86400 * 1000,
+      email: 'Cursor User',
+    }
+  }
+
+  
+  if (provider === 'kiro') {
+    const token = process.env.KIRO_API_KEY || (raw && (raw.accessToken || raw.access_token || raw.token)) || ''
+    return {
+      accessToken: token,
+      refreshToken: (raw && (raw.refreshToken || raw.refresh_token)) || '',
+      expiresAt: (raw && raw.expiresAt) || (Date.now() + 30 * 86400 * 1000),
+      email: (raw && raw.email) || 'AWS Kiro User',
+    }
+  }
+
   throw new Error(`unsupported local CLI import for provider ${provider}`)
 }

package/lib/refs.js

@@ -6,6 +6,8 @@ export const BUILTIN_PROVIDERS = Object.freeze([
   'antigravity',
   'kimi',
   'glm',
+  'cursor',
+  'kiro',
 ])
 
 const dynamicIds = new Set()
@@ -43,6 +45,8 @@ const DISPLAY = {
   antigravity: 'Antigravity',
   kimi: 'Moonshot Kimi',
   glm: 'Zhipu GLM',
+  cursor: 'Cursor',
+  kiro: 'AWS Kiro',
 }
 
 export function displayName(provider) {

package/lib/vendors/cursor.js

@@ -0,0 +1,133 @@
+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 = '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'
+
+export const CURSOR_MODELS = [
+  {
+    id: 'composer-2',
+    name: 'Composer 2',
+    contextWindow: 200000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+    reasoning: { efforts: [{ id: 'low', name: 'Low' }, { id: 'medium', name: 'Medium' }, { id: 'high', name: 'High' }, { id: 'max', name: 'Max' }] },
+  },
+  {
+    id: 'composer-1.5',
+    name: 'Composer 1.5',
+    contextWindow: 200000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'claude-sonnet-5',
+    name: 'Claude Sonnet 5 (Cursor)',
+    contextWindow: 200000,
+    maxTokens: 64000,
+    inputModalities: ['text', 'image'],
+  },
+  {
+    id: 'gpt-5.5',
+    name: 'GPT-5.5 (Cursor)',
+    contextWindow: 200000,
+    maxTokens: 128000,
+    inputModalities: ['text'],
+  },
+  {
+    id: 'grok-4.5',
+    name: 'Grok 4.5 (Cursor)',
+    contextWindow: 200000,
+    maxTokens: 64000,
+    inputModalities: ['text'],
+  },
+]
+
+export function providerInfo() {
+  return { id, name: 'Cursor' }
+}
+
+export function defaults() {
+  return {
+    apiBase: CURSOR_API_BASE,
+    models: CURSOR_MODELS.map((m) => m.id),
+  }
+}
+
+export function authorizeUrl() {
+  return 'https://cursor.com/loginDeepControl'
+}
+
+export async function listModels() {
+  return CURSOR_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(CURSOR_USAGE_URL, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${token}`,
+        'x-cursor-client-version': CURSOR_CLIENT_VERSION,
+        'User-Agent': CURSOR_CLIENT_VERSION,
+        'Content-Type': 'application/json',
+      },
+      body: '{}',
+    })
+    if (!res.ok) return null
+    const json = await readJson(res)
+    // Cursor returns { numRequests, maxRequestUsage, plan }
+    if (json && json.numRequests != null && json.maxRequestUsage != null && json.maxRequestUsage > 0) {
+      const pct = Math.round((json.numRequests / json.maxRequestUsage) * 100)
+      const snap = asUsageSnapshot(pct)
+      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('Cursor not authenticated', 'AUTH')
+
+  const body = {
+    model: options.model || 'composer-2',
+    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.agentUrl) || CURSOR_AGENT_URL
+  const res = await impl(url, {
+    method: 'POST',
+    headers: {
+      ...headers,
+      Authorization: `Bearer ${token}`,
+      'x-cursor-client-version': CURSOR_CLIENT_VERSION,
+      'User-Agent': CURSOR_CLIENT_VERSION,
+      '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/index.js

@@ -1,3 +1,5 @@
+import * as kiro from './kiro.js'
+import * as cursor from './cursor.js'
 import * as codex from './codex.js'
 import * as claude from './claude.js'
 import * as grok from './grok.js'
@@ -6,7 +8,7 @@ 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 }
+const builtins = { codex, claude, grok, antigravity, kimi, glm, cursor, kiro }
 
 const customVendors = new Map()
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",