@elvatis_com/openclaw-cli-bridge-elvatis 2.1.2 → 2.2.0

package/.ai/handoff/DASHBOARD.md

@@ -1,13 +1,13 @@
 # DASHBOARD.md — openclaw-cli-bridge-elvatis
 
-_Last updated: 2026-03-13_
+_Last updated: 2026-04-09_
 
 <!-- SECTION: plugin_status -->
 ## Plugin Status
 
 | Component | Version | Build | Tests | Status |
 |-----------|---------|-------|-------|--------|
-| openclaw-cli-bridge-elvatis | 1.7.3 | ✅ | ✅ 96/96 | ✅ Stable |
+| openclaw-cli-bridge-elvatis | 2.2.0 | ✅ | ✅ | ✅ Stable |
 <!-- /SECTION: plugin_status -->
 
 <!-- SECTION: release_state -->
@@ -15,8 +15,9 @@ _Last updated: 2026-03-13_
 
 | Platform | Published Version | Status |
 |----------|------------------|--------|
-| GitHub | v1.3.5 | ✅ Tagged + Release |
-| Local | 1.7.3 | ⏳ Built, pending push |
+| GitHub | v2.2.0 | ✅ Pushed to main |
+| npm | 2.1.3 | ⏳ Pending publish |
+| ClawHub | 2.1.3 | ⏳ Pending publish |
 <!-- /SECTION: release_state -->
 
 <!-- SECTION: open_tasks -->
@@ -30,19 +31,14 @@ _No open tasks._
 
 | Task | Title | Version |
 |------|-------|---------|
-| T-013 | Fix cookie expiry tracking — longest-lived auth cookie for all 4 providers | 1.7.3 |
-| T-012 | Persistent browser fallback for Claude/Gemini/ChatGPT (no CDP required) | 1.4.0 |
+| T-017 | Fix log spam, restart loops, CLI blocking | 2.2.0 |
+| T-016 | Issue #2: Codex auth auto-import into agent auth store | 2.1.0 |
+| T-015 | Issue #4: Background session mgmt with workdir isolation | 2.1.0 |
+| T-014 | Issue #6: Workdir isolation (createIsolatedWorkdir, cleanup, sweep) | 2.1.0 |
+| T-013 | Fix cookie expiry tracking — longest-lived auth cookie (all 4) | 1.7.3 |
+| T-012 | Persistent browser fallback for Claude/Gemini/ChatGPT (no CDP) | 1.4.0 |
 | T-011 | Session-safe staged model switching (/cli-apply, /cli-pending, --now) | 0.2.25 |
 | T-009 | Stability: sleep-resilient token refresh + stopTokenRefresh cleanup | 0.2.25 |
-| T-103 | Explicit model allowlist for CLI execution | 0.2.23 |
-| T-102 | Proxy auth key rotation via config | 0.2.23 |
-| T-101 | Unit tests for prompt formatter + model router | 0.2.23 |
 | T-008 | Validate proxy endpoints + vllm model calls end-to-end | 0.2.21 |
 | T-007 | Create GitHub repo and push initial code | 0.2.5 |
-| T-006 | Implement Claude Code CLI request bridge | 0.2.5 |
-| T-005 | Implement Gemini CLI request bridge | 0.2.5 |
-| T-004 | Verify model call: gpt-5.2 / gpt-5.3-codex responds | 0.2.5 |
-| T-003 | Test auth flow: openclaw models auth login --provider openai-codex | 0.2.5 |
-| T-002 | Implement openai-codex provider (Codex CLI auth bridge) | 0.2.5 |
-| T-001 | Scaffold plugin structure + AAHP handoff | 0.2.5 |
 <!-- /SECTION: completed_tasks -->

package/.ai/handoff/LOG.md

@@ -4,6 +4,35 @@ _Last 10 sessions. Older entries in LOG-ARCHIVE.md._
 
 ---
 
+## 2026-04-09 — Session 9 (Claude Opus 4.6)
+
+> **Agent:** claude-opus-4-6
+> **Phase:** fix
+> **Commit before:** v2.1.3
+> **Commit after:** v2.2.0
+
+**T-017: Fix log spam, restart loops, CLI blocking**
+
+### Problems
+1. `register()` called per-agent (~11×) — every call logged Chrome check, provider registration, and all 32 commands
+2. `fuser -k` port cleanup killed the gateway process itself (proxy runs in-process), causing systemd restart loops
+3. `openclaw models status` (and other CLI commands) hung indefinitely because session restore launched 4 Chromium instances
+
+### Fixes (index.ts, src/proxy-server.ts)
+- Module-level `_registerLoggedOnce` guard — Chrome/provider/commands logged once per process start
+- Module-level `_proxyStarted` guard — proxy start runs once, not per-agent
+- Shortened command log: count + `/cli-list` reference instead of listing all 32 names
+- Removed `fuser -k` — EADDRINUSE handled gracefully (skip + log)
+- `_proxyOwnedByThisProcess` flag — session restore only runs in gateway mode, skipped for CLI commands
+- Codex auth import runs once per startup, not per-agent
+
+### Also in this session
+- Installed cli-bridge plugin on production server (chef-linux@192.168.177.6)
+- Set default model to `vllm/cli-claude/claude-sonnet-4-6` (Claude CLI, no API costs)
+- Merged 3 Dependabot PRs (#13, #17, #19)
+
+---
+
 ## 2026-03-13 — Session 8 (Claude Opus 4.6)
 
 > **Agent:** claude-opus-4-6

package/.ai/handoff/MANIFEST.json

@@ -2,12 +2,12 @@
   "aahp_version": "3.0",
   "project": "openclaw-cli-bridge-elvatis",
   "last_session": {
-    "agent": "claude-sonnet-4-6",
-    "session_id": "akido-2026-03-11-v0.2.25",
-    "timestamp": "2026-03-11T17:39:00Z",
-    "commit": "pending (v0.2.25 not yet committed)",
-    "phase": "implementation",
-    "duration_minutes": 70
+    "agent": "claude-opus-4-6",
+    "session_id": "fix-log-spam-2026-04-09",
+    "timestamp": "2026-04-09T14:30:00Z",
+    "commit": "2704a46",
+    "phase": "fix",
+    "duration_minutes": 120
   },
   "files": {
     "STATUS.md": {
@@ -20,7 +20,7 @@
       "checksum": "sha256:2a2c1696de45106e01063afa35859955f0d8827c1ea3bbc117d7b46769f89a6c",
       "updated": "2026-03-11T17:39:00Z",
       "lines": 48,
-      "summary": "1 task ready: T-010 — Publish v0.2.25. No blockers."
+      "summary": "1 task ready: T-010 \u2014 Publish v0.2.25. No blockers."
     },
     "LOG.md": {
       "checksum": "sha256:b23892518fd5a5faa0b402bd2553d1d1cbca7b46675ba6dd4d413e1cbf03e19d",
@@ -32,7 +32,7 @@
       "checksum": "sha256:cf1c47a18f52e0b94b932177d4e9b455a0e3ae7f29b1a34802088ffa7ad98cef",
       "updated": "2026-03-11T17:39:00Z",
       "lines": 50,
-      "summary": "Build ✅ Tests 51/51 ✅. Local v0.2.25, last published v0.2.23. T-010 (publish) ready."
+      "summary": "Build \u2705 Tests 51/51 \u2705. Local v0.2.25, last published v0.2.23. T-010 (publish) ready."
     },
     "TRUST.md": {
       "checksum": "sha256:cbfc8dcc17c00f8da8e220eba106aac56c63782caac655c30ba60c463994adc1",
@@ -50,27 +50,133 @@
       "checksum": "sha256:f9224bf9e993863b2b9e17f36ee605950359ba43d420fa7b4c829a6fbdc92482",
       "updated": "2026-03-07T00:00:00Z",
       "lines": 152,
-      "summary": "4-phase AAHP pipeline: Research → Architecture → Implementation → Review → Handoff."
+      "summary": "4-phase AAHP pipeline: Research \u2192 Architecture \u2192 Implementation \u2192 Review \u2192 Handoff."
     }
   },
-  "quick_context": "v0.2.25 built + 51/51 tests pass. Key changes: (1) staged model switching — /cli-* now stages by default, /cli-apply to execute after session, --now for immediate; (2) sleep-resilient token refresh via setInterval; (3) stopTokenRefresh cleanup. Last published: v0.2.23. Next: T-010 — publish to GitHub/npm/ClawHub.",
+  "quick_context": "v2.2.0 pushed to main. Key changes: module-level guards prevent log spam from per-agent register() calls, removed fuser -k (caused restart loops), session restore only in gateway mode (CLI commands no longer hang), EADDRINUSE graceful handling. Plugin deployed on chef-linux production server.",
   "token_budget": {
     "manifest_only": 90,
     "manifest_plus_core": 380,
     "full_read": 850
   },
-  "next_task_id": 12,
+  "next_task_id": 18,
   "tasks": {
-    "T-001": { "title": "Scaffold plugin structure + AAHP handoff", "status": "done", "priority": "high", "depends_on": [], "created": "2026-03-07T20:40:00Z", "completed": "2026-03-07T20:56:00Z" },
-    "T-002": { "title": "Implement openai-codex provider (Codex CLI auth bridge)", "status": "done", "priority": "high", "depends_on": ["T-001"], "created": "2026-03-07T20:40:00Z", "completed": "2026-03-07T20:56:00Z" },
-    "T-003": { "title": "Test auth flow: openclaw models auth login --provider openai-codex", "status": "done", "priority": "high", "depends_on": ["T-002"], "created": "2026-03-07T20:56:00Z", "completed": "2026-03-07T21:01:00Z" },
-    "T-004": { "title": "Verify model call: test gpt-5.2 or gpt-5.3-codex responds", "status": "done", "priority": "high", "depends_on": ["T-003"], "created": "2026-03-07T20:56:00Z", "completed": "2026-03-07T21:27:00Z" },
-    "T-005": { "title": "Implement Gemini CLI request bridge", "status": "done", "priority": "medium", "depends_on": ["T-003"], "created": "2026-03-07T20:56:00Z", "completed": "2026-03-07T21:23:00Z" },
-    "T-006": { "title": "Implement Claude Code CLI request bridge", "status": "done", "priority": "medium", "depends_on": ["T-003"], "created": "2026-03-07T20:56:00Z", "completed": "2026-03-07T21:23:00Z" },
-    "T-007": { "title": "Create GitHub repo and push initial code", "status": "done", "priority": "high", "depends_on": ["T-004"], "created": "2026-03-07T21:20:00Z", "completed": "2026-03-07T21:24:00Z" },
-    "T-008": { "title": "Validate proxy endpoints + vllm model calls end-to-end", "status": "done", "priority": "high", "depends_on": ["T-005", "T-006"], "created": "2026-03-07T21:29:00Z", "completed": "2026-03-08T08:08:44Z" },
-    "T-009": { "title": "Stability: sleep-resilient token refresh + stopTokenRefresh cleanup", "status": "done", "priority": "high", "depends_on": ["T-008"], "created": "2026-03-11T15:00:00Z", "completed": "2026-03-11T16:30:00Z" },
-    "T-010": { "title": "Publish v0.2.25 to GitHub + npm + ClawHub", "status": "ready", "priority": "medium", "depends_on": ["T-011"], "created": "2026-03-11T16:30:00Z" },
-    "T-011": { "title": "Session-safe staged model switching (/cli-apply, /cli-pending, --now)", "status": "done", "priority": "high", "depends_on": ["T-009"], "created": "2026-03-11T17:00:00Z", "completed": "2026-03-11T17:39:00Z" }
-  }
-}
+    "T-001": {
+      "title": "Scaffold plugin structure + AAHP handoff",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [],
+      "created": "2026-03-07T20:40:00Z",
+      "completed": "2026-03-07T20:56:00Z"
+    },
+    "T-002": {
+      "title": "Implement openai-codex provider (Codex CLI auth bridge)",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-001"
+      ],
+      "created": "2026-03-07T20:40:00Z",
+      "completed": "2026-03-07T20:56:00Z"
+    },
+    "T-003": {
+      "title": "Test auth flow: openclaw models auth login --provider openai-codex",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-002"
+      ],
+      "created": "2026-03-07T20:56:00Z",
+      "completed": "2026-03-07T21:01:00Z"
+    },
+    "T-004": {
+      "title": "Verify model call: test gpt-5.2 or gpt-5.3-codex responds",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-003"
+      ],
+      "created": "2026-03-07T20:56:00Z",
+      "completed": "2026-03-07T21:27:00Z"
+    },
+    "T-005": {
+      "title": "Implement Gemini CLI request bridge",
+      "status": "done",
+      "priority": "medium",
+      "depends_on": [
+        "T-003"
+      ],
+      "created": "2026-03-07T20:56:00Z",
+      "completed": "2026-03-07T21:23:00Z"
+    },
+    "T-006": {
+      "title": "Implement Claude Code CLI request bridge",
+      "status": "done",
+      "priority": "medium",
+      "depends_on": [
+        "T-003"
+      ],
+      "created": "2026-03-07T20:56:00Z",
+      "completed": "2026-03-07T21:23:00Z"
+    },
+    "T-007": {
+      "title": "Create GitHub repo and push initial code",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-004"
+      ],
+      "created": "2026-03-07T21:20:00Z",
+      "completed": "2026-03-07T21:24:00Z"
+    },
+    "T-008": {
+      "title": "Validate proxy endpoints + vllm model calls end-to-end",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-005",
+        "T-006"
+      ],
+      "created": "2026-03-07T21:29:00Z",
+      "completed": "2026-03-08T08:08:44Z"
+    },
+    "T-009": {
+      "title": "Stability: sleep-resilient token refresh + stopTokenRefresh cleanup",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-008"
+      ],
+      "created": "2026-03-11T15:00:00Z",
+      "completed": "2026-03-11T16:30:00Z"
+    },
+    "T-010": {
+      "title": "Publish v0.2.25 to GitHub + npm + ClawHub",
+      "status": "ready",
+      "priority": "medium",
+      "depends_on": [
+        "T-011"
+      ],
+      "created": "2026-03-11T16:30:00Z"
+    },
+    "T-011": {
+      "title": "Session-safe staged model switching (/cli-apply, /cli-pending, --now)",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [
+        "T-009"
+      ],
+      "created": "2026-03-11T17:00:00Z",
+      "completed": "2026-03-11T17:39:00Z"
+    },
+    "T-017": {
+      "title": "Fix log spam, restart loops, CLI blocking",
+      "status": "done",
+      "priority": "high",
+      "depends_on": [],
+      "created": "2026-04-09T14:00:00Z",
+      "completed": "2026-04-09T16:30:00Z"
+    }
+  },
+  "version": "2.2.0"
+}

package/.ai/handoff/NEXT_ACTIONS.md

@@ -1,13 +1,13 @@
 # NEXT_ACTIONS.md — openclaw-cli-bridge-elvatis
 
-_Last updated: 2026-03-13_
+_Last updated: 2026-04-09_
 
 <!-- SECTION: summary -->
 ## Status Summary
 
 | Status  | Count |
 |---------|-------|
-| Done    | 16    |
+| Done    | 17    |
 | Ready   | 0     |
 | Blocked | 0     |
 <!-- /SECTION: summary -->
@@ -30,6 +30,7 @@ _No blocked tasks._
 
 | Task  | Title                                                              | Date       |
 |-------|--------------------------------------------------------------------|------------|
+| T-017 | Fix log spam, restart loops, CLI blocking (v2.2.0)               | 2026-04-09 |
 | T-016 | Issue #2: Codex auth auto-import into agent auth store            | 2026-03-19 |
 | T-015 | Issue #4: Background session mgmt with workdir isolation          | 2026-03-19 |
 | T-014 | Issue #6: Workdir isolation (createIsolatedWorkdir, cleanup, sweep) | 2026-03-19 |

package/.ai/handoff/STATUS.md

@@ -1,10 +1,10 @@
 # STATUS — openclaw-cli-bridge-elvatis
 
-## Current Version: 2.1.0
+## Current Version: 2.2.0
 
-- **npm:** @elvatis_com/openclaw-cli-bridge-elvatis (not yet published to npm)
-- **ClawHub:** openclaw-cli-bridge-elvatis@1.9.2
-- **GitHub:** https://github.com/elvatis/openclaw-cli-bridge-elvatis/releases/tag/v1.9.2
+- **npm:** @elvatis_com/openclaw-cli-bridge-elvatis@2.2.0 (pending publish)
+- **ClawHub:** openclaw-cli-bridge-elvatis@2.2.0 (pending publish)
+- **GitHub:** https://github.com/elvatis/openclaw-cli-bridge-elvatis (pushed to main)
 
 ## CLI Model Token Limits (corrected in v1.9.2)
 | Model | Context Window | Max Output |
@@ -47,6 +47,7 @@ This is by design — CLI tools output plain text only.
 - /bridge-status shows cookie-based status
 
 ## Release History (recent)
+- v2.2.0 (2026-04-09): Fix log spam (module-level guards), remove fuser -k restart loops, session restore gateway-only, EADDRINUSE graceful handling
 - v2.1.0 (2026-03-19): Issue #6 workdir isolation, Issue #4 session mgmt enhancements, Issue #2 codex auth auto-import
 - v2.0.0: Major version bump
 - v1.9.2 (2026-03-15): Fix maxTokens/contextWindow for all CLI_MODELS (were 8192, now correct per vendor specs)

package/README.md

@@ -2,7 +2,7 @@
 
 > OpenClaw plugin that bridges locally installed AI CLIs (Codex, Gemini, Claude Code, OpenCode, Pi) as model providers — with slash commands for instant model switching, restore, health testing, and model listing.
 
-**Current version:** `1.9.2`
+**Current version:** `2.2.0`
 
 ---
 
@@ -191,11 +191,10 @@ openclaw gateway restart
 ### 2. Verify (check gateway logs)
 
 ```
-[cli-bridge] proxy ready on :31337
-[cli-bridge] registered 14 commands: /cli-sonnet, /cli-opus, /cli-haiku,
-             /cli-gemini, /cli-gemini-flash, /cli-gemini3, /cli-gemini3-flash,
-             /cli-codex, /cli-codex-spark, /cli-codex52, /cli-codex54, /cli-codex-mini,
-             /cli-back, /cli-test, /cli-list
+[cli-bridge] system Chrome found: Google Chrome 146.x
+[cli-bridge] openai-codex provider registered
+[cli-bridge] registered 32 commands (use /cli-list to see all)
+[cli-bridge] proxy ready on :31337 — vllm/cli-gemini/* and vllm/cli-claude/* available
 ```
 
 ### 3. Register Codex auth (optional — Phase 1 only)
@@ -377,6 +376,30 @@ npm run ci          # lint + typecheck + test
 
 ## Changelog
 
+### v2.2.0
+- **fix:** Module-level guards prevent duplicate log spam — `register()` is called per-agent (~11×), now logs Chrome/provider/commands only once
+- **fix:** Shortened command registration log: count + `/cli-list` reference instead of listing all 32 commands
+- **fix:** Removed `fuser -k` port cleanup — was killing the gateway process itself, causing systemd restart loops
+- **fix:** EADDRINUSE now handled gracefully (skip + log) instead of process killing
+- **fix:** Session restore (4× Chromium) only runs in gateway mode — CLI commands like `openclaw models status` no longer hang
+- **fix:** Codex auth import runs once per startup, not per-agent
+
+### v2.1.3
+- **docs:** All documentation updated to reflect current version (README, SKILL.md, STATUS.md, MANIFEST.json)
+
+### v2.1.2
+- **fix:** Updated ChatGPT web session model list: gpt-4o, gpt-4o-mini, gpt-4.1, gpt-4.1-mini, o3, o4-mini, gpt-5, gpt-5-mini
+- **fix:** `server.unref()` — proxy server no longer keeps `openclaw doctor` hanging indefinitely
+
+### v2.1.1
+- **fix:** `server.unref()` on proxy server so `openclaw doctor` (and short-lived CLI commands) exit cleanly
+
+### v2.1.0
+- **feat:** Session manager for isolated per-request workdirs
+- **feat:** Register OpenCode and Pi slash commands (`/cli-opencode`, `/cli-pi`)
+- **feat:** Codex auth auto-import support
+- **feat:** Workdir isolation for all CLI runners
+
 ### v1.9.2
 - **fix:** Correct `maxTokens` and `contextWindow` for all CLI_MODELS — were hardcoded to 8192 output tokens
   - Claude Opus 4.6: 1M context / 128k output (was 200k/8k)

package/SKILL.md

@@ -68,4 +68,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.9.1
+**Version:** 2.1.3

package/index.ts

@@ -240,6 +240,22 @@ let _cdpBrowserLaunchPromise: Promise<import("playwright").BrowserContext | null
 // Set to true after first run; hot-reloads see true and skip the restore loop.
 let _startupRestoreDone = false;
 
+// Registration guard — register() is called once per agent (~11 times on a
+// typical gateway). Only log noisy one-time info (Chrome check, provider
+// registration, command list, proxy status) on the FIRST call.
+let _registerLoggedOnce = false;
+
+// Proxy start guard — prevents multiple concurrent startProxy() calls from
+// racing. The first call wins; subsequent calls detect the running proxy via
+// probeExisting() and reuse it silently.
+let _proxyStarted = false;
+
+// Tracks whether THIS process owns the proxy (freshly started it, not just reusing
+// an external one). Used to decide if heavyweight startup tasks (session restores,
+// keep-alive intervals) should run. Short-lived CLI commands (models status, doctor)
+// reuse the gateway's proxy but should NOT launch Chromium instances.
+let _proxyOwnedByThisProcess = false;
+
 // Session keep-alive interval — refreshes browser cookies every 20h
 let _keepAliveInterval: ReturnType<typeof setInterval> | null = null;
 
@@ -1010,14 +1026,16 @@ const plugin = {
     // Stealth mode uses channel: "chrome" (real system Chrome). If it's missing,
     // browser launches will fail or Cloudflare will block the bundled Chromium.
     const chromeCheck = checkSystemChrome();
-    if (chromeCheck.available) {
-      api.logger.info(`[cli-bridge] system Chrome found: ${chromeCheck.version ?? chromeCheck.path}`);
-    } else {
-      api.logger.warn(
-        `[cli-bridge] ⚠ system Chrome not found! Web browser providers (/grok-login, /gemini-login, etc.) ` +
-        `require Google Chrome or Chromium installed system-wide. ` +
-        `Install with: sudo apt install google-chrome-stable (or chromium-browser)`
-      );
+    if (!_registerLoggedOnce) {
+      if (chromeCheck.available) {
+        api.logger.info(`[cli-bridge] system Chrome found: ${chromeCheck.version ?? chromeCheck.path}`);
+      } else {
+        api.logger.warn(
+          `[cli-bridge] ⚠ system Chrome not found! Web browser providers (/grok-login, /gemini-login, etc.) ` +
+          `require Google Chrome or Chromium installed system-wide. ` +
+          `Install with: sudo apt install google-chrome-stable (or chromium-browser)`
+        );
+      }
     }
 
     // ── Session restore: only on first plugin load (not on hot-reloads) ──────
@@ -1027,7 +1045,13 @@ const plugin = {
     // restore once, on the very first load (when all contexts are null).
     //
     // Guard: _startupRestoreDone is module-level and persists across hot-reloads.
-    if (!_startupRestoreDone) {
+    // IMPORTANT: Only restore sessions when the proxy is enabled (gateway mode).
+    // Short-lived CLI commands (openclaw models status, openclaw doctor, etc.)
+    // must NOT launch 4 Chromium instances — they block the process from exiting.
+    // Only restore browser sessions when this process OWNS the proxy (gateway mode).
+    // Short-lived CLI commands (openclaw models status) reuse an external proxy and
+    // must not launch 4 Chromium instances that block the process from exiting.
+    if (!_startupRestoreDone && _proxyOwnedByThisProcess) {
       _startupRestoreDone = true;
       void (async () => {
         await new Promise(r => setTimeout(r, 5000)); // wait for proxy + gateway to settle
@@ -1260,23 +1284,27 @@ const plugin = {
         },
       });
 
-      api.logger.info("[cli-bridge] openai-codex provider registered");
+      if (!_registerLoggedOnce) {
+        api.logger.info("[cli-bridge] openai-codex provider registered");
+      }
 
       // Auto-import Codex CLI credentials into the agent auth store (Issue #2).
       // This ensures `openai-codex/*` models work immediately without manual
       // `openclaw models auth login`. Runs async, non-blocking.
-      void importCodexAuth({
-        codexAuthPath,
-        log: (msg) => api.logger.info(`[cli-bridge:codex-import] ${msg}`),
-      }).then((result) => {
-        if (result.imported) {
-          api.logger.info("[cli-bridge] Codex auth auto-imported into agent auth store ✅");
-        } else if (result.skipped) {
-          api.logger.info("[cli-bridge] Codex auth already current in agent auth store");
-        } else if (result.error) {
-          api.logger.warn(`[cli-bridge] Codex auth import failed: ${result.error}`);
-        }
-      });
+      // Only run Codex auth import once — it fires per-agent and spams logs otherwise
+      if (!_registerLoggedOnce) {
+        void importCodexAuth({
+          codexAuthPath,
+          log: (msg) => api.logger.info(`[cli-bridge:codex-import] ${msg}`),
+        }).then((result) => {
+          if (result.imported) {
+            api.logger.info("[cli-bridge] Codex auth auto-imported into agent auth store ✅");
+          } else if (result.error) {
+            api.logger.warn(`[cli-bridge] Codex auth import failed: ${result.error}`);
+          }
+          // skipped = already current → no log needed
+        });
+      }
     }
 
     // ── Phase 2: CLI request proxy ─────────────────────────────────────────────
@@ -1302,6 +1330,11 @@ const plugin = {
       };
 
       const startProxy = async (): Promise<void> => {
+        // Guard: only the first register() call starts the proxy.
+        // Subsequent per-agent calls skip entirely.
+        if (_proxyStarted) return;
+        _proxyStarted = true;
+
         // If a healthy proxy is already up, reuse it — no need to rebind.
         const alive = await probeExisting();
         if (alive) {
@@ -1369,6 +1402,7 @@ const plugin = {
             }),
           });
           proxyServer = server;
+          _proxyOwnedByThisProcess = true;
           api.logger.info(
             `[cli-bridge] proxy ready on :${port} — vllm/cli-gemini/* and vllm/cli-claude/* available`
           );
@@ -2442,7 +2476,10 @@ const plugin = {
       "/bridge-status",
       "/cli-help",
     ];
-    api.logger.info(`[cli-bridge] registered ${allCommands.length} commands: ${allCommands.join(", ")}`);
+    if (!_registerLoggedOnce) {
+      api.logger.info(`[cli-bridge] registered ${allCommands.length} commands (use /cli-list to see all)`);
+    }
+    _registerLoggedOnce = true;
   },
 };
 

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-cli-bridge-elvatis",
   "slug": "openclaw-cli-bridge-elvatis",
   "name": "OpenClaw CLI Bridge",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "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": "2.1.2",
+  "version": "2.2.0",
   "description": "Bridges gemini, claude, and codex CLI tools as OpenClaw model providers. Reads existing CLI auth without re-login.",
   "type": "module",
   "openclaw": {
@@ -19,12 +19,12 @@
     "@eslint/js": "^10.0.1",
     "@types/node": "^25.3.2",
     "eslint": "^10.0.3",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.0",
+    "typescript": "^6.0.2",
+    "typescript-eslint": "^8.58.1",
     "vitest": "^4.0.18"
   },
   "dependencies": {
     "playwright": "^1.58.2"
   },
   "license": "Apache-2.0"
-}
+}

package/src/proxy-server.ts

@@ -144,10 +144,22 @@ export function startProxyServer(opts: ProxyServerOptions): Promise<http.Server>
       sessionManager.stop();
     });
 
-    server.on("error", (err) => reject(err));
+    server.on("error", (err: NodeJS.ErrnoException) => {
+      if (err.code === "EADDRINUSE") {
+        // Port is held by a previous gateway process. probeExisting() should have
+        // caught a healthy proxy and reused it. If we get here, the old proxy is
+        // unhealthy but the OS hasn't released the socket yet. Just log and skip —
+        // do NOT fuser -k: the proxy runs in-process and killing the port holder
+        // would kill the gateway itself, causing a systemd restart loop.
+        opts.log(`[cli-bridge] port ${opts.port} in use by another process — proxy skipped (will retry on next gateway restart)`);
+        resolve(server); // resolve without a listening server — probeExisting handles reuse
+      } else {
+        reject(err);
+      }
+    });
     server.listen(opts.port, "127.0.0.1", () => {
       opts.log(
-        `[cli-bridge] proxy server listening on http://127.0.0.1:${opts.port}`
+        `[cli-bridge] proxy listening on :${opts.port}`
       );
       // unref() so the proxy server does not keep the Node.js event loop alive
       // when openclaw doctor or other short-lived CLI commands load plugins.

package/src/session-manager.ts

@@ -111,6 +111,13 @@ export class SessionManager {
    * Returns a unique sessionId (random hex).
    */
   spawn(model: string, messages: ChatMessage[], opts: SpawnOptions = {}): string {
+    // Validate model ID before it reaches spawn() args to prevent command injection
+    // (CodeQL js/command-line-injection). Allow only safe chars: letters, digits,
+    // dots, hyphens, underscores, and forward slashes (for provider prefixes).
+    if (!/^[a-zA-Z0-9._\-\/]+$/.test(model)) {
+      throw new Error(`Invalid model ID: "${model}". Only alphanumeric characters, dots, hyphens, underscores, and slashes are allowed.`);
+    }
+
     const sessionId = randomBytes(8).toString("hex");
     const prompt = formatPrompt(messages);