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

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)
@@ -726,14 +746,10 @@ const plugin = {
     const codexAuthPath = cfg.codexAuthPath ?? DEFAULT_CODEX_AUTH_PATH;
     const grokSessionPath = cfg.grokSessionPath ?? DEFAULT_SESSION_PATH;
 
-    // ── Grok session restore (non-blocking) ───────────────────────────────────
-    void tryRestoreGrokSession(grokSessionPath, (msg) => api.logger.info(msg));
+    // Grok session restore on startup REMOVED — on-demand only via /grok-login.
 
-    // ── Auto-connect all browser providers on startup (non-blocking) ──────────
-    void (async () => {
-      await new Promise(r => setTimeout(r, 3000)); // wait for proxy to start
-      await ensureAllProviderContexts((msg) => api.logger.info(msg));
-    })();
+    // Auto-connect on startup REMOVED — browsers are launched on-demand via /xxx-login only.
+    // Spawning 4 persistent Chromium contexts at startup caused OOM under load.
 
     // ── Phase 1: openai-codex auth bridge ─────────────────────────────────────
     if (enableCodex) {
@@ -848,8 +864,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,
@@ -861,8 +876,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,
@@ -874,8 +888,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;
             },
           });
@@ -919,8 +932,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,
@@ -932,8 +944,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,
@@ -945,8 +956,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;
                 },
               });

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openclaw-cli-bridge-elvatis",
   "name": "OpenClaw CLI Bridge",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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.1",
+  "version": "1.3.3",
   "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"
   }
-}
+}