@goodandready/dsh-subscriptions 0.5.6 → 0.5.22

package/lib/adapter.js

@@ -57,6 +57,8 @@ export class SubscriptionAdapter extends LlmAdapter {
     if (typeof this.deps.hideDeprecatedModels === 'function' && this.deps.hideDeprecatedModels()) {
       models = models.filter((m) => !isDeprecatedId(String((m && m.id) || '')))
     }
+    // Defensive: ensure every model has the provider field set
+    models = models.map((m) => (m && !m.provider ? { ...m, provider } : m))
     return models
   }
 

package/lib/atomic-lock.js

@@ -0,0 +1,35 @@
+import { open, unlink } from 'node:fs/promises'
+
+export async function withFileLock(filePath, fn, timeoutMs = 5000) {
+  const lockPath = `${filePath}.lock`
+  const start = Date.now()
+  let handle = null
+
+  while (Date.now() - start < timeoutMs) {
+    try {
+      handle = await open(lockPath, 'wx')
+      break
+    } catch (err) {
+      if (err.code === 'EEXIST') {
+        await new Promise((r) => setTimeout(r, 40))
+        continue
+      }
+      throw err
+    }
+  }
+
+  if (!handle) {
+    throw new Error(`Failed to acquire lock on ${lockPath} after ${timeoutMs}ms`)
+  }
+
+  try {
+    return await fn()
+  } finally {
+    try {
+      await handle.close()
+      await unlink(lockPath)
+    } catch {
+      // ignore unlock errors
+    }
+  }
+}

package/lib/backoff.js

@@ -0,0 +1,26 @@
+export async function executeWithRetry(fn, {
+  maxRetries = 3,
+  initialDelayMs = 200,
+  maxDelayMs = 3000,
+  factor = 2,
+  isRetryable = (err) => true
+} = {}) {
+  let attempt = 0
+  let delay = initialDelayMs
+
+  while (true) {
+    try {
+      return await fn()
+    } catch (err) {
+      attempt++
+      if (attempt > maxRetries || !isRetryable(err)) {
+        throw err
+      }
+      // Exponential backoff with random jitter: delay * (1 + random * 0.3)
+      const jitter = 1 + Math.random() * 0.3
+      const sleepMs = Math.min(maxDelayMs, Math.round(delay * jitter))
+      await new Promise((r) => setTimeout(r, sleepMs))
+      delay = Math.min(maxDelayMs, delay * factor)
+    }
+  }
+}

package/lib/client.js

@@ -25,7 +25,12 @@ window.__ModuleLoader__.load({
     '.dsub-chevOpen{transform:rotate(180deg)}' +
     '.dsub-body{border-top:1px solid var(--dsw-alias-border-l2);margin:0 16px;padding-bottom:12px}' +
     '.dsub-block{margin-top:10px}' +
-    '.dsub-row{display:flex;align-items:center;gap:8px;margin-top:8px}' +
+    '.dsub-row{display:flex;align-items:center;flex-wrap:wrap;gap:8px;margin-top:8px}' +
+    '.dsub-grow{flex:1 1 180px;min-width:140px}' +
+    '.dsub-helpBox{margin-top:8px;padding:12px 14px;border-radius:8px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);font-size:12px;line-height:1.6}' +
+    '.dsub-helpHead{display:flex;align-items:center;justify-content:space-between;font-weight:600;margin-bottom:8px;color:var(--dsw-alias-brand-primary)}' +
+    '.dsub-helpStep{margin-bottom:6px;color:var(--dsw-alias-label-primary)}' +
+    '.dsub-btnActive{background:var(--dsw-alias-brand-primary);color:#fff;border-color:var(--dsw-alias-brand-primary)}' +
     '.dsub-h{font-size:13.5px;font-weight:600;color:var(--dsw-alias-label-primary)}' +
     '.dsub-sub{font-size:12px;color:var(--dsw-alias-label-secondary)}' +
     '.dsub-dim{font-size:11.5px;color:var(--dsw-alias-label-tertiary)}' +
@@ -120,6 +125,126 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     // пакет, не трогая код этого плагина. Английский — язык по умолчанию,
     // на него же приходится откат, если перевода нет.
     const NS = 'dsh-subscriptions'
+    
+    const INSTRUCTIONS = {
+      codex: {
+        title: 'OpenAI / ChatGPT Codex',
+        stepsRu: [
+          '1. Авторизуйтесь через CLI на сервере: выполните "codex login" в терминале.',
+          '2. Нажмите кнопку "📥 Из CLI", чтобы сервер автоматически прочитал ~/.codex/auth.json.',
+          '3. Либо нажмите кнопку "Авторизация по коду" (Device Login) выше и введите код на auth.openai.com.',
+        ],
+        stepsEn: [
+          '1. Log in via CLI on server: run "codex login" in terminal.',
+          '2. Click "📥 From CLI" to auto-import ~/.codex/auth.json.',
+          '3. Or click "Device Login" above and enter the code at auth.openai.com.',
+        ],
+        link: 'https://chatgpt.com',
+      },
+      claude: {
+        title: 'Claude Code',
+        stepsRu: [
+          '1. Выполните "claude login" в консоли сервера.',
+          '2. Нажмите "📥 Из CLI" — плагин подтянет токен из ~/.claude/credentials.json.',
+          '3. Либо скопируйте свой Session Token / API-ключ из консоли Anthropic и нажмите "Сохранить".',
+        ],
+        stepsEn: [
+          '1. Run "claude login" in server console.',
+          '2. Click "📥 From CLI" — plugin will import ~/.claude/credentials.json.',
+          '3. Or paste your Session Token / API Key from Anthropic Console and click "Save token".',
+        ],
+        link: 'https://console.anthropic.com/settings/keys',
+      },
+      cursor: {
+        title: 'Cursor IDE',
+        stepsRu: [
+          '1. Авторизация через CLI: если Cursor установлен на сервере, нажмите "📥 Из CLI" (считывается из ~/.cursor/cli-config.json).',
+          '2. Вручную: откройте Настройки Cursor (кнопка "Подключить" или ссылка ниже), скопируйте WorkOS токен сессии или свой API ключ.',
+          '3. Вставьте его в поле ввода и нажмите кнопку "Сохранить".',
+        ],
+        stepsEn: [
+          '1. Auto CLI: if Cursor is used on server, click "📥 From CLI" (reads from ~/.cursor/cli-config.json).',
+          '2. Manual: open Cursor Settings (Connect button or link below), copy your session token or API key.',
+          '3. Paste it into the input field and click "Save token".',
+        ],
+        link: 'https://cursor.com/settings',
+      },
+      antigravity: {
+        title: 'Google Antigravity / Gemini',
+        stepsRu: [
+          '1. Самый простой способ: нажмите "📥 Из CLI" — на сервере уже есть авторизованная сессия (~/.gemini/antigravity-cli/antigravity-oauth-token).',
+          '2. Если токен обновлен в системе, нажатие "📥 Из CLI" мгновенно подхватит актуальный refresh_token.',
+          '3. Ручной ввод: вставьте JSON сессии или OAuth access_token/refresh_token в поле и нажмите "Сохранить".',
+          'Примечание: Кнопка "Подключить" для Google требует свой OAuth client_id в настройках плагина, поэтому для Antigravity рекомендуется использовать "📥 Из CLI"!',
+        ],
+        stepsEn: [
+          '1. Easiest way: click "📥 From CLI" — server already has active token in ~/.gemini/antigravity-cli/antigravity-oauth-token.',
+          '2. Clicking "📥 From CLI" instantly loads fresh credentials.',
+          '3. Manual: paste session JSON or OAuth tokens and click "Save token".',
+          'Note: "Connect" button requires custom Google client_id in plugin settings; use "📥 From CLI" for seamless login!',
+        ],
+        link: 'https://antigravity.google',
+      },
+      kimi: {
+        title: 'Moonshot Kimi',
+        stepsRu: [
+          '1. Откройте консоль разработчика Moonshot (ссылка ниже или по кнопке "Подключить").',
+          '2. Создайте и скопируйте свой API-ключ (sk-...).',
+          '3. Вставьте ключ в поле слота и нажмите "Сохранить".',
+          '4. Если у вас настроен Kimi Code CLI, можно также нажать "📥 Из CLI" (~/.kimi-code).',
+        ],
+        stepsEn: [
+          '1. Open Moonshot developer console (link below or click Connect).',
+          '2. Generate and copy your API Key (sk-...).',
+          '3. Paste it into the input field and click "Save token".',
+          '4. Or click "📥 From CLI" if ~/.kimi-code is configured.',
+        ],
+        link: 'https://platform.moonshot.cn/console/api-keys',
+      },
+      glm: {
+        title: 'Zhipu GLM (Z.AI)',
+        stepsRu: [
+          '1. Откройте Центр разработчика Zhipu AI (ссылка ниже или по кнопке "Подключить").',
+          '2. Скопируйте ваш API-ключ GLM.',
+          '3. Вставьте его в поле ввода и нажмите "Сохранить".',
+          '4. Если установлен ZCode CLI (~/.zcode), нажмите "📥 Из CLI" для авто-импорта.',
+        ],
+        stepsEn: [
+          '1. Open Zhipu BigModel API Keys center (link below or click Connect).',
+          '2. Copy your GLM API Key.',
+          '3. Paste it into the input field and click "Save token".',
+          '4. Or click "📥 From CLI" if ZCode CLI is installed (~/.zcode).',
+        ],
+        link: 'https://open.bigmodel.cn/usercenter/apikeys',
+      },
+      grok: {
+        title: 'xAI Grok',
+        stepsRu: [
+          '1. Выполните вход через grok-cli или hermes на сервере.',
+          '2. Нажмите "📥 Из CLI" (~/.grok/auth.json).',
+          '3. Либо вставьте xAI API-ключ в поле и нажмите "Сохранить".',
+        ],
+        stepsEn: [
+          '1. Run grok-cli or hermes login on server.',
+          '2. Click "📥 From CLI" (~/.grok/auth.json).',
+          '3. Or paste your xAI API Key and click "Save token".',
+        ],
+        link: 'https://x.ai',
+      },
+      kiro: {
+        title: 'AWS Kiro',
+        stepsRu: [
+          '1. Нажмите "📥 Из CLI" для импорта из ~/.kiro/credentials.json или ~/.aws/sso.',
+          '2. Либо вставьте KIRO_API_KEY в поле и нажмите "Сохранить".',
+        ],
+        stepsEn: [
+          '1. Click "📥 From CLI" to import from ~/.kiro/credentials.json.',
+          '2. Or paste KIRO_API_KEY and click "Save token".',
+        ],
+        link: 'https://aws.amazon.com',
+      },
+    }
+
     const en = {
       'notConnected': 'Not connected',
       'verifyAccount': 'Verify account',
@@ -213,10 +338,15 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'resetLabel': 'reset',
       'check': 'Check',
       'checking': 'Checking…',
-      'importToken': 'Import',
-      'importTokenPlace': 'Paste an existing token',
-      'importLocalCli': 'Import from local CLI',
-      'importLocalSuccess': 'Imported from local CLI!',
+            'importToken': 'Save token',
+      'importTokenPlace': 'Paste token or API key',
+      'importLocalCli': '📥 From CLI',
+      'importLocalCliTitle': 'Auto-import token from locally installed CLI on server',
+      'importLocalSuccess': 'Successfully imported token from local CLI!',
+      'howToGetToken': '❓ Instructions',
+      'howToGetTokenTitle': 'How to get token / API key for this provider',
+      'instructionsTitle': 'How to obtain token',
+      'close': 'Close',
       'reconnectRequired': 'Reconnect required',
       'manualTitle': 'If the browser did not come back',
       'windowPrimary': 'Primary window',
@@ -225,10 +355,15 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     const ru = {
       'check': 'Проверить',
       'checking': 'Проверяю…',
-      'importToken': 'Внести',
-      'importTokenPlace': 'Вставить уже готовый токен',
-      'importLocalCli': 'Импортировать из локального CLI',
-      'importLocalSuccess': 'Импортировано из локального CLI!',
+            'importToken': 'Сохранить',
+      'importTokenPlace': 'Вставить токен или API-ключ',
+      'importLocalCli': '📥 Из CLI',
+      'importLocalCliTitle': 'Автоматически считать токен из установленного на сервере CLI',
+      'importLocalSuccess': 'Токен успешно загружен из локального CLI!',
+      'howToGetToken': '❓ Инструкция',
+      'howToGetTokenTitle': 'Как получить токен или API-ключ для этого провайдера',
+      'instructionsTitle': 'Инструкция по получению токена',
+      'close': 'Закрыть',
       'reconnectRequired': 'Нужно переподключить',
       'manualTitle': 'Если браузер не вернулся сам',
       'windowPrimary': 'Основное окно',
@@ -506,7 +641,9 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       const [checking, setChecking] = React.useState({})
       const [saved, setSaved] = React.useState(false)
       const [tokenDraft, setTokenDraft] = React.useState({})
+      const [openHelp, setOpenHelp] = React.useState({})
       const [err, setErr] = React.useState('')
+      const [info, setInfo] = React.useState('')
 
       const applyPayload = (data) => {
         setDraft(JSON.parse(JSON.stringify((data && data.config) || {})))
@@ -679,6 +816,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
 
             const importLocalCli = async (provider, index) => {
         setErr('')
+        setInfo('')
         const res = await fetch('/dsh-subscriptions/import-local', {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
@@ -686,8 +824,10 @@ const cssId = 'dsh-subscriptions/settings.module.css'
         })
         const data = await res.json().catch(() => ({}))
         if (!res.ok) throw new Error((data.error && data.error.message) || ('HTTP ' + res.status))
-        await load()
+        if (data.config) applyPayload(data)
+        else await reload()
         setInfo(t('importLocalSuccess'))
+        setTimeout(() => setInfo(''), 3000)
       }
 
       const importToken = async (provider, index) => {
@@ -825,6 +965,21 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                     onClick: () => complete(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, t('submitCode')),
                 ),
+                React.createElement('div', { className: 'dsub-row', style: { justifyContent: 'space-between' } },
+                  React.createElement('button', {
+                    type: 'button',
+                    className: 'dsub-mini',
+                    title: t('importLocalCliTitle'),
+                    style: { display: 'inline-flex', alignItems: 'center', gap: 6, fontWeight: 600 },
+                    onClick: () => importLocalCli(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
+                  }, t('importLocalCli')),
+                  React.createElement('button', {
+                    type: 'button',
+                    className: 'dsub-mini' + (openHelp[key] ? ' dsub-btnActive' : ''),
+                    title: t('howToGetTokenTitle'),
+                    onClick: (e) => { if (e) { e.preventDefault(); e.stopPropagation(); } setOpenHelp((h) => Object.assign({}, h, { [key]: !h[key] })); },
+                  }, t('howToGetToken')),
+                ),
                 React.createElement('div', { className: 'dsub-row' },
                   React.createElement('input', {
                     className: 'dsub-grow',
@@ -834,14 +989,44 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   }),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
+                    title: t('importToken'),
                     onClick: () => importToken(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, t('importToken')),
-                  React.createElement('button', {
-                    type: 'button', className: 'dsub-mini',
-                    title: t('importLocalCli'),
-                    onClick: () => importLocalCli(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
-                  }, '📥 CLI'),
                 ),
+                (openHelp[key] ? (function renderInlineHelp(){
+                  const prov = row.slot.provider;
+                  const info = (typeof INSTRUCTIONS !== 'undefined' && INSTRUCTIONS[prov]) || {
+                    title: prov,
+                    stepsRu: ['Вставьте токен или API-ключ в поле выше и нажмите "Сохранить".'],
+                    stepsEn: ['Paste your token or API key into the field above and click "Save token".'],
+                  };
+                  // Determine language safely from t('instructionsTitle')
+                  const isRu = t('instructionsTitle').indexOf('Инструкция') >= 0;
+                  const steps = isRu ? info.stepsRu : info.stepsEn;
+                  return React.createElement('div', { className: 'dsub-helpBox' },
+                    React.createElement('div', { className: 'dsub-helpHead' },
+                      React.createElement('span', null, 'ℹ️ ' + info.title + ' — ' + t('instructionsTitle')),
+                      React.createElement('button', {
+                        type: 'button', className: 'dsub-mini',
+                        style: { padding: '1px 6px', fontSize: 11 },
+                        onClick: (e) => {
+                          if (e) { e.preventDefault(); e.stopPropagation(); }
+                          setOpenHelp((h) => Object.assign({}, h, { [key]: false }));
+                        },
+                      }, '✕')
+                    ),
+                    steps.map((st, i) => React.createElement('div', { key: i, className: 'dsub-helpStep' }, st)),
+                    info.link ? React.createElement('div', { style: { marginTop: 8 } },
+                      React.createElement('a', {
+                        href: info.link,
+                        target: '_blank',
+                        rel: 'noopener noreferrer',
+                        className: 'dsub-mini',
+                        style: { display: 'inline-flex', alignItems: 'center', gap: 4, textDecoration: 'none' },
+                      }, '🔗 ' + (isRu ? 'Открыть страницу провайдера' : 'Open provider console'))
+                    ) : null
+                  );
+                })() : null),
                 React.createElement('div', { className: 'dsub-row' },
                   React.createElement('input', {
                     className: 'dsub-grow',
@@ -1005,6 +1190,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             onClick: () => save().catch((e) => setErr(cleanErrorMessage(e.message || e))),
           }, t('save')),
           saved ? React.createElement('span', { className: 'dsub-ok' }, t('saved')) : null,
+          info ? React.createElement('span', { className: 'dsub-ok' }, info) : null,
           err ? React.createElement('span', { className: 'dsub-bad' }, err) : null,
         ),
       )
@@ -1211,6 +1397,16 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       if (p.includes('antigravity') || p.includes('google') || p.includes('gemini')) return { label: 'AGY', cls: 'dsub-brandAgy', icon: '◆' }
       if (p.includes('kimi')) return { label: 'Kimi', cls: 'dsub-brandKimi', icon: '🌙' }
       if (p.includes('glm') || p.includes('zcode')) return { label: 'GLM', cls: 'dsub-brandGlm', icon: '⚡' }
+      if (p.includes('copilot') || p.includes('github')) return { label: 'Copilot', cls: 'dsub-brandCodex', icon: '🐙' }
+      if (p.includes('cursor')) return { label: 'Cursor', cls: 'dsub-brandCodex', icon: '💻' }
+      if (p.includes('kiro')) return { label: 'Kiro', cls: 'dsub-brandAgy', icon: '☁️' }
+      if (p.includes('qwen')) return { label: 'Qwen', cls: 'dsub-brandKimi', icon: '🌐' }
+      if (p.includes('ernie') || p.includes('baidu')) return { label: 'ERNIE', cls: 'dsub-brandGlm', icon: '🐻' }
+      if (p.includes('spark') || p.includes('xfyun')) return { label: 'Spark', cls: 'dsub-brandGrok', icon: '✨' }
+      if (p.includes('jetbrains')) return { label: 'JetBrains', cls: 'dsub-brandClaude', icon: '🚀' }
+      if (p.includes('perplexity')) return { label: 'Perplexity', cls: 'dsub-brandClaude', icon: '🔮' }
+      if (p.includes('replit')) return { label: 'Replit', cls: 'dsub-brandCodex', icon: '⚡' }
+      if (p.includes('cody') || p.includes('sourcegraph')) return { label: 'Cody', cls: 'dsub-brandAgy', icon: '🔍' }
       if (p.includes('ollama')) return { label: 'Ollama', cls: 'dsub-brandOllama', icon: '🦙' }
       return { label: (p.charAt(0).toUpperCase() || 'P'), cls: 'dsub-brandCodex', icon: '●' }
     }

package/lib/coalesce-stream.js

@@ -0,0 +1,22 @@
+export async function* coalesceStreamChunks(sourceStream, maxWaitMs = 40, maxChunkChars = 80) {
+  let buffer = ''
+  let lastFlush = Date.now()
+
+  for await (const chunk of sourceStream) {
+    const text = typeof chunk === 'string' ? chunk : (chunk && chunk.text) || ''
+    buffer += text
+
+    const now = Date.now()
+    if (buffer.length >= maxChunkChars || now - lastFlush >= maxWaitMs) {
+      if (buffer.length > 0) {
+        yield buffer
+        buffer = ''
+        lastFlush = now
+      }
+    }
+  }
+
+  if (buffer.length > 0) {
+    yield buffer
+  }
+}

package/lib/code-assist.js

@@ -7,10 +7,10 @@ export const CODE_ASSIST_PROD = 'https://cloudcode-pa.googleapis.com/v1internal'
 export const CODE_ASSIST_STREAM = 'https://daily-cloudcode-pa.googleapis.com/v1internal'
 export const CODE_ASSIST = CODE_ASSIST_PROD
 
-function antigravityPlatform() {
-  if (process.platform === 'win32') return 'WINDOWS'
-  if (process.platform === 'darwin') return 'MACOS'
-  return 'LINUX'
+export function antigravityPlatform() {
+  if (process.platform === 'win32') return 'WINDOWS_AMD64'
+  if (process.platform === 'darwin') return process.arch === 'arm64' ? 'DARWIN_ARM64' : 'DARWIN_AMD64'
+  return process.arch === 'arm64' ? 'LINUX_ARM64' : 'LINUX_AMD64'
 }
 
 export function antigravityMetadata(projectId) {

package/lib/cookie-bridge.js

@@ -0,0 +1,8 @@
+export function extractBearerFromCookie(cookieHeader) {
+  if (!cookieHeader || typeof cookieHeader !== 'string') return null
+  const match = cookieHeader.match(/(?:__Secure-next-auth\.session-token|session_token|auth_token)=([^;]+)/)
+  if (match && match[1]) {
+    return decodeURIComponent(match[1])
+  }
+  return null
+}

package/lib/credit-detect.js

@@ -0,0 +1,22 @@
+export function detectCodexBillingType(rawBilling) {
+  if (!rawBilling || typeof rawBilling !== 'object') {
+    return { plan: 'Free / Unknown', isHardLimit: false, isPrepaid: false }
+  }
+
+  const planId = String(rawBilling.plan || rawBilling.subscription_type || '').toLowerCase()
+  const hasHardLimit = Boolean(rawBilling.hard_limit_reached || rawBilling.is_blocked)
+  const isPrepaid = Boolean(rawBilling.has_payment_method || rawBilling.is_prepaid)
+
+  let label = 'Free'
+  if (planId.includes('team')) label = 'Team'
+  else if (planId.includes('pro')) label = 'Pro'
+  else if (planId.includes('plus')) label = 'Plus'
+  else if (planId.includes('enterprise')) label = 'Enterprise'
+
+  return {
+    plan: label,
+    isHardLimit: hasHardLimit,
+    isPrepaid,
+    remainingCredits: rawBilling.remaining_credits != null ? Number(rawBilling.remaining_credits) : null
+  }
+}

package/lib/encrypted-bundle.js

@@ -0,0 +1,46 @@
+import { createCipheriv, createDecipheriv, randomBytes, pbkdf2Sync } from 'node:crypto'
+
+const ALGORITHM = 'aes-256-gcm'
+const SALT_LEN = 16
+const IV_LEN = 12
+const ITERATIONS = 100000
+
+export function exportEncryptedBundle(data, password) {
+  const salt = randomBytes(SALT_LEN)
+  const key = pbkdf2Sync(password, salt, ITERATIONS, 32, 'sha256')
+  const iv = randomBytes(IV_LEN)
+  const cipher = createCipheriv(ALGORITHM, key, iv)
+
+  const plaintext = JSON.stringify(data)
+  let encrypted = cipher.update(plaintext, 'utf8', 'hex')
+  encrypted += cipher.final('hex')
+  const authTag = cipher.getAuthTag().toString('hex')
+
+  return {
+    version: 1,
+    algorithm: ALGORITHM,
+    salt: salt.toString('hex'),
+    iv: iv.toString('hex'),
+    authTag,
+    payload: encrypted
+  }
+}
+
+export function importEncryptedBundle(bundle, password) {
+  if (!bundle || bundle.version !== 1 || !bundle.payload) {
+    throw new Error('Invalid backup bundle format')
+  }
+
+  const salt = Buffer.from(bundle.salt, 'hex')
+  const key = pbkdf2Sync(password, salt, ITERATIONS, 32, 'sha256')
+  const iv = Buffer.from(bundle.iv, 'hex')
+  const authTag = Buffer.from(bundle.authTag, 'hex')
+
+  const decipher = createDecipheriv(ALGORITHM, key, iv)
+  decipher.setAuthTag(authTag)
+
+  let decrypted = decipher.update(bundle.payload, 'hex', 'utf8')
+  decrypted += decipher.final('utf8')
+
+  return JSON.parse(decrypted)
+}

package/lib/import-auth.js

@@ -1,6 +1,8 @@
 import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
+import { readClaudeCredentials } from './vendors/claude-cli.js'
+import { discoverCodingAgentConfigs } from './importers/coding-agents.js'
 
 function homeFile(...parts) {
   return join(homedir(), ...parts)
@@ -97,8 +99,8 @@ export async function discoverLocalCliSessions() {
     }
   }
 
-  
-  // 6. Cursor Token (env or CLI)
+  // 6. Cursor Token (env, CLI config or IDE state)
+  const cursorCliConfig = await readJson(homeFile('.cursor', 'cli-config.json'))
   if (process.env.CURSOR_ACCESS_TOKEN) {
     detected.cursor = {
       provider: 'cursor',
@@ -106,9 +108,15 @@ export async function discoverLocalCliSessions() {
       email: 'Cursor IDE User',
       hasRefreshToken: false,
     }
+  } else if (cursorCliConfig && (cursorCliConfig.authInfo || cursorCliConfig.serverConfigCache)) {
+    detected.cursor = {
+      provider: 'cursor',
+      path: homeFile('.cursor', 'cli-config.json'),
+      email: (cursorCliConfig.authInfo && cursorCliConfig.authInfo.email) || 'Cursor CLI User',
+      hasRefreshToken: false,
+    }
   }
 
-  
   // 7. AWS Kiro
   const kiroPaths = [
     homeFile('.kiro', 'credentials.json'),
@@ -135,6 +143,46 @@ export async function discoverLocalCliSessions() {
     }
   }
 
+  // 8. Claude CLI Direct Import
+  const claudeCreds = await readClaudeCredentials()
+  if (claudeCreds) {
+    detected['claude-cli'] = {
+      provider: 'claude',
+      path: homeFile('.claude', 'credentials.json'),
+      email: 'Claude Code CLI User',
+      hasRefreshToken: !!claudeCreds.refreshToken,
+    }
+  }
+
+  // 9. GitHub Copilot token
+  if (process.env.GITHUB_COPILOT_TOKEN || process.env.GH_TOKEN) {
+    detected.copilot = {
+      provider: 'copilot',
+      path: 'GITHUB_COPILOT_TOKEN env',
+      email: 'GitHub Copilot User',
+      hasRefreshToken: false,
+    }
+  }
+
+  // 10. Coding Agents (Aider / Roo-Code)
+  const agentConfigs = await discoverCodingAgentConfigs()
+  if (agentConfigs.aider) {
+    detected.aider = {
+      provider: 'aider',
+      path: agentConfigs.aider.path,
+      email: 'Aider Configured Agent',
+      hasRefreshToken: false,
+    }
+  }
+  if (agentConfigs.roocode) {
+    detected.roocode = {
+      provider: 'roocode',
+      path: agentConfigs.roocode.path,
+      email: 'Roo-Code Configured Agent',
+      hasRefreshToken: false,
+    }
+  }
+
   return detected
 }
 
@@ -143,6 +191,27 @@ export async function loadLocalCliBlob(provider) {
   const info = discovered[provider]
   if (!info) throw new Error(`no local CLI session found for ${provider}`)
 
+  if (provider === 'claude-cli' || (provider === 'claude' && info.provider === 'claude')) {
+    const creds = await readClaudeCredentials()
+    if (!creds) throw new Error('Claude CLI credentials not found')
+    return {
+      accessToken: creds.accessToken,
+      refreshToken: creds.refreshToken,
+      expiresAt: creds.expiresAt,
+      email: 'Claude Code CLI User'
+    }
+  }
+
+  if (provider === 'copilot') {
+    const tok = process.env.GITHUB_COPILOT_TOKEN || process.env.GH_TOKEN || ''
+    return {
+      accessToken: tok,
+      refreshToken: tok,
+      expiresAt: Date.now() + 30 * 86400 * 1000,
+      email: 'GitHub Copilot User'
+    }
+  }
+
   const raw = await readJson(info.path)
   if (!raw) throw new Error(`failed to read local CLI file: ${info.path}`)
 
@@ -197,18 +266,16 @@ export async function loadLocalCliBlob(provider) {
     }
   }
 
-  
   if (provider === 'cursor') {
-    const token = process.env.CURSOR_ACCESS_TOKEN || (raw && (raw.accessToken || raw.access_token)) || ''
+    const token = process.env.CURSOR_ACCESS_TOKEN || (raw && (raw.accessToken || raw.access_token || (raw.authInfo && raw.authInfo.authId))) || ''
     return {
       accessToken: token,
       refreshToken: '',
       expiresAt: Date.now() + 30 * 86400 * 1000,
-      email: 'Cursor User',
+      email: (raw && raw.authInfo && raw.authInfo.email) || 'Cursor User',
     }
   }
 
-  
   if (provider === 'kiro') {
     const token = process.env.KIRO_API_KEY || (raw && (raw.accessToken || raw.access_token || raw.token)) || ''
     return {