@goodandready/dsh-subscriptions 0.5.3 → 0.5.5

package/lib/analyze-session.js

@@ -0,0 +1,66 @@
+/**
+ * Session Cache & Token Analyzer.
+ * Parses Harness turn usage and reports cache efficiency.
+ */
+
+export function analyzeSessionEvents(events = []) {
+  let promptTokens = 0
+  let cachedTokens = 0
+  let completionTokens = 0
+  let totalCalls = 0
+  const callRecords = []
+
+  let prevPrompt = 0
+  for (const ev of events) {
+    if (!ev) continue
+    const usage = ev.usage || (ev.type === 'usage' ? ev.usage : null) || (ev.data && ev.data.usage)
+    if (!usage) continue
+
+    const p = Number(usage.prompt_tokens || usage.input_tokens || usage.promptTokens || 0)
+    const c = Number(usage.prompt_tokens_details?.cached_tokens || usage.cache_read_input_tokens || usage.cached_tokens || usage.cachedTokens || 0)
+    const comp = Number(usage.completion_tokens || usage.output_tokens || usage.completionTokens || 0)
+
+    if (p <= 0 && comp <= 0) continue
+
+    totalCalls++
+    promptTokens += p
+    cachedTokens += c
+    completionTokens += comp
+
+    let classification = 'cold_start'
+    if (totalCalls > 1) {
+      if (c > 0 && p > 0 && (c / p) >= 0.5) {
+        classification = 'cache_hit'
+      } else if (p > prevPrompt) {
+        classification = 'delta'
+      } else {
+        classification = 'affinity_miss'
+      }
+    }
+    prevPrompt = p
+
+    callRecords.push({
+      call: totalCalls,
+      prompt: p,
+      cached: c,
+      completion: comp,
+      classification,
+      hitRate: p > 0 ? Math.round((c / p) * 100) : 0,
+    })
+  }
+
+  const weightedCacheHitPercent = promptTokens > 0
+    ? Math.round((cachedTokens / promptTokens) * 1000) / 10
+    : 0
+
+  return {
+    totalCalls,
+    promptTokens,
+    cachedTokens,
+    completionTokens,
+    totalTokens: promptTokens + completionTokens,
+    weightedCacheHitPercent,
+    savedTokens: cachedTokens,
+    calls: callRecords,
+  }
+}

package/lib/import-auth.js

@@ -97,6 +97,17 @@ 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,
+    }
+  }
+
   return detected
 }
 
@@ -159,5 +170,16 @@ 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',
+    }
+  }
+
   throw new Error(`unsupported local CLI import for provider ${provider}`)
 }

package/lib/index.js

@@ -1,3 +1,4 @@
+import { analyzeSessionEvents } from './analyze-session.js'
 import { discoverLocalCliSessions, loadLocalCliBlob } from './import-auth.js'
 import { readFileSync } from 'node:fs'
 import z from '@deepseek-ai/schemastery'
@@ -1170,6 +1171,26 @@ export function apply(ctx, config) {
     },
   }), 'dsh-subscriptions: /import-local')
 
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-subscriptions/analyze-session',
+    handler: async (req, res) => {
+      if (req.method !== 'POST') {
+        writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
+        return
+      }
+      try {
+        const body = await readBody(req).catch(() => ({}))
+        const events = Array.isArray(body && body.events) ? body.events : []
+        const analysis = analyzeSessionEvents(events)
+        writeJson(res, 200, { ok: true, analysis })
+      } catch (e) {
+        writeJson(res, 500, { ok: false, error: { message: String(e && e.message || e) } })
+      }
+    },
+  }), 'dsh-subscriptions: /analyze-session')
+
+
 
   // HTTP-прокси к API провайдера через subscriptions.request.
   // Same-origin only, allowlist путей, ротация и квота как у моделей.

package/lib/refs.js

@@ -6,6 +6,7 @@ export const BUILTIN_PROVIDERS = Object.freeze([
   'antigravity',
   'kimi',
   'glm',
+  'cursor',
 ])
 
 const dynamicIds = new Set()
@@ -43,6 +44,7 @@ const DISPLAY = {
   antigravity: 'Antigravity',
   kimi: 'Moonshot Kimi',
   glm: 'Zhipu GLM',
+  cursor: 'Cursor',
 }
 
 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,4 @@
+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 +7,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 }
 
 const customVendors = new Map()
 

package/package.json

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