@elvatis_com/openclaw-cli-bridge-elvatis 1.7.0 → 1.7.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.7.0`
+**Current version:** `1.7.2`
 
 ---
 
@@ -362,6 +362,13 @@ npm test            # vitest run (83 tests)
 
 ## Changelog
 
+### 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.2

package/index.ts

@@ -912,7 +912,7 @@ function proxyTestRequest(
 const plugin = {
   id: "openclaw-cli-bridge-elvatis",
   name: "OpenClaw CLI Bridge",
-  version: "1.7.0",
+  version: "1.7.2",
   description:
     "Phase 1: openai-codex auth bridge. " +
     "Phase 2: HTTP proxy for gemini/claude CLIs. " +
@@ -959,7 +959,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 +1005,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 +1050,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}`);
@@ -1240,6 +1246,13 @@ const plugin = {
               }
               return chatgptContext;
             },
+            version: plugin.version,
+            getExpiryInfo: () => ({
+              grok:    (() => { const e = loadGrokExpiry();    return e ? formatExpiryInfo(e)    : null; })(),
+              gemini:  (() => { const e = loadGeminiExpiry();  return e ? formatGeminiExpiry(e)  : null; })(),
+              claude:  (() => { const e = loadClaudeExpiry();  return e ? formatClaudeExpiry(e)  : null; })(),
+              chatgpt: (() => { const e = loadChatGPTExpiry(); return e ? formatChatGPTExpiry(e) : null; })(),
+            }),
           });
           proxyServer = server;
           api.logger.info(

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openclaw-cli-bridge-elvatis",
   "name": "OpenClaw CLI Bridge",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "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.0",
+  "version": "1.7.2",
   "description": "Bridges gemini, claude, and codex CLI tools as OpenClaw model providers. Reads existing CLI auth without re-login.",
   "type": "module",
   "openclaw": {

package/src/proxy-server.ts

@@ -60,6 +60,15 @@ export interface ProxyServerOptions {
   _chatgptComplete?: typeof chatgptComplete;
   /** Override for testing — replaces chatgptCompleteStream */
   _chatgptCompleteStream?: typeof chatgptCompleteStream;
+  /** Returns human-readable expiry string for each web provider (null = no login yet) */
+  getExpiryInfo?: () => {
+    grok: string | null;
+    gemini: string | null;
+    claude: string | null;
+    chatgpt: string | null;
+  };
+  /** Plugin version string for the status page */
+  version?: string;
 }
 
 /** Available CLI bridge models for GET /v1/models */
@@ -156,6 +165,111 @@ async function handleRequest(
     return;
   }
 
+  // Browser status page — human-readable HTML dashboard
+  if ((url === "/status" || url === "/") && req.method === "GET") {
+    const expiry = opts.getExpiryInfo?.() ?? { grok: null, gemini: null, claude: null, chatgpt: null };
+    const version = opts.version ?? "?";
+
+    const providers = [
+      { name: "Grok",     icon: "𝕏",  expiry: expiry.grok,    loginCmd: "/grok-login",    ctx: opts.getGrokContext?.() ?? null },
+      { name: "Gemini",   icon: "✦",  expiry: expiry.gemini,  loginCmd: "/gemini-login",  ctx: opts.getGeminiContext?.() ?? null },
+      { name: "Claude",   icon: "◆",  expiry: expiry.claude,  loginCmd: "/claude-login",  ctx: opts.getClaudeContext?.() ?? null },
+      { name: "ChatGPT",  icon: "◉",  expiry: expiry.chatgpt, loginCmd: "/chatgpt-login", ctx: opts.getChatGPTContext?.() ?? null },
+    ];
+
+    function statusBadge(p: typeof providers[0]): { label: string; color: string; dot: string } {
+      if (p.ctx !== null) return { label: "Connected", color: "#22c55e", dot: "🟢" };
+      if (!p.expiry) return { label: "Never logged in", color: "#6b7280", dot: "⚪" };
+      if (p.expiry.startsWith("⚠️ EXPIRED")) return { label: "Expired", color: "#ef4444", dot: "🔴" };
+      if (p.expiry.startsWith("🚨")) return { label: "Expiring soon", color: "#f59e0b", dot: "🟡" };
+      return { label: "Logged in", color: "#3b82f6", dot: "🔵" };
+    }
+
+    const rows = providers.map(p => {
+      const badge = statusBadge(p);
+      const expiryText = p.expiry
+        ? p.expiry.replace(/[⚠️🚨✅🕐]/gu, "").trim()
+        : `Not logged in — run <code>${p.loginCmd}</code>`;
+      return `
+        <tr>
+          <td style="padding:12px 16px;font-weight:600;font-size:15px">${p.icon} ${p.name}</td>
+          <td style="padding:12px 16px">
+            <span style="background:${badge.color}22;color:${badge.color};border:1px solid ${badge.color}44;
+                         border-radius:6px;padding:3px 10px;font-size:13px;font-weight:600">
+              ${badge.dot} ${badge.label}
+            </span>
+          </td>
+          <td style="padding:12px 16px;color:#9ca3af;font-size:13px">${expiryText}</td>
+          <td style="padding:12px 16px;color:#6b7280;font-size:12px;font-family:monospace">${p.loginCmd}</td>
+        </tr>`;
+    }).join("");
+
+    const cliModels = CLI_MODELS.filter(m => m.id.startsWith("cli-"));
+    const webModels = CLI_MODELS.filter(m => m.id.startsWith("web-"));
+    const modelList = (models: typeof CLI_MODELS) =>
+      models.map(m => `<li style="margin:2px 0;font-size:13px;color:#d1d5db"><code style="color:#93c5fd">${m.id}</code></li>`).join("");
+
+    const html = `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>CLI Bridge Status</title>
+  <meta http-equiv="refresh" content="30">
+  <style>
+    * { box-sizing: border-box; margin: 0; padding: 0; }
+    body { background: #0f1117; color: #e5e7eb; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; min-height: 100vh; padding: 32px 24px; }
+    h1 { font-size: 22px; font-weight: 700; color: #f9fafb; margin-bottom: 4px; }
+    .subtitle { color: #6b7280; font-size: 13px; margin-bottom: 28px; }
+    .card { background: #1a1d27; border: 1px solid #2d3148; border-radius: 12px; overflow: hidden; margin-bottom: 24px; }
+    .card-header { padding: 14px 16px; border-bottom: 1px solid #2d3148; font-size: 12px; font-weight: 600; color: #6b7280; text-transform: uppercase; letter-spacing: 0.05em; }
+    table { width: 100%; border-collapse: collapse; }
+    tr:not(:last-child) td { border-bottom: 1px solid #1f2335; }
+    .models { display: grid; grid-template-columns: 1fr 1fr; gap: 16px; }
+    ul { list-style: none; padding: 12px 16px; }
+    .footer { color: #374151; font-size: 12px; text-align: center; margin-top: 16px; }
+    code { background: #1e2130; padding: 1px 5px; border-radius: 4px; }
+  </style>
+</head>
+<body>
+  <h1>🌉 CLI Bridge</h1>
+  <p class="subtitle">v${version} &nbsp;·&nbsp; Port ${opts.port} &nbsp;·&nbsp; Auto-refreshes every 30s</p>
+
+  <div class="card">
+    <div class="card-header">Web Session Providers</div>
+    <table>
+      <thead>
+        <tr style="background:#13151f">
+          <th style="padding:10px 16px;text-align:left;font-size:12px;color:#4b5563;font-weight:600">Provider</th>
+          <th style="padding:10px 16px;text-align:left;font-size:12px;color:#4b5563;font-weight:600">Status</th>
+          <th style="padding:10px 16px;text-align:left;font-size:12px;color:#4b5563;font-weight:600">Session</th>
+          <th style="padding:10px 16px;text-align:left;font-size:12px;color:#4b5563;font-weight:600">Login</th>
+        </tr>
+      </thead>
+      <tbody>${rows}</tbody>
+    </table>
+  </div>
+
+  <div class="models">
+    <div class="card">
+      <div class="card-header">CLI Models (${cliModels.length})</div>
+      <ul>${modelList(cliModels)}</ul>
+    </div>
+    <div class="card">
+      <div class="card-header">Web Session Models (${webModels.length})</div>
+      <ul>${modelList(webModels)}</ul>
+    </div>
+  </div>
+
+  <p class="footer">openclaw-cli-bridge-elvatis v${version} &nbsp;·&nbsp; <a href="/v1/models" style="color:#4b5563">/v1/models</a> &nbsp;·&nbsp; <a href="/health" style="color:#4b5563">/health</a></p>
+</body>
+</html>`;
+
+    res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
+    res.end(html);
+    return;
+  }
+
   // Model list
   if (url === "/v1/models" && req.method === "GET") {
     const now = Math.floor(Date.now() / 1000);