@elvatis_com/openclaw-cli-bridge-elvatis 1.7.1 → 1.7.3

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.7.0`
+**Current version:** `1.7.3`
 
 ---
 
@@ -362,6 +362,16 @@ npm test            # vitest run (83 tests)
 
 ## Changelog
 
+### v1.7.3
+- **fix:** Claude cookie expiry now uses the longest-lived auth cookie (`sessionKey`, ~1 year) instead of the earliest-expiring one. `__cf_bm` (Cloudflare, ~30 min) was previously causing false "session expired" alerts every 30 minutes.
+
+### v1.7.2
+- **fix:** Startup restore now uses cookie expiry file as primary check — if cookies are still valid (>1h left), the persistent context is launched immediately without a fragile browser selector check. This eliminates false "not logged in" errors for Grok/Claude/ChatGPT caused by slow page loads or DOM selector changes.
+- **fix:** Grok cookie file path corrected to `grok-cookie-expiry.json` (was `grok-session.json`).
+
+### v1.7.1
+- **feat:** `/status` HTML dashboard — browser-accessible health page at `http://127.0.0.1:31337/status`. Shows all 4 web providers with live status badge (Connected / Logged in / Expired / Never logged in), cookie expiry per provider, CLI and web model list. Auto-refreshes every 30s.
+
 ### v1.7.0
 - **fix:** Startup restore timeout 3s → 6s with one retry, eliminates false "not logged in" for slow-loading pages (Grok)
 - **feat:** Auto-relogin on startup — if cookies truly expired, attempt headless relogin before sending WhatsApp alert

package/SKILL.md

@@ -56,6 +56,8 @@ Sessions survive gateway restarts. `/bridge-status` shows all 4 at a glance.
 
 On gateway restart, if any session has expired, a **WhatsApp alert** is sent automatically with the exact `/xxx-login` commands needed — no guessing required.
 
+**Browser health dashboard:** `http://127.0.0.1:31337/status` — live overview of all 4 providers, cookie expiry, and model list. Auto-refreshes every 30s.
+
 ## Setup
 
 1. Enable plugin + restart gateway
@@ -64,4 +66,4 @@ On gateway restart, if any session has expired, a **WhatsApp alert** is sent aut
 
 See `README.md` for full configuration reference and architecture diagram.
 
-**Version:** 1.7.0
+**Version:** 1.7.3

package/index.ts

@@ -149,11 +149,13 @@ function loadClaudeExpiry(): ClaudeExpiryInfo | null {
 async function scanClaudeCookieExpiry(ctx: BrowserContext): Promise<ClaudeExpiryInfo | null> {
   try {
     const cookies = await ctx.cookies(["https://claude.ai"]);
-    const auth = cookies.filter(c => ["sessionKey", "__cf_bm", "lastActiveOrg"].includes(c.name) && c.expires && c.expires > 0);
+    const auth = cookies.filter(c => ["sessionKey", "lastActiveOrg"].includes(c.name) && c.expires && c.expires > 0);
     if (!auth.length) return null;
-    auth.sort((a, b) => (a.expires ?? 0) - (b.expires ?? 0));
-    const earliest = auth[0];
-    return { expiresAt: (earliest.expires ?? 0) * 1000, loginAt: Date.now(), cookieName: earliest.name };
+    // Use the LONGEST-lived auth cookie (sessionKey) for expiry tracking,
+    // not short-lived Cloudflare cookies like __cf_bm (~30 min).
+    auth.sort((a, b) => (b.expires ?? 0) - (a.expires ?? 0));
+    const longest = auth[0];
+    return { expiresAt: (longest.expires ?? 0) * 1000, loginAt: Date.now(), cookieName: longest.name };
   } catch { return null; }
 }
 
@@ -912,7 +914,7 @@ function proxyTestRequest(
 const plugin = {
   id: "openclaw-cli-bridge-elvatis",
   name: "OpenClaw CLI Bridge",
-  version: "1.7.0",
+  version: "1.7.3",
   description:
     "Phase 1: openai-codex auth bridge. " +
     "Phase 2: HTTP proxy for gemini/claude CLIs. " +
@@ -959,7 +961,7 @@ const plugin = {
           {
             name: "grok",
             profileDir: GROK_PROFILE_DIR,
-            cookieFile: join(homedir(), ".openclaw", "grok-session.json"),
+            cookieFile: GROK_EXPIRY_FILE,
             verifySelector: "textarea",
             homeUrl: "https://grok.com",
             loginCmd: "/grok-login",
@@ -1005,8 +1007,44 @@ const plugin = {
           }
           if (p.getCtx()) continue; // already connected
 
+          // ── Cookie-first check ────────────────────────────────────────────
+          // If a cookie expiry file exists and is still valid (>1h left),
+          // launch the persistent context immediately without a browser-based
+          // selector check. Selector checks are fragile (slow pages, DOM changes).
+          // The keep-alive (20h) will verify the session properly later.
+          let cookiesValid = false;
+          if (existsSync(p.cookieFile)) {
+            try {
+              const expInfo = JSON.parse(readFileSync(p.cookieFile, "utf-8")) as { expiresAt: number };
+              const msLeft = expInfo.expiresAt - Date.now();
+              if (msLeft > 3_600_000) { // >1h remaining
+                cookiesValid = true;
+                api.logger.info(`[cli-bridge:${p.name}] cookie valid (${Math.floor(msLeft / 86_400_000)}d left) — restoring context without browser check`);
+              }
+            } catch { /* ignore parse errors */ }
+          }
+
+          if (cookiesValid) {
+            try {
+              const ctx = await chromium.launchPersistentContext(p.profileDir, {
+                headless: true,
+                args: ["--no-sandbox", "--disable-setuid-sandbox"],
+              });
+              p.setCtx(ctx);
+              ctx.on("close", () => { p.setCtx(null as unknown as BrowserContext); });
+              api.logger.info(`[cli-bridge:${p.name}] session restored from profile ✅`);
+            } catch (err) {
+              api.logger.warn(`[cli-bridge:${p.name}] context launch failed: ${(err as Error).message}`);
+              needsLogin.push(p.loginCmd);
+            }
+            // Sequential — never spawn all 4 Chromium instances at once
+            await new Promise(r => setTimeout(r, 1000));
+            continue;
+          }
+
+          // ── Fallback: cookies expired or missing — try browser check ─────
           try {
-            api.logger.info(`[cli-bridge:${p.name}] restoring session from profile…`);
+            api.logger.info(`[cli-bridge:${p.name}] cookies expired/missing — verifying via browser…`);
             const ctx = await chromium.launchPersistentContext(p.profileDir, {
               headless: true,
               args: ["--no-sandbox", "--disable-setuid-sandbox"],
@@ -1014,46 +1052,16 @@ const plugin = {
             const page = await ctx.newPage();
             await page.goto(p.homeUrl, { waitUntil: "domcontentloaded", timeout: 20_000 });
             await new Promise(r => setTimeout(r, 6000));
-            let ok = await page.locator(p.verifySelector).isVisible().catch(() => false);
-            // Retry once — some pages (Grok) load slowly
-            if (!ok) {
-              api.logger.info(`[cli-bridge:${p.name}] verifySelector not visible after 6s, retrying (3s)…`);
-              await new Promise(r => setTimeout(r, 3000));
-              ok = await page.locator(p.verifySelector).isVisible().catch(() => false);
-            }
+            const ok = await page.locator(p.verifySelector).isVisible().catch(() => false);
             await page.close().catch(() => {});
             if (ok) {
               p.setCtx(ctx);
               ctx.on("close", () => { p.setCtx(null as unknown as BrowserContext); });
               api.logger.info(`[cli-bridge:${p.name}] session restored from profile ✅`);
             } else {
-              // Session may be truly expired or just slow — attempt auto-relogin:
-              // re-navigate in the same context and check once more
-              api.logger.info(`[cli-bridge:${p.name}] not logged in after restore — attempting auto-relogin…`);
-              try {
-                const reloginPage = await ctx.newPage();
-                await reloginPage.goto(p.homeUrl, { waitUntil: "domcontentloaded", timeout: 20_000 });
-                await new Promise(r => setTimeout(r, 6000));
-                let reloginOk = await reloginPage.locator(p.verifySelector).isVisible().catch(() => false);
-                if (!reloginOk) {
-                  await new Promise(r => setTimeout(r, 3000));
-                  reloginOk = await reloginPage.locator(p.verifySelector).isVisible().catch(() => false);
-                }
-                await reloginPage.close().catch(() => {});
-                if (reloginOk) {
-                  p.setCtx(ctx);
-                  ctx.on("close", () => { p.setCtx(null as unknown as BrowserContext); });
-                  api.logger.info(`[cli-bridge:${p.name}] session restored (slow load) ✅`);
-                } else {
-                  await ctx.close().catch(() => {});
-                  api.logger.info(`[cli-bridge:${p.name}] auto-relogin failed, needs manual ${p.loginCmd}`);
-                  needsLogin.push(p.loginCmd);
-                }
-              } catch (reloginErr) {
-                await ctx.close().catch(() => {});
-                api.logger.warn(`[cli-bridge:${p.name}] auto-relogin error: ${(reloginErr as Error).message}`);
-                needsLogin.push(p.loginCmd);
-              }
+              await ctx.close().catch(() => {});
+              api.logger.info(`[cli-bridge:${p.name}] session expired — needs ${p.loginCmd}`);
+              needsLogin.push(p.loginCmd);
             }
           } catch (err) {
             api.logger.warn(`[cli-bridge:${p.name}] startup restore failed: ${(err as Error).message}`);

package/openclaw.plugin.json

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

package/package.json

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