termdock 1.4.38 → 1.4.40

package/dist/server/quota/tokenDiscovery.js

@@ -0,0 +1,239 @@
+/**
+ * Token discovery — reads auth tokens from agent configuration files.
+ *
+ * Termdock's hook installers already know where each agent stores its config.
+ * This module extracts OAuth tokens / API keys so the QuotaManager can call
+ * provider usage APIs without asking the user to re-enter credentials.
+ */
+import fs from 'fs';
+import path from 'path';
+import { homedir } from 'os';
+const HOME = homedir();
+// ── Claude / Anthropic ──────────────────────────────────────────────
+/** Read ~/.local/share/opencode/auth.json for Anthropic OAuth tokens. */
+function discoverFromOpenCodeAuth() {
+    const results = [];
+    const authPath = path.join(HOME, '.local/share/opencode/auth.json');
+    try {
+        const raw = fs.readFileSync(authPath, 'utf-8');
+        const auth = JSON.parse(raw);
+        const oauths = Array.isArray(auth) ? auth : ('oauth' in auth ? auth.oauth : [auth]);
+        const entries = Array.isArray(oauths) ? oauths : [oauths];
+        for (const entry of entries) {
+            if (entry.type === 'anthropic' && entry.access) {
+                results.push({
+                    token: entry.access,
+                    source: 'opencode auth.json',
+                    accountId: entry.accountId || entry.accountLabel || undefined,
+                });
+            }
+        }
+    }
+    catch {
+        // File missing or unreadable — no Anthropic tokens from this source.
+    }
+    return results;
+}
+/** Read ~/.claude/settings.json for stored credentials. */
+function discoverFromClaudeSettings() {
+    const results = [];
+    const settingsPath = path.join(HOME, '.claude/settings.json');
+    try {
+        const raw = fs.readFileSync(settingsPath, 'utf-8');
+        const settings = JSON.parse(raw);
+        // Claude Code stores OAuth credentials in various shapes.
+        // The most reliable source is the oauth account info.
+        const oauth = settings?.oauthAccount;
+        if (oauth?.accessToken) {
+            results.push({
+                token: oauth.accessToken,
+                source: 'claude settings.json',
+                email: oauth.email || undefined,
+                accountId: oauth.accountUuid || undefined,
+            });
+        }
+    }
+    catch {
+        // Not found or unreadable.
+    }
+    return results;
+}
+export function discoverClaudeTokens() {
+    const fromOpenCode = discoverFromOpenCodeAuth().filter((t) => t.source === 'opencode auth.json');
+    // OpenCode auth.json already covers Anthropic — avoid duplicates.
+    if (fromOpenCode.length > 0) {
+        // Merge with claude settings for email enrichment
+        const fromClaude = discoverFromClaudeSettings();
+        for (const t of fromOpenCode) {
+            const match = fromClaude.find((c) => c.email && c.token !== t.token);
+            if (match && !t.email) {
+                t.email = match.email;
+                t.accountId = match.accountId;
+            }
+        }
+        return fromOpenCode;
+    }
+    return discoverFromClaudeSettings();
+}
+// ── Codex / OpenAI ───────────────────────────────────────────────────
+function discoverCodexFromOpenCodeAuth() {
+    const results = [];
+    const authPath = path.join(HOME, '.local/share/opencode/auth.json');
+    try {
+        const raw = fs.readFileSync(authPath, 'utf-8');
+        const auth = JSON.parse(raw);
+        const oauths = Array.isArray(auth) ? auth : ('oauth' in auth ? auth.oauth : [auth]);
+        const entries = Array.isArray(oauths) ? oauths : [oauths];
+        for (const entry of entries) {
+            if ((entry.type === 'openai' || entry.type === 'chatgpt' || entry.type === 'codex') && entry.access) {
+                results.push({
+                    token: entry.access,
+                    source: 'opencode auth.json',
+                    accountId: entry.accountId || undefined,
+                });
+            }
+        }
+    }
+    catch {
+        // Not found.
+    }
+    return results;
+}
+/** Read ~/.codex/auth.json for Codex CLI native OAuth tokens. */
+function discoverCodexFromCodexAuth() {
+    const results = [];
+    const authPath = path.join(HOME, '.codex', 'auth.json');
+    try {
+        const raw = fs.readFileSync(authPath, 'utf-8');
+        const auth = JSON.parse(raw);
+        const tokens = auth?.tokens;
+        if (tokens?.access_token) {
+            results.push({
+                token: tokens.access_token,
+                source: 'codex auth.json',
+                accountId: tokens.account_id || undefined,
+            });
+        }
+    }
+    catch {
+        // Not found.
+    }
+    return results;
+}
+function discoverCodexFromEnv() {
+    const results = [];
+    const envVars = ['OPENAI_API_KEY', 'CODEX_API_KEY', 'CHATGPT_TOKEN'];
+    for (const v of envVars) {
+        const val = process.env[v];
+        if (val && val.trim()) {
+            results.push({ token: val.trim(), source: `env:${v}` });
+        }
+    }
+    return results;
+}
+export function discoverCodexTokens() {
+    // Priority: Codex CLI auth > OpenCode auth > env
+    const fromCodex = discoverCodexFromCodexAuth();
+    if (fromCodex.length > 0)
+        return fromCodex;
+    const fromOpenCode = discoverCodexFromOpenCodeAuth();
+    if (fromOpenCode.length > 0)
+        return fromOpenCode;
+    return discoverCodexFromEnv();
+}
+// ── Kimi ─────────────────────────────────────────────────────────────
+export function discoverKimiTokens() {
+    const results = [];
+    // Check KIMI_API_KEY env
+    const envKey = process.env.KIMI_API_KEY;
+    if (envKey?.trim()) {
+        results.push({ token: envKey.trim(), source: 'env:KIMI_API_KEY' });
+    }
+    // Check ~/.kimi-code config
+    const configPath = path.join(HOME, '.kimi-code', 'config.json');
+    try {
+        const raw = fs.readFileSync(configPath, 'utf-8');
+        const cfg = JSON.parse(raw);
+        if (cfg.apiKey) {
+            results.push({ token: cfg.apiKey, source: 'kimi-code config.json' });
+        }
+    }
+    catch {
+        // Not found.
+    }
+    // Check OpenCode auth.json for kimi type
+    const authPath = path.join(HOME, '.local/share/opencode/auth.json');
+    try {
+        const raw = fs.readFileSync(authPath, 'utf-8');
+        const auth = JSON.parse(raw);
+        const entries = Array.isArray(auth) ? auth : [auth];
+        for (const entry of entries) {
+            if (entry.type === 'kimi' && entry.access) {
+                results.push({ token: entry.access, source: 'opencode auth.json' });
+            }
+        }
+    }
+    catch {
+        // Not found.
+    }
+    return results;
+}
+// ── GitHub Copilot ───────────────────────────────────────────────────
+export function discoverCopilotTokens() {
+    const results = [];
+    // OpenCode auth.json
+    const authPath = path.join(HOME, '.local/share/opencode/auth.json');
+    try {
+        const raw = fs.readFileSync(authPath, 'utf-8');
+        const auth = JSON.parse(raw);
+        const entries = Array.isArray(auth) ? auth : [auth];
+        for (const entry of entries) {
+            if ((entry.type === 'github' || entry.type === 'copilot') && entry.access) {
+                results.push({
+                    token: entry.access,
+                    source: 'opencode auth.json',
+                    accountId: entry.accountId || entry.accountLabel || undefined,
+                });
+            }
+        }
+    }
+    catch {
+        // Not found.
+    }
+    // Copilot CLI config
+    const cliConfigPath = path.join(HOME, '.copilot', 'config.json');
+    try {
+        const raw = fs.readFileSync(cliConfigPath, 'utf-8');
+        const cfg = JSON.parse(raw);
+        if (cfg.token) {
+            results.push({ token: cfg.token, source: 'copilot config.json' });
+        }
+    }
+    catch {
+        // Not found.
+    }
+    // GH_TOKEN env
+    const ghToken = process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
+    if (ghToken?.trim()) {
+        results.push({ token: ghToken.trim(), source: 'env:GITHUB_TOKEN' });
+    }
+    return results;
+}
+// ── Gemini ────────────────────────────────────────────────────────────
+export function discoverGeminiTokens() {
+    const results = [];
+    const envKey = process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY;
+    if (envKey?.trim()) {
+        results.push({ token: envKey.trim(), source: `env:GEMINI_API_KEY` });
+    }
+    return results;
+}
+// ── Grok ──────────────────────────────────────────────────────────────
+export function discoverGrokTokens() {
+    const results = [];
+    const envKey = process.env.GROK_API_KEY || process.env.XAI_API_KEY;
+    if (envKey?.trim()) {
+        results.push({ token: envKey.trim(), source: `env:GROK_API_KEY` });
+    }
+    return results;
+}

package/dist/server/quota/types.js

@@ -0,0 +1,8 @@
+/**
+ * Subscription quota tracking types.
+ *
+ * Each provider's fetch() returns a QuotaResult with usage percentage,
+ * remaining/entitlement for quota-based plans, and optional per-window
+ * breakdowns (e.g. Claude's 5h/7d windows, Codex's primary/secondary).
+ */
+export {};

package/dist/server/routes/terminal.js

@@ -24,6 +24,7 @@ import { listAllHookAgents, refreshStaleHooksAtLaunch, installHooksForSlug, unin
 import { loadPlugins, savePlugin, removePlugin, readPluginIcon, } from '../agent/plugins.js';
 import { registerPluginAgents } from '../agent/registry.js';
 import { notifyAgentTransition } from '../notifications/pushService.js';
+import { getQuotaStatus, refreshQuota, startQuotaManager, } from '../quota/QuotaManager.js';
 const router = express.Router();
 const execFileAsync = promisify(execFile);
 const TERMDOCK_DIR = `${os.homedir()}/.termdock`;
@@ -2145,6 +2146,11 @@ function persistAgentResumeBinding(backendSessionId, session) {
     upsertGlobalSessionRecord({ ...record, agentResume: next });
     schedulePersistGlobalState();
 }
+/** Debounce window before treating an agent disappearance as a real exit.
+ *  Subcommands that briefly occupy the foreground group cause momentary poll
+ *  blips — waiting 2–3 poll cycles (1200 ms each) before clearing the session
+ *  avoids false "agent exited" notifications while keeping real exits responsive. */
+const AGENT_EXIT_DEBOUNCE_MS = 3000;
 /**
  * React to activeProgram changes: detect agent identity, end the rich session
  * when the agent leaves the foreground, and stamp the launch argv (for resume
@@ -2157,15 +2163,33 @@ function syncAgentIdentity(sessionId, session) {
         // The agent leaving the foreground ends its session: clear the rich state
         // so a stale "waiting" dot can't outlive the process. The poll can blip
         // momentarily (an agent-spawned subcommand takes the foreground group),
-        // but events re-establish state on the next signal.
+        // so we debounce: only clear after AGENT_EXIT_DEBOUNCE_MS of continuous
+        // absence. A real agent swap (agent A → agent B) clears immediately.
         if (session.agent && session.agentSession) {
+            if (detected === null) {
+                // Agent disappeared — could be a poll blip (subcommand) or real exit.
+                const now = Date.now();
+                if (session.agentLeftAt === null) {
+                    session.agentLeftAt = now;
+                    return;
+                }
+                if (now - session.agentLeftAt < AGENT_EXIT_DEBOUNCE_MS) {
+                    return;
+                }
+            }
+            // Debounce expired (or agent swapped): clear the session for real.
             persistAgentResumeBinding(sessionId, session);
             session.lastAgentReviewed = session.agentSession.reviewed;
             session.agentSession = null;
+            session.agentLeftAt = null;
         }
         session.agent = detected;
         broadcastAgentStatus(sessionId, session);
     }
+    else if (detected && session.agentLeftAt !== null) {
+        // Agent re-detected before debounce expired — false alarm, restore.
+        session.agentLeftAt = null;
+    }
     // Stamp the launch argv the identity poll captured — resume gets the flags.
     if (detected && session.activeProgram?.rawArgs) {
         const argv = splitCommandToArgv(session.activeProgram.rawArgs);
@@ -2196,6 +2220,9 @@ function syncAgentIdentity(sessionId, session) {
 function applyAgentSignals(sessionId, session, events, notification) {
     if (events.length === 0 && !notification)
         return;
+    // Hook events prove the agent process is alive — cancel any pending-exit timer
+    // that a poll blip may have started in syncAgentIdentity.
+    session.agentLeftAt = null;
     let identityChanged = false;
     for (const event of events) {
         // An event naming an agent brands the pane even when the process poll
@@ -3507,6 +3534,7 @@ async function spawnTerminalSession(req, input) {
         agent: null,
         agentSession: null,
         lastAgentReviewed: null,
+        agentLeftAt: null,
         gitStatus: null,
         gitStatusKey: null,
         gitAgentActivitySeen: 0,
@@ -3587,6 +3615,7 @@ async function adoptPtyHostSessions() {
             agent: null,
             agentSession: null,
             lastAgentReviewed: null,
+            agentLeftAt: null,
             gitStatus: null,
             gitStatusKey: null,
             gitAgentActivitySeen: 0,
@@ -4272,6 +4301,52 @@ router.get('/agent-plugin-icon/:slug', (req, res) => {
     res.send(svg);
 });
 // ── end Agent plugins API ──
+// ── Subscription quota API ──
+function broadcastQuotaToAll() {
+    const status = getQuotaStatus();
+    const payload = {
+        type: 'quota-status',
+        providers: status.providers,
+        updatedAt: status.updatedAt,
+    };
+    const data = JSON.stringify(payload);
+    // Send to control WS clients
+    for (const [clientId, ws] of controlClients) {
+        if (ws.readyState !== ws.OPEN) {
+            controlClients.delete(clientId);
+            continue;
+        }
+        try {
+            ws.send(data);
+        }
+        catch {
+            controlClients.delete(clientId);
+        }
+    }
+    // Send to per-session WS clients
+    for (const [sessionId] of terminalSessions) {
+        try {
+            broadcastJsonWs(sessionId, payload);
+        }
+        catch { /* best-effort */ }
+    }
+}
+// Start quota polling — broadcast fn hooks into both WS channels
+startQuotaManager({ broadcast: broadcastQuotaToAll });
+router.get('/quota', (_req, res) => {
+    res.json(getQuotaStatus());
+});
+router.post('/quota/refresh', async (_req, res) => {
+    try {
+        const status = await refreshQuota();
+        broadcastQuotaToAll();
+        res.json(status);
+    }
+    catch (e) {
+        res.status(500).json({ error: e instanceof Error ? e.message : 'Refresh failed' });
+    }
+});
+// ── Subscription quota API end ──
 // ── Program detection config API ──
 router.get('/program-detection', async (_req, res) => {
     res.json(await loadProgramDetectionFromDisk());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.38",
+  "version": "1.4.40",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/dist/client/assets/channel-Cxs9-lsF.js

@@ -1 +0,0 @@
-import{U as a,C as n}from"./mermaid.core-oQNFhFo1.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/client/assets/classDiagram-OUVF2IWQ-C9M6wlWI.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-B-FIe5fo.js";import{b as i}from"./mermaid.core-oQNFhFo1.js";import"./chunk-5VM5RSS4-CPYKdlUm.js";import"./chunk-XXDRQBXY-CdoSUjQU.js";import"./chunk-VR4S4FIN-CmIFAiFd.js";import"./chunk-32BRIVSS-0zL-WEd8.js";import"./purify.es-CC4Brkr_.js";import"./index-CN9znI-m.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/classDiagram-v2-EOCWNBFH-C9M6wlWI.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-V7JOEXUC-B-FIe5fo.js";import{b as i}from"./mermaid.core-oQNFhFo1.js";import"./chunk-5VM5RSS4-CPYKdlUm.js";import"./chunk-XXDRQBXY-CdoSUjQU.js";import"./chunk-VR4S4FIN-CmIFAiFd.js";import"./chunk-32BRIVSS-0zL-WEd8.js";import"./purify.es-CC4Brkr_.js";import"./index-CN9znI-m.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};