@trenchwork/erosolar 1.1.63 → 1.2.0

package/dist/headless/interactiveShell.js

@@ -32,8 +32,9 @@ import { createAgentController } from '../runtime/agentController.js';
 import { expandFileMentions, listWorkspaceFiles } from '../core/fileMentions.js';
 import { resolveWorkspaceCaptureOptions, buildWorkspaceContext } from '../workspace.js';
 import { loadAllSecrets, listSecretDefinitions, setSecretValue, getSecretValue, getSecretDefinition, classifyKeyEntry } from '../core/secretStore.js';
-import { resolveKeyMode, keyModeLine, setPreferOwnKeys, clearHostedSession } from '../core/hostedAuth.js';
+import { resolveKeyMode, keyModeLine, setPreferOwnKeys, clearHostedSession, loginViaLoopback } from '../core/hostedAuth.js';
 import { appendMemoryNote } from '../tools/memoryTools.js';
+import { recordDeepSeekUsage, getUsage, TAVILY_MONTHLY_FREE, TAVILY_ONE_TIME_BONUS } from '../core/usage.js';
 import { listSessions, loadSessionById, saveSessionSnapshot } from '../core/sessionStore.js';
 import { relativeTime } from '../core/relativeTime.js';
 import { getModelContextInfo } from '../core/contextWindow.js';
@@ -148,7 +149,8 @@ function getVersion() {
 }
 /** Inner content of the welcome box (plain, no border/colour). */
 function welcomeBodyLines(input) {
-    const body = ['✻ Welcome to Erosolar Coder', ''];
+    const title = input.version ? `✻ Welcome to Erosolar Coder ${input.version}` : '✻ Welcome to Erosolar Coder';
+    const body = [title, ''];
     const mode = input.keyMode ?? (input.hasApiKey ? 'own' : 'none');
     if (mode === 'hosted') {
         // Signed in — running on hosted keys. The mode line names the account so
@@ -159,7 +161,7 @@ function welcomeBodyLines(input) {
         body.push(`${input.model} · ${input.provider}`, `Key: ${input.maskedKey} · /help for commands`);
     }
     else {
-        body.push('⚠ No DeepSeek API key configured', '', 'Bring your own keys:', '  /key sk-…    DeepSeek (required) · platform.deepseek.com', '  /key tvly-…  Tavily web search (optional) · tavily.com');
+        body.push('⚠ No DeepSeek API key configured', '', '/login       Sign in with Google for hosted keys', '', 'Or bring your own:', '  /key sk-…    DeepSeek (required) · platform.deepseek.com', '  /key tvly-…  Tavily web search (optional) · tavily.com');
     }
     if (input.cwd)
         body.push(`cwd: ${input.cwd}`);
@@ -283,6 +285,12 @@ class InteractiveShell {
     };
     pendingModelSwitch = null;
     currentResponseBuffer = '';
+    // The turn's final assistant text, captured BEFORE currentResponseBuffer is
+    // cleared on message.complete. The auto-continue refusal/completion/governor
+    // reads run in the `finally`, AFTER that clear, so reading the buffer there saw
+    // '' and blinded them (completion detection + safety-refusal both need the
+    // text). This mirrors the buffer's content but is never cleared mid-turn.
+    finalResponseText = '';
     // Store original prompt for auto-continuation
     originalPromptForAutoContinue = null;
     // (Pinned prompt removed per request — field intentionally absent.)
@@ -368,6 +376,7 @@ class InteractiveShell {
             // the spinner's "esc to interrupt" is real. Ctrl+C still works too.
             onEscape: () => this.handleInterrupt(),
             onShowShortcuts: () => this.showKeyboardShortcuts(),
+            onDismissPanel: () => this.dismissInlinePanel(),
         });
         // Register cleanup callback for graceful shutdown
         onShutdown(() => {
@@ -524,6 +533,7 @@ class InteractiveShell {
             cwd: this.workingDir,
             keyMode: keyStatus.mode,
             keyModeLine: keyModeLine(keyStatus),
+            version: `v${version}`,
         });
         const boxed = roundedBox(body, (cell) => cell.replace('✻', flare('✻')), (s) => wire(s));
         const welcomeContent = ['', ...updateLines, ...boxed, ''].join('\n');
@@ -857,6 +867,11 @@ class InteractiveShell {
             r?.addEvent('system', this.accountStatusText(resolveKeyMode()));
             return true;
         }
+        // /login — Google sign-in via ero.solar (loopback OAuth) to unlock hosted keys.
+        if (lower === '/login' || lower === '/signin') {
+            void this.handleLogin();
+            return true;
+        }
         // /logout — drop the hosted session (back to your own keys, or none).
         if (lower === '/logout' || lower === '/signout') {
             clearHostedSession();
@@ -907,6 +922,13 @@ class InteractiveShell {
             this.showContext();
             return true;
         }
+        // /cost — DeepSeek tokens + Tavily searches consumed (this session + all
+        // time), and the hosted free-pool reference. Account-wide remaining is a
+        // backend number shown in the ero.solar portal.
+        if (lower === '/cost' || lower === '/spend') {
+            this.showUsage();
+            return true;
+        }
         // /diff — review the files the agent changed this run, as colored diffs.
         if (lower === '/diff' || lower === '/changes') {
             this.showDiff();
@@ -1447,6 +1469,29 @@ class InteractiveShell {
         this.promptController.setInlinePanel(lines);
         this.scheduleInlinePanelDismiss();
     }
+    /** /cost — DeepSeek tokens + Tavily searches consumed (this install). */
+    showUsage() {
+        if (!this.promptController?.supportsInlinePanel()) {
+            this.promptController?.setStatusMessage('Use /cost in interactive mode');
+            setTimeout(() => this.promptController?.setStatusMessage(null), 3000);
+            return;
+        }
+        const { session, cumulative } = getUsage();
+        const label = (s) => chalk.hex('#ffb142')(s.padEnd(9));
+        const dim = (s) => chalk.dim(s);
+        const ds = (u) => `${formatTokenCount(u.deepseekInputTokens)} in · ${formatTokenCount(u.deepseekOutputTokens)} out`;
+        const lines = [
+            chalk.bold.hex('#ece6da')('Usage') + dim('  (press any key to dismiss)'),
+            '',
+            label('DeepSeek') + dim(`${ds(cumulative)}   ·   this session ${ds(session)}`),
+            label('Tavily') + dim(`${cumulative.tavilySearches} searches   ·   this session ${session.tavilySearches}`),
+            '',
+            dim(`Hosted free pool: Tavily ${TAVILY_MONTHLY_FREE.toLocaleString('en-US')}/mo + ${TAVILY_ONE_TIME_BONUS.toLocaleString('en-US')} one-time bonus.`),
+            dim('Account-wide totals + remaining show in the ero.solar portal after sign-in.'),
+        ];
+        this.promptController.setInlinePanel(lines);
+        this.scheduleInlinePanelDismiss();
+    }
     /**
      * /diff — review every file the agent changed this run as a colored diff,
      * in a dismissable panel. Reads each file's original content from the change
@@ -1538,10 +1583,45 @@ class InteractiveShell {
         }
         if (s.mode === 'own') {
             return chalk.green(`Your own keys · DeepSeek${s.ownTavily ? ' + Tavily' : ''}.`) +
-                chalk.dim(s.signedIn ? ` /account hosted to use hosted keys.` : ` Sign-in for hosted keys is coming.`);
+                chalk.dim(s.signedIn ? ` /account hosted to use hosted keys.` : ` /login to use hosted keys.`);
         }
         return chalk.yellow('No keys configured.') +
-            chalk.dim(' Set your own: /key sk-… (and /key tvly-…). Hosted sign-in is coming.');
+            chalk.dim(' /login for hosted keys, or set your own: /key sk-… (and /key tvly-…).');
+    }
+    /**
+     * /login — Google sign-in via ero.solar. Opens the browser to the SSO URL and
+     * runs a one-shot 127.0.0.1 loopback server that captures the redirect with
+     * the short-lived token (see core/hostedAuth.ts). On success the CLI is on
+     * hosted keys; no key ever touches this client.
+     */
+    async handleLogin() {
+        const r = this.promptController?.getRenderer();
+        const status = resolveKeyMode();
+        if (status.signedIn) {
+            r?.addEvent('system', chalk.green(`Already signed in as ${status.email}.`) +
+                chalk.dim(' /logout to sign out · /account to switch key source.'));
+            return;
+        }
+        r?.addEvent('system', chalk.dim('Opening ero.solar sign-in in your browser — finish there, then return here…'));
+        const result = await loginViaLoopback({ open: (url) => this.openInBrowser(url) });
+        if (result.ok && result.session) {
+            r?.addEvent('system', chalk.green(`✓ Signed in as ${result.session.email} — using hosted keys.`));
+            void this.showWelcome();
+        }
+        else {
+            r?.addEvent('system', chalk.yellow(`Sign-in didn't complete: ${result.error ?? 'unknown error'}.`) +
+                chalk.dim(' Retry /login, or use /key sk-… for your own key.'));
+        }
+    }
+    /** Best-effort open a URL in the OS browser; also prints it as a fallback. */
+    openInBrowser(url) {
+        const opener = process.platform === 'darwin' ? 'open'
+            : process.platform === 'win32' ? 'start ""'
+                : 'xdg-open';
+        // url is built by loginViaLoopback (no user input) and JSON-quoted, so the
+        // `&` in the query string can't break out of the argument.
+        childExec(`${opener} ${JSON.stringify(url)}`, () => { });
+        this.promptController?.getRenderer()?.addEvent('system', chalk.dim(`If the browser didn't open: ${url}`));
     }
     showHelp() {
         if (!this.promptController?.supportsInlinePanel()) {
@@ -1557,18 +1637,20 @@ class InteractiveShell {
         const lines = [
             chalk.bold.hex('#ece6da')('Erosolar Coder') + dim('  (press any key to dismiss)'),
             '',
+            cmd('/login') + dim('       Sign in with Google (ero.solar) to use hosted keys'),
             cmd('/key sk-…') + dim('     Set your DeepSeek API key (required)'),
             cmd('/key tvly-…') + dim('   Set your Tavily key for web search (optional)'),
             cmd('/account') + dim('      Show / switch key source (hosted vs your own)'),
             cmd('/update') + dim('      Check npm and upgrade to the latest version'),
             cmd('/resume') + dim('      Restore a previous conversation'),
             cmd('/context') + dim('     Show context-window usage'),
+            cmd('/cost') + dim('        DeepSeek tokens + Tavily searches consumed'),
             cmd('/diff') + dim('        Review changes made this run'),
             cmd('/rewind') + dim('      Undo this run\'s file changes'),
             '',
             dim('Prefixes: ') + cmd('@file') + dim(' attach · ') + cmd('!cmd') + dim(' run shell · ') + cmd('#note') + dim(' save to memory'),
             '',
-            dim('Everything else runs automatically for max performance —'),
+            dim('Everything else runs automatically —'),
             dim('deepseek-v4-pro · max thought · ultracode · adversarial verifier, all on.'),
             dim('Shift+Tab cycles permission mode · Ctrl+D exits · ? for shortcuts'),
         ];
@@ -1726,6 +1808,7 @@ class InteractiveShell {
         enterCriticalSection();
         this.isProcessing = true;
         this.currentResponseBuffer = '';
+        this.finalResponseText = '';
         this.promptController?.setStreaming(true);
         this.promptController?.setStatusMessage('Analyzing request…');
         const renderer = this.promptController?.getRenderer();
@@ -1794,6 +1877,7 @@ class InteractiveShell {
                     case 'message.start':
                         // AI has started processing - update status to show activity
                         this.currentResponseBuffer = '';
+                        this.finalResponseText = '';
                         reasoningBuffer = '';
                         reasoningOnlyStartTime = null; // Reset on new message
                         this.promptController?.setStatusMessage('Thinking...');
@@ -1801,6 +1885,7 @@ class InteractiveShell {
                     case 'message.delta':
                         // Stream content as it arrives
                         this.currentResponseBuffer += event.content ?? '';
+                        this.finalResponseText += event.content ?? '';
                         if (renderer) {
                             renderer.addEvent('stream', event.content);
                         }
@@ -1865,6 +1950,9 @@ class InteractiveShell {
                                 }
                             }
                             renderer.addEvent('response', '\n');
+                            // Capture the authoritative final text BEFORE the buffer is cleared
+                            // (the finally's auto-continue reads run after this clear).
+                            this.finalResponseText = sourceText || this.finalResponseText;
                         }
                         this.currentResponseBuffer = '';
                         break;
@@ -1943,6 +2031,8 @@ class InteractiveShell {
                         }
                         break;
                     case 'usage': {
+                        // Meter cumulative DeepSeek consumption for /usage + the portal.
+                        recordDeepSeekUsage(event.inputTokens, event.outputTokens);
                         // inputTokens = exactly what occupies the context window this turn.
                         // The real model window (not a hardcoded guess) is the denominator
                         // so "% context left" reflects the actual model.
@@ -2098,7 +2188,7 @@ class InteractiveShell {
             // model declines the request, the request is *done* — auto-continue
             // would just resubmit "continue" and start a new spinner cycle, which
             // is what produced the stuck "Thinking… (4m N s)" timer the user saw.
-            const refusedTurn = isSafetyRefusal(this.currentResponseBuffer);
+            const refusedTurn = isSafetyRefusal(this.finalResponseText);
             this.isProcessing = false;
             this.promptController?.setStreaming(false);
             this.promptController?.setStatusMessage(null);
@@ -2122,7 +2212,7 @@ class InteractiveShell {
             // Snapshot this turn's full output (tool results + narration) BEFORE the
             // buffer is cleared — the auto-continue governor + failure registry need
             // the real error text, which the reset below would otherwise wipe.
-            const combinedTurnOutput = (turnToolOutput + '\n' + this.currentResponseBuffer).slice(-16000);
+            const combinedTurnOutput = (turnToolOutput + '\n' + this.finalResponseText).slice(-16000);
             this.currentResponseBuffer = '';
             // Autosave the conversation so /resume has something to restore. Each
             // turn updates the same snapshot in place (keyed by this.sessionId).
@@ -2154,7 +2244,7 @@ class InteractiveShell {
                 if (autoMode !== 'off') {
                     // Check if original user prompt is fully completed
                     const detector = getTaskCompletionDetector();
-                    const analysis = detector.analyzeCompletion(this.currentResponseBuffer, toolsUsed);
+                    const analysis = detector.analyzeCompletion(this.finalResponseText, toolsUsed);
                     // Record this turn with the governor (bounds the loop + detects a
                     // stall: the same tools/files/failure repeating with no new progress)
                     // and the failure registry (catches the same error recurring across