@steipete/oracle 0.7.6 → 0.8.1

package/dist/src/oracle/run.js

@@ -20,7 +20,7 @@ import { createFsAdapter } from './fsAdapter.js';
 import { resolveGeminiModelId } from './gemini.js';
 import { resolveClaudeModelId } from './claude.js';
 import { renderMarkdownAnsi } from '../cli/markdownRenderer.js';
-import { createLiveRenderer } from 'markdansi';
+import { createMarkdownStreamer } from 'markdansi';
 import { executeBackgroundResponse } from './background.js';
 import { formatTokenEstimate, formatTokenValue, resolvePreviewMode } from './runUtils.js';
 import { estimateUsdCost } from 'tokentally';
@@ -312,8 +312,6 @@ export async function runOracle(options, deps = {}) {
     let response = null;
     let elapsedMs = 0;
     let sawTextDelta = false;
-    let streamedText = '';
-    let lastLiveFrameAtMs = 0;
     let answerHeaderPrinted = false;
     const allowAnswerHeader = options.suppressAnswerHeader !== true;
     const timeoutExceeded = () => now() - runStart >= timeoutMs;
@@ -381,14 +379,23 @@ export async function runOracle(options, deps = {}) {
                     },
                 });
             }
-            let liveRenderer = null;
+            let markdownStreamer = null;
+            const flushMarkdownStreamer = () => {
+                if (!markdownStreamer)
+                    return;
+                const rendered = markdownStreamer.finish();
+                markdownStreamer = null;
+                if (rendered) {
+                    stdoutWrite(rendered);
+                }
+            };
             try {
-                liveRenderer =
+                markdownStreamer =
                     isTty && !renderPlain
-                        ? createLiveRenderer({
-                            write: stdoutWrite,
-                            width: process.stdout.columns ?? 80,
-                            renderFrame: renderMarkdownAnsi,
+                        ? createMarkdownStreamer({
+                            render: renderMarkdownAnsi,
+                            spacing: 'single',
+                            mode: 'hybrid',
                         })
                         : null;
                 for await (const event of stream) {
@@ -409,38 +416,27 @@ export async function runOracle(options, deps = {}) {
                         stdoutWrite(event.delta);
                         continue;
                     }
-                    if (liveRenderer) {
-                        streamedText += event.delta;
-                        const currentMs = now();
-                        const due = currentMs - lastLiveFrameAtMs >= 120;
-                        const hasNewline = event.delta.includes('\n');
-                        if (hasNewline || due) {
-                            liveRenderer.render(streamedText);
-                            lastLiveFrameAtMs = currentMs;
+                    if (markdownStreamer) {
+                        const rendered = markdownStreamer.push(event.delta);
+                        if (rendered) {
+                            stdoutWrite(rendered);
                         }
                         continue;
                     }
                     // Non-TTY streams should still surface output; fall back to raw stdout.
                     stdoutWrite(event.delta);
                 }
-                if (liveRenderer) {
-                    streamedText = streamedText.trim();
-                    if (streamedText.length > 0) {
-                        liveRenderer.render(streamedText);
-                    }
-                }
+                flushMarkdownStreamer();
                 throwIfTimedOut();
             }
             catch (streamError) {
                 // stream.abort() is not available on the interface
+                flushMarkdownStreamer();
                 stopHeartbeatNow();
                 const transportError = toTransportError(streamError, requestBody.model);
                 log(chalk.yellow(describeTransportError(transportError, timeoutMs)));
                 throw transportError;
             }
-            finally {
-                liveRenderer?.finish();
-            }
             response = await stream.finalResponse();
             throwIfTimedOut();
             stopHeartbeatNow();
@@ -455,17 +451,12 @@ export async function runOracle(options, deps = {}) {
     }
     // We only add spacing when streamed text was printed.
     if (sawTextDelta && !options.silent) {
-        const shouldRenderAfterStream = isTty && !renderPlain && streamedText.length > 0;
         if (renderPlain) {
             // Plain streaming already wrote chunks; ensure clean separation.
             stdoutWrite('\n');
         }
-        else if (!shouldRenderAfterStream) {
-            // Non-TTY streams should still surface output; ensure separation.
-            log('');
-        }
         else {
-            // Live-rendered mode already drew the final frame; only separate from logs.
+            // Separate streamed output from logs.
             log('');
         }
     }

package/dist/src/remote/server.js

@@ -7,7 +7,7 @@ import { spawn, spawnSync } from 'node:child_process';
 import { mkdtemp, rm, mkdir, writeFile } from 'node:fs/promises';
 import chalk from 'chalk';
 import { runBrowserMode } from '../browserMode.js';
-import { loadChromeCookies } from '../browser/chromeCookies.js';
+import { getCookies } from '@steipete/sweet-cookie';
 import { CHATGPT_URL } from '../browser/constants.js';
 import { cleanupStaleProfileState, readDevToolsPort, verifyDevToolsReachable, writeChromePid, writeDevToolsActivePort, } from '../browser/profileState.js';
 import { normalizeChatgptUrl } from '../browser/utils.js';
@@ -331,13 +331,17 @@ function formatReachableAddresses(bindAddress, port) {
 async function loadLocalChatgptCookies(logger, targetUrl) {
     try {
         logger('Loading ChatGPT cookies from this host\'s Chrome profile...');
-        const cookies = await Promise.resolve(loadChromeCookies({
-            targetUrl,
-            profile: 'Default',
-        })).catch((error) => {
-            logger(`Unable to load local ChatGPT cookies on this host: ${error instanceof Error ? error.message : String(error)}`);
-            return [];
+        const { cookies: rawCookies, warnings } = await getCookies({
+            url: targetUrl,
+            browsers: ['chrome'],
+            mode: 'merge',
+            chromeProfile: 'Default',
+            timeoutMs: 5_000,
         });
+        if (warnings.length) {
+            logger(`Cookie warnings:\n- ${warnings.join('\n- ')}`);
+        }
+        const cookies = rawCookies.map(toCdpCookie).filter((c) => Boolean(c));
         if (!cookies || cookies.length === 0) {
             logger('No local ChatGPT cookies found on this host. Please log in once; opening ChatGPT...');
             const opened = triggerLocalLoginPrompt(logger, targetUrl);
@@ -348,14 +352,7 @@ async function loadLocalChatgptCookies(logger, targetUrl) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        const missingDbMatch = message.match(/Unable to locate Chrome cookie DB at (.+)/);
-        if (missingDbMatch) {
-            const lookedPath = missingDbMatch[1];
-            logger(`Chrome cookies not found at ${lookedPath}. Set --browser-cookie-path to your Chrome profile or log in manually.`);
-        }
-        else {
-            logger(`Unable to load local ChatGPT cookies on this host: ${message}`);
-        }
+        logger(`Unable to load local ChatGPT cookies on this host: ${message}`);
         if (process.platform === 'linux' && isWsl()) {
             logger('WSL hint: Chrome lives under /mnt/c/Users/<you>/AppData/Local/Google/Chrome/User Data/Default; pass --browser-cookie-path to that directory if auto-detect fails.');
         }
@@ -363,6 +360,24 @@ async function loadLocalChatgptCookies(logger, targetUrl) {
         return { cookies: null, opened };
     }
 }
+function toCdpCookie(cookie) {
+    if (!cookie?.name)
+        return null;
+    const out = {
+        name: cookie.name,
+        value: cookie.value,
+        domain: cookie.domain,
+        path: cookie.path ?? '/',
+        secure: cookie.secure ?? true,
+        httpOnly: cookie.httpOnly ?? false,
+    };
+    if (typeof cookie.expires === 'number')
+        out.expires = cookie.expires;
+    if (cookie.sameSite === 'Lax' || cookie.sameSite === 'Strict' || cookie.sameSite === 'None') {
+        out.sameSite = cookie.sameSite;
+    }
+    return out;
+}
 function triggerLocalLoginPrompt(logger, url) {
     const verbose = process.argv.includes('--verbose') || process.env.ORACLE_SERVE_VERBOSE === '1';
     const openers = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steipete/oracle",
-  "version": "0.7.6",
+  "version": "0.8.1",
   "description": "CLI wrapper around OpenAI Responses API with GPT-5.2 Pro (via gpt-5.1-pro alias), GPT-5.2, GPT-5.1, and GPT-5.1 Codex high reasoning modes.",
   "type": "module",
   "main": "dist/bin/oracle-cli.js",
@@ -42,13 +42,13 @@
     "url": "git+https://github.com/steipete/oracle.git"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "devEngines": {
     "runtime": [
       {
         "name": "node",
-        "version": ">=20"
+        "version": ">=22"
       }
     ]
   },
@@ -64,8 +64,8 @@
     "@google/genai": "^1.34.0",
     "@google/generative-ai": "^0.24.1",
     "@modelcontextprotocol/sdk": "^1.25.1",
+    "@steipete/sweet-cookie": "^0.1.0",
     "chalk": "^5.6.2",
-    "chrome-cookies-secure": "3.0.0",
     "chrome-launcher": "^1.2.1",
     "chrome-remote-interface": "^0.33.3",
     "clipboardy": "^5.0.2",
@@ -75,13 +75,11 @@
     "gpt-tokenizer": "^3.4.0",
     "inquirer": "13.1.0",
     "json5": "^2.2.3",
-    "keytar": "^7.9.0",
     "kleur": "^4.1.5",
-    "markdansi": "0.1.7",
+    "markdansi": "0.2.0",
     "openai": "^6.15.0",
-    "osc-progress": "^0.1.0",
+    "osc-progress": "^0.2.0",
     "shiki": "^3.20.0",
-    "sqlite3": "^5.1.7",
     "toasted-notifier": "^10.1.0",
     "tokentally": "^0.1.1",
     "zod": "^4.2.1"
@@ -102,20 +100,13 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.16"
   },
-  "optionalDependencies": {
-    "win-dpapi": "npm:@primno/dpapi@2.0.1"
-  },
   "pnpm": {
     "overrides": {
-      "devtools-protocol": "0.0.1561482",
-      "win-dpapi": "npm:@primno/dpapi@2.0.1"
+      "devtools-protocol": "0.0.1561482"
     },
     "onlyBuiltDependencies": [
       "@cdktf/node-pty-prebuilt-multiarch",
-      "esbuild",
-      "keytar",
-      "sqlite3",
-      "win-dpapi"
+      "esbuild"
     ]
   },
   "packageManager": "pnpm@10.23.0+sha512.21c4e5698002ade97e4efe8b8b4a89a8de3c85a37919f957e7a0f30f38fbc5bbdd05980ffe29179b2fb6e6e691242e098d945d1601772cad0fef5fb6411e2a4b"