@elvatis_com/openclaw-cli-bridge-elvatis 1.6.3 → 1.6.4

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.6.3`
+**Current version:** `1.6.4`
 
 ---
 
@@ -362,9 +362,13 @@ npm test            # vitest run (83 tests)
 
 ## Changelog
 
+### v1.6.4
+- **chore:** version bump (1.6.3 was already published on npm with partial changes)
+
 ### v1.6.3
-- **fix:** `/bridge-status` now uses cookie expiry files as source of truth (not in-memory context). Shows 🟡 "logged in, browser not loaded" instead of ❌ "not connected" after gateway restarts when cookies are still valid.
-- **fix:** Update ChatGPT web-session models to current lineup: added `gpt-4.1`, `gpt-5-mini`; renamed `gpt-o3`→`o3`, `gpt-o4-mini`→`o4-mini`; updated context window sizes.
+- **fix:** CLI-proxy models (`cli-gemini/*`, `cli-claude/*`) now return HTTP 400 with `tools_not_supported` when a request includes tool/function call schemas — prevents agents from silently failing or hallucinating when assigned a CLI-proxy model
+- **feat:** `/v1/models` response includes `capabilities.tools: false` for CLI-proxy models so OpenClaw can detect tool support upfront
+- **fix:** EADDRINUSE on hot-reload: re-probe after 1.5s wait before retrying bind; probe timeout 800ms → 2000ms
 
 ### v1.6.2
 - **docs:** Add missing changelog entries (v1.5.1, v1.6.0, v1.6.1), fix /cli-codex54 command name in SKILL.md, add startup re-login alert description to SKILL.md.

package/SKILL.md

@@ -64,4 +64,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.6.3
+**Version:** 1.6.4

package/index.ts

@@ -854,7 +854,7 @@ function proxyTestRequest(
 const plugin = {
   id: "openclaw-cli-bridge-elvatis",
   name: "OpenClaw CLI Bridge",
-  version: "1.6.2",
+  version: "1.6.4",
   description:
     "Phase 1: openai-codex auth bridge. " +
     "Phase 2: HTTP proxy for gemini/claude CLIs. " +
@@ -1067,7 +1067,7 @@ const plugin = {
               headers: { Authorization: `Bearer ${apiKey}` } },
             (res) => { res.resume(); resolve(res.statusCode === 200); }
           );
-          req.setTimeout(800, () => { req.destroy(); resolve(false); });
+          req.setTimeout(2000, () => { req.destroy(); resolve(false); });
           req.on("error", () => resolve(false));
           req.end();
         });
@@ -1144,8 +1144,17 @@ const plugin = {
         } catch (err: unknown) {
           const msg = (err as Error).message ?? String(err);
           if (msg.includes("EADDRINUSE")) {
-            // Port is busy but probe didn't respond — wait for the OS to release it
-            api.logger.warn(`[cli-bridge] port ${port} busy, waiting 1s for OS release…`);
+            // Port is busy but probe didn't respond — maybe the old server is still shutting down.
+            // Re-probe first: if it now responds, reuse it without rebinding.
+            api.logger.warn(`[cli-bridge] port ${port} busy — re-probing before retry…`);
+            await new Promise(r => setTimeout(r, 1500));
+            const aliveNow = await probeExisting();
+            if (aliveNow) {
+              api.logger.info(`[cli-bridge] proxy now responding on :${port} — reusing`);
+              return;
+            }
+            // Still not responding — wait for OS to release the port, then rebind
+            api.logger.warn(`[cli-bridge] port ${port} still busy, waiting 1s for OS release…`);
             await new Promise((r) => setTimeout(r, 1000));
             // One final attempt
             try {

package/openclaw.plugin.json

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

package/src/cli-runner.ts

@@ -316,8 +316,20 @@ export const DEFAULT_ALLOWED_CLI_MODELS: ReadonlySet<string> = new Set([
   "cli-gemini/gemini-2.5-flash",
   "cli-gemini/gemini-3-pro-preview",
   "cli-gemini/gemini-3-flash-preview",
+  // Aliases (map to preview variants internally)
+  "cli-gemini/gemini-3-pro",   // alias → gemini-3-pro-preview
+  "cli-gemini/gemini-3-flash", // alias → gemini-3-flash-preview
 ]);
 
+/** Normalize model aliases to their canonical CLI model names. */
+function normalizeModelAlias(normalized: string): string {
+  const ALIASES: Record<string, string> = {
+    "cli-gemini/gemini-3-pro":   "cli-gemini/gemini-3-pro-preview",
+    "cli-gemini/gemini-3-flash": "cli-gemini/gemini-3-flash-preview",
+  };
+  return ALIASES[normalized] ?? normalized;
+}
+
 // ──────────────────────────────────────────────────────────────────────────────
 // Router
 // ──────────────────────────────────────────────────────────────────────────────
@@ -364,8 +376,11 @@ export async function routeToCliRunner(
     );
   }
 
-  if (normalized.startsWith("cli-gemini/")) return runGemini(prompt, normalized, timeoutMs);
-  if (normalized.startsWith("cli-claude/")) return runClaude(prompt, normalized, timeoutMs);
+  // Resolve aliases (e.g. gemini-3-pro → gemini-3-pro-preview) after allowlist check
+  const resolved = normalizeModelAlias(normalized);
+
+  if (resolved.startsWith("cli-gemini/")) return runGemini(prompt, resolved, timeoutMs);
+  if (resolved.startsWith("cli-claude/")) return runClaude(prompt, resolved, timeoutMs);
 
   throw new Error(
     `Unknown CLI bridge model: "${model}". Use "vllm/cli-gemini/<model>" or "vllm/cli-claude/<model>".`

package/src/proxy-server.ts

@@ -72,6 +72,7 @@ export const CLI_MODELS = [
   { id: "cli-gemini/gemini-2.5-pro",      name: "Gemini 2.5 Pro (CLI)",   contextWindow: 1_000_000, maxTokens: 8_192 },
   { id: "cli-gemini/gemini-2.5-flash",    name: "Gemini 2.5 Flash (CLI)", contextWindow: 1_000_000, maxTokens: 8_192 },
   { id: "cli-gemini/gemini-3-pro-preview",name: "Gemini 3 Pro (CLI)",     contextWindow: 1_000_000, maxTokens: 8_192 },
+  { id: "cli-gemini/gemini-3-pro",        name: "Gemini 3 Pro (CLI, alias)", contextWindow: 1_000_000, maxTokens: 8_192 },
   // Grok web-session models (requires /grok-login)
   { id: "web-grok/grok-3",           name: "Grok 3 (web session)",           contextWindow: 131_072, maxTokens: 131_072 },
   { id: "web-grok/grok-3-fast",      name: "Grok 3 Fast (web session)",      contextWindow: 131_072, maxTokens: 131_072 },
@@ -167,6 +168,10 @@ async function handleRequest(
           object: "model",
           created: now,
           owned_by: "openclaw-cli-bridge",
+          // CLI-proxy models stream plain text — no tool/function call support
+          capabilities: {
+            tools: !(m.id.startsWith("cli-gemini/") || m.id.startsWith("cli-claude/")),
+          },
         })),
       })
     );
@@ -201,7 +206,8 @@ async function handleRequest(
       return;
     }
 
-    const { model, messages, stream = false } = parsed;
+    const { model, messages, stream = false } = parsed as { model: string; messages: ChatMessage[]; stream?: boolean; tools?: unknown };
+    const hasTools = Array.isArray((parsed as { tools?: unknown }).tools) && (parsed as { tools?: unknown[] }).tools!.length > 0;
 
     if (!model || !messages?.length) {
       res.writeHead(400, { "Content-Type": "application/json" });
@@ -209,7 +215,23 @@ async function handleRequest(
       return;
     }
 
-    opts.log(`[cli-bridge] ${model} · ${messages.length} msg(s) · stream=${stream}`);
+    // CLI-proxy models (cli-gemini/*, cli-claude/*) are plain text completions —
+    // they cannot process tool/function call schemas. Return a clear 400 so
+    // OpenClaw can surface a meaningful error instead of getting a garbled response.
+    const isCliModel = model.startsWith("cli-gemini/") || model.startsWith("cli-claude/");
+    if (hasTools && isCliModel) {
+      res.writeHead(400, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({
+        error: {
+          message: `Model ${model} does not support tool/function calls. Use a native API model (e.g. github-copilot/gpt-5-mini) for agents that need tools.`,
+          type: "invalid_request_error",
+          code: "tools_not_supported",
+        }
+      }));
+      return;
+    }
+
+    opts.log(`[cli-bridge] ${model} · ${messages.length} msg(s) · stream=${stream}${hasTools ? " · tools=unsupported→rejected" : ""}`);
 
     const id = `chatcmpl-cli-${randomBytes(6).toString("hex")}`;
     const created = Math.floor(Date.now() / 1000);