@elvatis_com/openclaw-cli-bridge-elvatis 2.5.0 → 2.6.0

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:** `2.5.0`
+**Current version:** `2.6.0`
 
 ---
 
@@ -378,7 +378,7 @@ Model fallback (v1.9.0):
 ```bash
 npm run lint        # eslint (TypeScript-aware)
 npm run typecheck   # tsc --noEmit
-npm test            # vitest run (217 tests)
+npm test            # vitest run (252 tests)
 npm run ci          # lint + typecheck + test
 ```
 
@@ -386,6 +386,15 @@ npm run ci          # lint + typecheck + test
 
 ## Changelog
 
+### v2.6.0
+- **feat:** Provider session registry (`src/provider-sessions.ts`) — persistent sessions that survive across runs. When a CLI run times out, the session is preserved (not deleted) so follow-up runs can resume in the same context. Sessions are stored in `~/.openclaw/cli-bridge/sessions.json`.
+- **feat:** Centralized config module (`src/config.ts`) — all magic numbers, timeouts, paths, ports, and model defaults extracted into one file. No more scattered hardcoded values.
+- **feat:** Session-aware proxy — every CLI request gets a `provider_session_id` in the response. Pass it back via `providerSessionId` in subsequent requests to reuse the same session.
+- **feat:** New proxy endpoints: `GET /v1/provider-sessions` (list sessions + stats), `DELETE /v1/provider-sessions/:id` (remove a session)
+- **fix:** Version fallback changed from `"0.0.0"` to `"unknown"` with secondary lookup in `openclaw.plugin.json` — prevents Dashboard showing wrong version
+- **refactor:** `index.ts`, `cli-runner.ts`, `session-manager.ts`, `proxy-server.ts` now import all constants from `config.ts` instead of defining them locally
+- **test:** 35 new tests for provider sessions, config exports (252 total)
+
 ### v2.5.0
 - **feat:** Graceful timeout handling — replaces Node's `spawn({ timeout })` with manual SIGTERM→SIGKILL sequence (5s grace period). Exit 143 is now clearly annotated as "timeout by supervisor" in logs, not a cryptic model error.
 - **feat:** Per-model timeout profiles — new `modelTimeouts` config option sets sensible defaults per model: Opus 5 min, Sonnet 3 min, Haiku 90s, Flash models 90s. Scales dynamically with conversation size (+2s/msg beyond 10, +5s/tool).

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:** 2.5.0
+**Version:** 2.6.0

package/index.ts

@@ -41,7 +41,13 @@ const PACKAGE_VERSION: string = (() => {
     const pkg = JSON.parse(readFileSync(join(__dirname_local, "package.json"), "utf-8")) as { version: string };
     return pkg.version;
   } catch {
-    return "0.0.0"; // fallback — should never happen in normal operation
+    // Second attempt: try openclaw.plugin.json (always co-located)
+    try {
+      const manifest = JSON.parse(readFileSync(join(__dirname_local, "openclaw.plugin.json"), "utf-8")) as { version: string };
+      return manifest.version;
+    } catch {
+      return "unknown"; // should never happen — both files are always present
+    }
   }
 })();
 import type {
@@ -62,6 +68,18 @@ import {
 import { importCodexAuth } from "./src/codex-auth-import.js";
 import { startProxyServer } from "./src/proxy-server.js";
 import { patchOpencllawConfig } from "./src/config-patcher.js";
+import {
+  DEFAULT_PROXY_PORT,
+  DEFAULT_PROXY_API_KEY,
+  DEFAULT_PROXY_TIMEOUT_MS,
+  DEFAULT_MODEL_TIMEOUTS,
+  DEFAULT_MODEL_FALLBACKS,
+  STATE_FILE as CONFIG_STATE_FILE,
+  PENDING_FILE as CONFIG_PENDING_FILE,
+  OPENCLAW_DIR,
+  CLI_TEST_DEFAULT_MODEL as CONFIG_CLI_TEST_DEFAULT_MODEL,
+  PROFILE_DIRS,
+} from "./src/config.js";
 import {
   loadSession,
   deleteSession,
@@ -109,11 +127,11 @@ interface CliPluginConfig {
 let grokBrowser: Browser | null = null;
 let grokContext: BrowserContext | null = null;
 
-// Persistent profile dirs — survive gateway restarts, keep cookies intact
-const GROK_PROFILE_DIR = join(homedir(), ".openclaw", "grok-profile");
-const GEMINI_PROFILE_DIR = join(homedir(), ".openclaw", "gemini-profile");
-const CLAUDE_PROFILE_DIR = join(homedir(), ".openclaw", "claude-profile");
-const CHATGPT_PROFILE_DIR = join(homedir(), ".openclaw", "chatgpt-profile");
+// Persistent profile dirs — imported from config.ts
+const GROK_PROFILE_DIR = PROFILE_DIRS.grok;
+const GEMINI_PROFILE_DIR = PROFILE_DIRS.gemini;
+const CLAUDE_PROFILE_DIR = PROFILE_DIRS.claude;
+const CHATGPT_PROFILE_DIR = PROFILE_DIRS.chatgpt;
 
 // Stealth launch options — prevent Cloudflare/bot detection from flagging the browser
 const STEALTH_ARGS = [
@@ -685,14 +703,13 @@ async function tryRestoreGrokSession(
   }
 }
 
-const DEFAULT_PROXY_PORT = 31337;
-const DEFAULT_PROXY_API_KEY = "cli-bridge";
+// DEFAULT_PROXY_PORT, DEFAULT_PROXY_API_KEY imported from config.ts
 
 // ──────────────────────────────────────────────────────────────────────────────
 // State file — persists the model that was active before the last /cli-* switch
 // Located at ~/.openclaw/cli-bridge-state.json (survives gateway restarts)
 // ──────────────────────────────────────────────────────────────────────────────
-const STATE_FILE = join(homedir(), ".openclaw", "cli-bridge-state.json");
+const STATE_FILE = CONFIG_STATE_FILE;
 
 interface CliBridgeState {
   previousModel: string;
@@ -708,7 +725,7 @@ function readState(): CliBridgeState | null {
 
 function writeState(state: CliBridgeState): void {
   try {
-    mkdirSync(join(homedir(), ".openclaw"), { recursive: true });
+    mkdirSync(OPENCLAW_DIR, { recursive: true });
     writeFileSync(STATE_FILE, JSON.stringify(state, null, 2) + "\n", "utf8");
   } catch {
     // non-fatal — /cli-back will just report no previous model
@@ -780,7 +797,7 @@ const CLI_MODEL_COMMANDS = [
 ] as const;
 
 /** Default model used by /cli-test when no arg is given */
-const CLI_TEST_DEFAULT_MODEL = "cli-claude/claude-sonnet-4-6";
+const CLI_TEST_DEFAULT_MODEL = CONFIG_CLI_TEST_DEFAULT_MODEL;
 
 // ──────────────────────────────────────────────────────────────────────────────
 // Staged-switch state file
@@ -788,7 +805,7 @@ const CLI_TEST_DEFAULT_MODEL = "cli-claude/claude-sonnet-4-6";
 // Written by /cli-* (default), applied by /cli-apply or /cli-* --now.
 // Located at ~/.openclaw/cli-bridge-pending.json
 // ──────────────────────────────────────────────────────────────────────────────
-const PENDING_FILE = join(homedir(), ".openclaw", "cli-bridge-pending.json");
+const PENDING_FILE = CONFIG_PENDING_FILE;
 
 interface CliBridgePending {
   model: string;
@@ -806,7 +823,7 @@ function readPending(): CliBridgePending | null {
 
 function writePending(pending: CliBridgePending): void {
   try {
-    mkdirSync(join(homedir(), ".openclaw"), { recursive: true });
+    mkdirSync(OPENCLAW_DIR, { recursive: true });
     writeFileSync(PENDING_FILE, JSON.stringify(pending, null, 2) + "\n", "utf8");
   } catch {
     // non-fatal
@@ -988,22 +1005,9 @@ const plugin = {
     const enableProxy = cfg.enableProxy ?? true;
     const port = cfg.proxyPort ?? DEFAULT_PROXY_PORT;
     const apiKey = cfg.proxyApiKey ?? DEFAULT_PROXY_API_KEY;
-    const timeoutMs = cfg.proxyTimeoutMs ?? 300_000;
-    // Per-model timeout overrides — fall back to sensible defaults if not configured.
-    // Interactive/fast models get shorter timeouts, heavy models get more time.
-    const defaultModelTimeouts: Record<string, number> = {
-      "cli-claude/claude-opus-4-6":       300_000,  // 5 min — heavy, agentic tasks
-      "cli-claude/claude-sonnet-4-6":     180_000,  // 3 min — standard interactive chat
-      "cli-claude/claude-haiku-4-5":       90_000,  // 90s  — fast responses
-      "cli-gemini/gemini-2.5-pro":        180_000,
-      "cli-gemini/gemini-2.5-flash":       90_000,
-      "cli-gemini/gemini-3-pro-preview":  180_000,
-      "cli-gemini/gemini-3-flash-preview": 90_000,
-      "openai-codex/gpt-5.4":            300_000,
-      "openai-codex/gpt-5.3-codex":      180_000,
-      "openai-codex/gpt-5.1-codex-mini":  90_000,
-    };
-    const modelTimeouts = { ...defaultModelTimeouts, ...cfg.modelTimeouts };
+    const timeoutMs = cfg.proxyTimeoutMs ?? DEFAULT_PROXY_TIMEOUT_MS;
+    // Per-model timeout overrides — defaults from config.ts, can be extended via plugin config.
+    const modelTimeouts = { ...DEFAULT_MODEL_TIMEOUTS, ...cfg.modelTimeouts };
     const codexAuthPath = cfg.codexAuthPath ?? DEFAULT_CODEX_AUTH_PATH;
     const grokSessionPath = cfg.grokSessionPath ?? DEFAULT_SESSION_PATH;
 
@@ -1015,14 +1019,8 @@ const plugin = {
       modelCommands[modelId] = `/${entry.name}`;
     }
 
-    // ── Default model fallback chain ──────────────────────────────────────────
-    // When a primary model fails (timeout, error), retry once with a lighter variant.
-    const modelFallbacks: Record<string, string> = {
-      "cli-gemini/gemini-2.5-pro":       "cli-gemini/gemini-2.5-flash",
-      "cli-gemini/gemini-3-pro-preview":  "cli-gemini/gemini-3-flash-preview",
-      "cli-claude/claude-opus-4-6":       "cli-claude/claude-sonnet-4-6",
-      "cli-claude/claude-sonnet-4-6":     "cli-claude/claude-haiku-4-5",
-    };
+    // ── Default model fallback chain (from config.ts) ──────────────────────────
+    const modelFallbacks = { ...DEFAULT_MODEL_FALLBACKS };
 
     // ── Migrate legacy per-provider cookie expiry files to consolidated store ─
     const migration = migrateLegacyFiles();

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-cli-bridge-elvatis",
   "slug": "openclaw-cli-bridge-elvatis",
   "name": "OpenClaw CLI Bridge",
-  "version": "2.5.0",
+  "version": "2.6.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.5.0",
+  "version": "2.6.0",
   "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

@@ -28,11 +28,13 @@ import {
   buildToolPromptBlock,
   parseToolCallResponse,
 } from "./tool-protocol.js";
-
-/** Max messages to include in the prompt sent to the CLI. */
-const MAX_MESSAGES = 20;
-/** Max characters per message content before truncation. */
-const MAX_MSG_CHARS = 4000;
+import {
+  MAX_MESSAGES,
+  MAX_MSG_CHARS,
+  DEFAULT_CLI_TIMEOUT_MS,
+  TIMEOUT_GRACE_MS,
+  MEDIA_TMP_DIR,
+} from "./config.js";
 
 // ──────────────────────────────────────────────────────────────────────────────
 // Message formatting
@@ -152,7 +154,7 @@ export interface MediaFile {
   mimeType: string;
 }
 
-const MEDIA_TMP_DIR = join(tmpdir(), "cli-bridge-media");
+// MEDIA_TMP_DIR imported from config.ts
 
 /**
  * Extract non-text content parts (images, audio) from messages.
@@ -293,11 +295,7 @@ export interface RunCliOptions {
   log?: (msg: string) => void;
 }
 
-/**
- * Grace period between SIGTERM and SIGKILL when a timeout fires.
- * Gives the CLI process 5 seconds to flush output and exit cleanly.
- */
-const TIMEOUT_GRACE_MS = 5_000;
+// TIMEOUT_GRACE_MS imported from config.ts
 
 /**
  * Spawn a CLI and deliver the prompt via stdin.
@@ -315,7 +313,7 @@ export function runCli(
   cmd: string,
   args: string[],
   prompt: string,
-  timeoutMs = 120_000,
+  timeoutMs = DEFAULT_CLI_TIMEOUT_MS,
   opts: RunCliOptions = {}
 ): Promise<CliRunResult> {
   const cwd = opts.cwd ?? homedir();
@@ -381,7 +379,7 @@ export function runCli(
 export function runCliWithArg(
   cmd: string,
   args: string[],
-  timeoutMs = 120_000,
+  timeoutMs = DEFAULT_CLI_TIMEOUT_MS,
   opts: RunCliOptions = {}
 ): Promise<CliRunResult> {
   const cwd = opts.cwd ?? homedir();

package/src/config.ts

@@ -0,0 +1,217 @@
+/**
+ * config.ts
+ *
+ * Central configuration defaults for the CLI bridge plugin.
+ * All magic numbers, timeouts, paths, and constants live here.
+ * Import from this module instead of scattering literals across the codebase.
+ *
+ * Values can be overridden at runtime via openclaw.plugin.json configSchema
+ * or via the CliPluginConfig interface in index.ts.
+ */
+
+import { homedir, tmpdir } from "node:os";
+import { join } from "node:path";
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Proxy server
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Default port for the local OpenAI-compatible proxy server. */
+export const DEFAULT_PROXY_PORT = 31337;
+
+/** Default API key between OpenClaw vllm provider and the proxy. */
+export const DEFAULT_PROXY_API_KEY = "cli-bridge";
+
+/** Default base timeout for CLI subprocess responses (ms). Scales dynamically. */
+export const DEFAULT_PROXY_TIMEOUT_MS = 300_000; // 5 min
+
+/** Maximum effective timeout after dynamic scaling (ms). */
+export const MAX_EFFECTIVE_TIMEOUT_MS = 600_000; // 10 min
+
+/** Extra timeout per message beyond 10 in the conversation (ms). */
+export const TIMEOUT_PER_EXTRA_MSG_MS = 2_000;
+
+/** Extra timeout per tool definition in the request (ms). */
+export const TIMEOUT_PER_TOOL_MS = 5_000;
+
+/** SSE keepalive interval — prevents OpenClaw read-timeout during long CLI runs (ms). */
+export const SSE_KEEPALIVE_INTERVAL_MS = 15_000;
+
+// ──────────────────────────────────────────────────────────────────────────────
+// CLI subprocess
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Default timeout for individual CLI subprocess invocations (ms). */
+export const DEFAULT_CLI_TIMEOUT_MS = 120_000; // 2 min
+
+/** Grace period between SIGTERM and SIGKILL when a timeout fires (ms). */
+export const TIMEOUT_GRACE_MS = 5_000;
+
+/** Max messages to include in the prompt sent to CLI subprocesses. */
+export const MAX_MESSAGES = 20;
+
+/** Max characters per message content before truncation. */
+export const MAX_MSG_CHARS = 4_000;
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Session manager (long-running sessions)
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Auto-cleanup threshold: sessions older than this are killed and removed (ms). */
+export const SESSION_TTL_MS = 30 * 60 * 1_000; // 30 min
+
+/** Interval for the session cleanup sweep (ms). */
+export const CLEANUP_INTERVAL_MS = 5 * 60 * 1_000; // 5 min
+
+/** Grace period between SIGTERM and SIGKILL for session termination (ms). */
+export const SESSION_KILL_GRACE_MS = 5_000;
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Provider sessions (persistent session registry)
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Default TTL for provider sessions before they're considered stale (ms). */
+export const PROVIDER_SESSION_TTL_MS = 2 * 60 * 60 * 1_000; // 2 hours
+
+/** Sweep interval for stale provider sessions (ms). */
+export const PROVIDER_SESSION_SWEEP_MS = 10 * 60 * 1_000; // 10 min
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Per-model timeout defaults (ms)
+// ──────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Default per-model timeout overrides.
+ * These are applied as the base timeout before dynamic scaling.
+ * Override via `modelTimeouts` in plugin config.
+ *
+ * Strategy:
+ *   - Heavy/agentic models (Opus, GPT-5.4): 5 min — need time for tool use
+ *   - Standard interactive (Sonnet, Pro, GPT-5.3): 3 min
+ *   - Fast/lightweight (Haiku, Flash, Mini): 90s
+ */
+export const DEFAULT_MODEL_TIMEOUTS: Record<string, number> = {
+  "cli-claude/claude-opus-4-6":        300_000,  // 5 min
+  "cli-claude/claude-sonnet-4-6":      180_000,  // 3 min
+  "cli-claude/claude-haiku-4-5":        90_000,  // 90s
+  "cli-gemini/gemini-2.5-pro":         180_000,
+  "cli-gemini/gemini-2.5-flash":        90_000,
+  "cli-gemini/gemini-3-pro-preview":   180_000,
+  "cli-gemini/gemini-3-flash-preview":  90_000,
+  "openai-codex/gpt-5.4":             300_000,
+  "openai-codex/gpt-5.3-codex":       180_000,
+  "openai-codex/gpt-5.1-codex-mini":   90_000,
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Model fallback chain
+// ──────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Default fallback chain: when a primary model fails (timeout, error),
+ * retry once with the lighter variant.
+ */
+export const DEFAULT_MODEL_FALLBACKS: Record<string, string> = {
+  "cli-gemini/gemini-2.5-pro":        "cli-gemini/gemini-2.5-flash",
+  "cli-gemini/gemini-3-pro-preview":  "cli-gemini/gemini-3-flash-preview",
+  "cli-claude/claude-opus-4-6":       "cli-claude/claude-sonnet-4-6",
+  "cli-claude/claude-sonnet-4-6":     "cli-claude/claude-haiku-4-5",
+};
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Paths
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Base directory for all CLI bridge state files. */
+export const OPENCLAW_DIR = join(homedir(), ".openclaw");
+
+/** State file — persists the model active before the last /cli-* switch. */
+export const STATE_FILE = join(OPENCLAW_DIR, "cli-bridge-state.json");
+
+/** Pending switch file — stores a staged model switch not yet applied. */
+export const PENDING_FILE = join(OPENCLAW_DIR, "cli-bridge-pending.json");
+
+/** Provider session registry file. */
+export const PROVIDER_SESSIONS_FILE = join(OPENCLAW_DIR, "cli-bridge", "sessions.json");
+
+/** Temporary directory for multimodal media files. */
+export const MEDIA_TMP_DIR = join(tmpdir(), "cli-bridge-media");
+
+/** Browser profile directories. */
+export const PROFILE_DIRS = {
+  grok:    join(OPENCLAW_DIR, "grok-profile"),
+  gemini:  join(OPENCLAW_DIR, "gemini-profile"),
+  claude:  join(OPENCLAW_DIR, "claude-profile"),
+  chatgpt: join(OPENCLAW_DIR, "chatgpt-profile"),
+} as const;
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Browser automation
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Navigation timeout for Playwright page.goto (ms). */
+export const BROWSER_NAV_TIMEOUT_MS = 15_000;
+
+/** Delay after page load before interacting (ms). */
+export const BROWSER_PAGE_LOAD_DELAY_MS = 2_000;
+
+/** Delay after typing into input fields (ms). */
+export const BROWSER_INPUT_DELAY_MS = 300;
+
+/** Default timeout for browser-based completions (ms). */
+export const BROWSER_COMPLETION_TIMEOUT_MS = 120_000;
+
+/** Consecutive stable reads to confirm a streaming response is done. */
+export const BROWSER_STABLE_CHECKS = 3;
+
+/** Interval between stability checks (ms). */
+export const BROWSER_STABLE_INTERVAL_MS = 500;
+
+/** Gemini uses a longer stability interval due to slower streaming. */
+export const GEMINI_STABLE_INTERVAL_MS = 600;
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Claude auth
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Refresh OAuth token this many ms before expiry. */
+export const CLAUDE_REFRESH_BEFORE_EXPIRY_MS = 30 * 60 * 1_000; // 30 min
+
+/** Sync window for token refresh (ms). */
+export const CLAUDE_REFRESH_SYNC_WINDOW_MS = 5 * 60 * 1_000; // 5 min
+
+/** Max wait for a single token refresh attempt (ms). */
+export const CLAUDE_REFRESH_TIMEOUT_MS = 30_000;
+
+/** Polling interval for proactive token refresh (ms). */
+export const CLAUDE_REFRESH_POLL_INTERVAL_MS = 10 * 60 * 1_000; // 10 min
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Workdir isolation
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Prefix for temporary workdir directories. */
+export const WORKDIR_PREFIX = "cli-bridge-";
+
+/** Max age for orphaned workdirs before they are swept (ms). */
+export const WORKDIR_ORPHAN_MAX_AGE_MS = 60 * 60 * 1_000; // 1 hour
+
+// ──────────────────────────────────────────────────────────────────────────────
+// BitNet
+// ──────────────────────────────────────────────────────────────────────────────
+
+/** Default URL for the local BitNet llama-server. */
+export const DEFAULT_BITNET_SERVER_URL = "http://127.0.0.1:8082";
+
+/** Max messages to send to BitNet (4096 token context limit). */
+export const BITNET_MAX_MESSAGES = 6;
+
+/** Minimal system prompt for BitNet to conserve tokens. */
+export const BITNET_SYSTEM_PROMPT =
+  "You are Akido, a concise AI assistant. Answer briefly and directly. Current user: Emre. Timezone: Europe/Berlin.";
+
+// ──────────────────────────────────────────────────────────────────────────────
+// Default model for /cli-test
+// ──────────────────────────────────────────────────────────────────────────────
+
+export const CLI_TEST_DEFAULT_MODEL = "cli-claude/claude-sonnet-4-6";