@elvatis_com/openclaw-cli-bridge-elvatis 1.3.0 → 1.3.2

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.3.0`
+**Current version:** `1.3.1`
 
 ---
 
@@ -287,6 +287,11 @@ 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

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.3.0
+**Version:** 1.3.1

package/index.ts

@@ -322,12 +322,32 @@ async function cleanupBrowsers(log: (msg: string) => void): Promise<void> {
   log("[cli-bridge] browser resources cleaned up");
 }
 
+/**
+ * Singleton guard for ensureAllProviderContexts — prevents concurrent spawns.
+ * If a run is already in progress, callers await the same promise instead of
+ * spawning a new Chromium each time.
+ */
+let _ensureAllRunning: Promise<void> | null = null;
+
 /**
  * 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)
+ *
+ * SAFETY: Only one concurrent run allowed. Extra callers await the existing run.
  */
 async function ensureAllProviderContexts(log: (msg: string) => void): Promise<void> {
+  if (_ensureAllRunning) {
+    log("[cli-bridge] ensureAllProviderContexts already running — awaiting existing run");
+    return _ensureAllRunning;
+  }
+  _ensureAllRunning = _doEnsureAllProviderContexts(log).finally(() => {
+    _ensureAllRunning = null;
+  });
+  return _ensureAllRunning;
+}
+
+async function _doEnsureAllProviderContexts(log: (msg: string) => void): Promise<void> {
   const { chromium } = await import("playwright");
 
   // Try CDP first (OpenClaw browser)
@@ -399,14 +419,16 @@ async function ensureAllProviderContexts(log: (msg: string) => void): Promise<vo
         });
         const page = await pCtx.newPage();
         await page.goto(cfg.homeUrl, { waitUntil: "domcontentloaded", timeout: 15_000 });
-        await new Promise(r => setTimeout(r, 3000));
+        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(() => {});
-          log(`[cli-bridge:${cfg.name}] persistent context: editor not visible (not logged in?)`);
         }
       } catch (err) {
         log(`[cli-bridge:${cfg.name}] could not launch browser: ${(err as Error).message}`);
@@ -708,7 +730,7 @@ function proxyTestRequest(
 const plugin = {
   id: "openclaw-cli-bridge-elvatis",
   name: "OpenClaw CLI Bridge",
-  version: "1.3.0",
+  version: "1.3.1",
   description:
     "Phase 1: openai-codex auth bridge. " +
     "Phase 2: HTTP proxy for gemini/claude CLIs. " +
@@ -846,8 +868,7 @@ const plugin = {
                 const editor = await page.locator(".ProseMirror").isVisible().catch(() => false);
                 if (editor) { claudeContext = ctx; return ctx; }
               }
-              // Fallback: try persistent context
-              await ensureAllProviderContexts((msg) => api.logger.info(msg));
+              // No fallback spawn — return existing context or null to avoid Chromium leak
               return claudeContext;
             },
             getGeminiContext: () => geminiContext,
@@ -859,8 +880,7 @@ const plugin = {
                 const editor = await page.locator(".ql-editor").isVisible().catch(() => false);
                 if (editor) { geminiContext = ctx; return ctx; }
               }
-              // Fallback: try persistent context
-              await ensureAllProviderContexts((msg) => api.logger.info(msg));
+              // No fallback spawn — return existing context or null to avoid Chromium leak
               return geminiContext;
             },
             getChatGPTContext: () => chatgptContext,
@@ -872,8 +892,7 @@ const plugin = {
                 const editor = await page.locator("#prompt-textarea").isVisible().catch(() => false);
                 if (editor) { chatgptContext = ctx; return ctx; }
               }
-              // Fallback: try persistent context
-              await ensureAllProviderContexts((msg) => api.logger.info(msg));
+              // No fallback spawn — return existing context or null to avoid Chromium leak
               return chatgptContext;
             },
           });
@@ -917,8 +936,7 @@ const plugin = {
                     const editor = await page.locator(".ProseMirror").isVisible().catch(() => false);
                     if (editor) { claudeContext = ctx; return ctx; }
                   }
-                  // Fallback: try persistent context
-                  await ensureAllProviderContexts((msg) => api.logger.info(msg));
+                  // No fallback spawn — return existing context or null to avoid Chromium leak
                   return claudeContext;
                 },
                 getGeminiContext: () => geminiContext,
@@ -930,8 +948,7 @@ const plugin = {
                     const editor = await page.locator(".ql-editor").isVisible().catch(() => false);
                     if (editor) { geminiContext = ctx; return ctx; }
                   }
-                  // Fallback: try persistent context
-                  await ensureAllProviderContexts((msg) => api.logger.info(msg));
+                  // No fallback spawn — return existing context or null to avoid Chromium leak
                   return geminiContext;
                 },
                 getChatGPTContext: () => chatgptContext,
@@ -943,8 +960,7 @@ const plugin = {
                     const editor = await page.locator("#prompt-textarea").isVisible().catch(() => false);
                     if (editor) { chatgptContext = ctx; return ctx; }
                   }
-                  // Fallback: try persistent context
-                  await ensureAllProviderContexts((msg) => api.logger.info(msg));
+                  // No fallback spawn — return existing context or null to avoid Chromium leak
                   return chatgptContext;
                 },
               });
@@ -1325,6 +1341,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) {
@@ -1402,6 +1438,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);
@@ -1471,6 +1528,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.3.0",
+  "version": "1.3.2",
   "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.3.0",
+  "version": "1.3.2",
   "description": "Bridges gemini, claude, and codex CLI tools as OpenClaw model providers. Reads existing CLI auth without re-login.",
   "type": "module",
   "openclaw": {
@@ -22,4 +22,4 @@
   "dependencies": {
     "playwright": "^1.58.2"
   }
-}
+}