@elvatis_com/openclaw-cli-bridge-elvatis 1.2.0 → 1.3.1

package/README.md

@@ -2,7 +2,7 @@
 
 > OpenClaw plugin that bridges locally installed AI CLIs (Codex, Gemini, Claude Code) as model providers — with slash commands for instant model switching, restore, health testing, and model listing.
 
-**Current version:** `1.2.0`
+**Current version:** `1.3.1`
 
 ---
 
@@ -287,6 +287,16 @@ npm test            # vitest run (45 tests)
 
 ## Changelog
 
+### v1.3.1
+- **fix:** /claude-login, /gemini-login, /chatgpt-login now bake cookies into persistent profile dirs
+- **fix:** After gateway restart, providers auto-reconnect from saved profile (no browser tabs needed)
+- **fix:** Better debug logging when persistent headless context fails (Cloudflare etc.)
+
+### v1.3.0
+- **fix:** Browser persistence after gateway restart — each provider launches its own persistent Chromium if OpenClaw browser is unavailable
+- **feat:** `ensureAllProviderContexts()` — unified startup connect for all 4 providers
+- **feat:** Lazy-connect fallback to persistent context when CDP unavailable
+
 ### v1.2.0
 - **fix:** Fresh page per request — no more message accumulation across calls
 - **feat:** ChatGPT model switching via URL param (?model=gpt-4o, o3, etc.)

package/SKILL.md

@@ -53,4 +53,4 @@ Each command runs `openclaw models set <model>` atomically and replies with a co
 
 See `README.md` for full configuration reference and architecture diagram.
 
-**Version:** 1.2.0
+**Version:** 1.3.1

package/index.ts

@@ -322,6 +322,103 @@ async function cleanupBrowsers(log: (msg: string) => void): Promise<void> {
   log("[cli-bridge] browser resources cleaned up");
 }
 
+/**
+ * Ensure all browser provider contexts are connected.
+ * 1. Try the shared OpenClaw browser (CDP 18800)
+ * 2. Fallback: launch a persistent headless Chromium per provider (saved profile with cookies)
+ */
+async function ensureAllProviderContexts(log: (msg: string) => void): Promise<void> {
+  const { chromium } = await import("playwright");
+
+  // Try CDP first (OpenClaw browser)
+  let sharedCtx: BrowserContext | null = null;
+  try {
+    const b = await chromium.connectOverCDP("http://127.0.0.1:18800", { timeout: 2000 });
+    sharedCtx = b.contexts()[0] ?? null;
+    if (sharedCtx) log("[cli-bridge] using OpenClaw browser for all providers");
+  } catch { /* not available */ }
+
+  // For each provider: if no context yet, try shared ctx or launch own persistent context
+  const providerConfigs = [
+    {
+      name: "claude",
+      profileDir: join(homedir(), ".openclaw", "claude-profile"),
+      getCtx: () => claudeContext,
+      setCtx: (c: BrowserContext) => { claudeContext = c; },
+      homeUrl: "https://claude.ai/new",
+      verifySelector: ".ProseMirror",
+    },
+    {
+      name: "gemini",
+      profileDir: join(homedir(), ".openclaw", "gemini-profile"),
+      getCtx: () => geminiContext,
+      setCtx: (c: BrowserContext) => { geminiContext = c; },
+      homeUrl: "https://gemini.google.com/app",
+      verifySelector: ".ql-editor",
+    },
+    {
+      name: "chatgpt",
+      profileDir: join(homedir(), ".openclaw", "chatgpt-profile"),
+      getCtx: () => chatgptContext,
+      setCtx: (c: BrowserContext) => { chatgptContext = c; },
+      homeUrl: "https://chatgpt.com",
+      verifySelector: "#prompt-textarea",
+    },
+  ];
+
+  for (const cfg of providerConfigs) {
+    if (cfg.getCtx()) continue; // already connected
+
+    let ctx: BrowserContext | null = null;
+
+    // 1. Try shared OpenClaw browser context
+    if (sharedCtx) {
+      try {
+        const pages = sharedCtx.pages();
+        const existing = pages.find(p => p.url().includes(new URL(cfg.homeUrl).hostname));
+        const page = existing ?? await sharedCtx.newPage();
+        if (!existing) {
+          await page.goto(cfg.homeUrl, { waitUntil: "domcontentloaded", timeout: 10_000 });
+          await new Promise(r => setTimeout(r, 2000));
+        }
+        const visible = await page.locator(cfg.verifySelector).isVisible().catch(() => false);
+        if (visible) {
+          ctx = sharedCtx;
+          log(`[cli-bridge:${cfg.name}] connected via OpenClaw browser ✅`);
+        }
+      } catch { /* fall through */ }
+    }
+
+    // 2. Launch own persistent context (has saved cookies)
+    if (!ctx) {
+      try {
+        mkdirSync(cfg.profileDir, { recursive: true });
+        const pCtx = await chromium.launchPersistentContext(cfg.profileDir, {
+          headless: true,
+          args: ["--no-sandbox", "--disable-setuid-sandbox"],
+        });
+        const page = await pCtx.newPage();
+        await page.goto(cfg.homeUrl, { waitUntil: "domcontentloaded", timeout: 15_000 });
+        await new Promise(r => setTimeout(r, 4000));
+        const visible = await page.locator(cfg.verifySelector).isVisible().catch(() => false);
+        if (visible) {
+          ctx = pCtx;
+          log(`[cli-bridge:${cfg.name}] launched persistent context ✅`);
+        } else {
+          const title = await page.title().catch(() => "unknown");
+          const bodySnippet = await page.evaluate(() => document.body?.innerText?.substring(0, 100) ?? "").catch(() => "");
+          log(`[cli-bridge:${cfg.name}] persistent headless: editor not visible — title="${title}" body="${bodySnippet}"`);
+          await pCtx.close().catch(() => {});
+        }
+      } catch (err) {
+        log(`[cli-bridge:${cfg.name}] could not launch browser: ${(err as Error).message}`);
+      }
+    }
+
+    if (ctx) cfg.setCtx(ctx);
+  }
+}
+
 async function tryRestoreGrokSession(
   _sessionPath: string,
   log: (msg: string) => void
@@ -613,7 +710,7 @@ function proxyTestRequest(
 const plugin = {
   id: "openclaw-cli-bridge-elvatis",
   name: "OpenClaw CLI Bridge",
-  version: "1.2.0",
+  version: "1.3.1",
   description:
     "Phase 1: openai-codex auth bridge. " +
     "Phase 2: HTTP proxy for gemini/claude CLIs. " +
@@ -634,49 +731,8 @@ const plugin = {
 
     // ── Auto-connect all browser providers on startup (non-blocking) ──────────
     void (async () => {
-      // Wait for proxy to start first
-      await new Promise(r => setTimeout(r, 3000));
-      const log = (msg: string) => api.logger.info(msg);
-      const ctx = await connectToOpenClawBrowser(log);
-      if (!ctx) { log("[cli-bridge] startup auto-connect: OpenClaw browser not available"); return; }
-      const pages = ctx.pages().map(p => p.url());
-      log(`[cli-bridge] startup auto-connect: ${pages.length} pages open`);
-
-      // Claude
-      if (pages.some(u => u.includes("claude.ai")) && !claudeContext) {
-        try {
-          const { getOrCreateClaudePage } = await import("./src/claude-browser.js");
-          const { page } = await getOrCreateClaudePage(ctx);
-          if (await page.locator(".ProseMirror").isVisible().catch(() => false)) {
-            claudeContext = ctx;
-            log("[cli-bridge:claude] auto-connected ✅");
-          }
-        } catch { /* not available */ }
-      }
-
-      // Gemini
-      if (pages.some(u => u.includes("gemini.google.com")) && !geminiContext) {
-        try {
-          const { getOrCreateGeminiPage } = await import("./src/gemini-browser.js");
-          const { page } = await getOrCreateGeminiPage(ctx);
-          if (await page.locator(".ql-editor").isVisible().catch(() => false)) {
-            geminiContext = ctx;
-            log("[cli-bridge:gemini] auto-connected ✅");
-          }
-        } catch { /* not available */ }
-      }
-
-      // ChatGPT
-      if (pages.some(u => u.includes("chatgpt.com")) && !chatgptContext) {
-        try {
-          const { getOrCreateChatGPTPage } = await import("./src/chatgpt-browser.js");
-          const { page } = await getOrCreateChatGPTPage(ctx);
-          if (await page.locator("#prompt-textarea").isVisible().catch(() => false)) {
-            chatgptContext = ctx;
-            log("[cli-bridge:chatgpt] auto-connected ✅");
-          }
-        } catch { /* not available */ }
-      }
+      await new Promise(r => setTimeout(r, 3000)); // wait for proxy to start
+      await ensureAllProviderContexts((msg) => api.logger.info(msg));
     })();
 
     // ── Phase 1: openai-codex auth bridge ─────────────────────────────────────
@@ -792,7 +848,9 @@ const plugin = {
                 const editor = await page.locator(".ProseMirror").isVisible().catch(() => false);
                 if (editor) { claudeContext = ctx; return ctx; }
               }
-              return null;
+              // Fallback: try persistent context
+              await ensureAllProviderContexts((msg) => api.logger.info(msg));
+              return claudeContext;
             },
             getGeminiContext: () => geminiContext,
             connectGeminiContext: async () => {
@@ -803,7 +861,9 @@ const plugin = {
                 const editor = await page.locator(".ql-editor").isVisible().catch(() => false);
                 if (editor) { geminiContext = ctx; return ctx; }
               }
-              return null;
+              // Fallback: try persistent context
+              await ensureAllProviderContexts((msg) => api.logger.info(msg));
+              return geminiContext;
             },
             getChatGPTContext: () => chatgptContext,
             connectChatGPTContext: async () => {
@@ -814,7 +874,9 @@ const plugin = {
                 const editor = await page.locator("#prompt-textarea").isVisible().catch(() => false);
                 if (editor) { chatgptContext = ctx; return ctx; }
               }
-              return null;
+              // Fallback: try persistent context
+              await ensureAllProviderContexts((msg) => api.logger.info(msg));
+              return chatgptContext;
             },
           });
           proxyServer = server;
@@ -857,7 +919,9 @@ const plugin = {
                     const editor = await page.locator(".ProseMirror").isVisible().catch(() => false);
                     if (editor) { claudeContext = ctx; return ctx; }
                   }
-                  return null;
+                  // Fallback: try persistent context
+                  await ensureAllProviderContexts((msg) => api.logger.info(msg));
+                  return claudeContext;
                 },
                 getGeminiContext: () => geminiContext,
                 connectGeminiContext: async () => {
@@ -868,7 +932,9 @@ const plugin = {
                     const editor = await page.locator(".ql-editor").isVisible().catch(() => false);
                     if (editor) { geminiContext = ctx; return ctx; }
                   }
-                  return null;
+                  // Fallback: try persistent context
+                  await ensureAllProviderContexts((msg) => api.logger.info(msg));
+                  return geminiContext;
                 },
                 getChatGPTContext: () => chatgptContext,
                 connectChatGPTContext: async () => {
@@ -879,7 +945,9 @@ const plugin = {
                     const editor = await page.locator("#prompt-textarea").isVisible().catch(() => false);
                     if (editor) { chatgptContext = ctx; return ctx; }
                   }
-                  return null;
+                  // Fallback: try persistent context
+                  await ensureAllProviderContexts((msg) => api.logger.info(msg));
+                  return chatgptContext;
                 },
               });
               proxyServer = server;
@@ -1259,6 +1327,26 @@ const plugin = {
 
         claudeContext = ctx;
 
+        // Export + bake cookies into persistent profile
+        const claudeProfileDir = join(homedir(), ".openclaw", "claude-profile");
+        mkdirSync(claudeProfileDir, { recursive: true });
+        try {
+          const allCookies = await ctx.cookies([
+            "https://claude.ai",
+            "https://anthropic.com",
+          ]);
+          const { chromium } = await import("playwright");
+          const pCtx = await chromium.launchPersistentContext(claudeProfileDir, {
+            headless: true,
+            args: ["--no-sandbox", "--disable-setuid-sandbox"],
+          });
+          await pCtx.addCookies(allCookies);
+          await pCtx.close();
+          api.logger.info(`[cli-bridge:claude] cookies baked into ${claudeProfileDir}`);
+        } catch (err) {
+          api.logger.warn(`[cli-bridge:claude] cookie bake failed: ${(err as Error).message}`);
+        }
+
         // Scan cookie expiry
         const expiry = await scanClaudeCookieExpiry(ctx);
         if (expiry) {
@@ -1336,6 +1424,27 @@ const plugin = {
 
         geminiContext = ctx;
 
+        // Export + bake cookies into persistent profile
+        const geminiProfileDir = join(homedir(), ".openclaw", "gemini-profile");
+        mkdirSync(geminiProfileDir, { recursive: true });
+        try {
+          const allCookies = await ctx.cookies([
+            "https://gemini.google.com",
+            "https://accounts.google.com",
+            "https://google.com",
+          ]);
+          const { chromium } = await import("playwright");
+          const pCtx = await chromium.launchPersistentContext(geminiProfileDir, {
+            headless: true,
+            args: ["--no-sandbox", "--disable-setuid-sandbox"],
+          });
+          await pCtx.addCookies(allCookies);
+          await pCtx.close();
+          api.logger.info(`[cli-bridge:gemini] cookies baked into ${geminiProfileDir}`);
+        } catch (err) {
+          api.logger.warn(`[cli-bridge:gemini] cookie bake failed: ${(err as Error).message}`);
+        }
+
         const expiry = await scanGeminiCookieExpiry(ctx);
         if (expiry) {
           saveGeminiExpiry(expiry);
@@ -1405,6 +1514,28 @@ const plugin = {
           return { text: "❌ ChatGPT editor not visible — are you logged in?\nOpen chatgpt.com in your browser and try again." };
 
         chatgptContext = ctx;
+
+        // Export + bake cookies into persistent profile
+        const chatgptProfileDir = join(homedir(), ".openclaw", "chatgpt-profile");
+        mkdirSync(chatgptProfileDir, { recursive: true });
+        try {
+          const allCookies = await ctx.cookies([
+            "https://chatgpt.com",
+            "https://openai.com",
+            "https://auth.openai.com",
+          ]);
+          const { chromium } = await import("playwright");
+          const pCtx = await chromium.launchPersistentContext(chatgptProfileDir, {
+            headless: true,
+            args: ["--no-sandbox", "--disable-setuid-sandbox"],
+          });
+          await pCtx.addCookies(allCookies);
+          await pCtx.close();
+          api.logger.info(`[cli-bridge:chatgpt] cookies baked into ${chatgptProfileDir}`);
+        } catch (err) {
+          api.logger.warn(`[cli-bridge:chatgpt] cookie bake failed: ${(err as Error).message}`);
+        }
+
         const expiry = await scanChatGPTCookieExpiry(ctx);
         if (expiry) { saveChatGPTExpiry(expiry); api.logger.info(`[cli-bridge:chatgpt] cookie expiry: ${new Date(expiry.expiresAt).toISOString()}`); }
         const expiryLine = expiry ? `\n\n🕐 Cookie expiry: ${formatChatGPTExpiry(expiry)}` : "";

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openclaw-cli-bridge-elvatis",
   "name": "OpenClaw CLI Bridge",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Phase 1: openai-codex auth bridge. Phase 2: local HTTP proxy routing model calls through gemini/claude CLIs (vllm provider).",
   "providers": [
     "openai-codex"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elvatis_com/openclaw-cli-bridge-elvatis",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Bridges gemini, claude, and codex CLI tools as OpenClaw model providers. Reads existing CLI auth without re-login.",
   "type": "module",
   "openclaw": {