@gleapai/kai-bridge 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gleapai/kai-bridge",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Run Gleap Kai Code sessions on your own machine with your own Claude Code / Codex login — and preview your real dev servers from the dashboard or the phone.",
   "type": "module",
   "license": "MIT",
@@ -23,8 +23,8 @@
     "postinstall": "node scripts/postinstall.mjs"
   },
   "dependencies": {
-    "@agentclientprotocol/claude-agent-acp": "0.70.0",
-    "@agentclientprotocol/codex-acp": "1.6.2",
+    "@agentclientprotocol/claude-agent-acp": "0.73.0",
+    "@agentclientprotocol/codex-acp": "1.8.0",
     "@agentclientprotocol/sdk": "1.4.0",
     "@playwright/mcp": "^0.0.79",
     "@sockudo/client": "^2.0.0",
@@ -32,7 +32,7 @@
     "yaml": "^2.9.0"
   },
   "overrides": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.245"
+    "@anthropic-ai/claude-agent-sdk": "0.3.258"
   },
   "exports": {
     ".": "./src/daemon.mjs",

package/src/daemon.mjs

@@ -20,9 +20,10 @@ import { KAI_HOME, defaultConfig, loadConfig, saveConfig } from "./config.mjs";
 import { runTurn } from "./executor.mjs";
 import { createManagedProfile, describeProfiles, managedConfigDir, ambientConfigDir, openLoginTerminal, probeUsageLimits } from "./profiles.mjs";
 import { defaultRoots, groupByRepo, preferredCloneRoot, scanRoots, toDeviceRepoReport } from "./repos.mjs";
-import { collectChanges, commitAndPush, copyPrimaryEnvFiles, materializeBinding, sessionSlug, worktreePath, ensureCommitExcludes } from "./workspace.mjs";
+import { collectChanges, commitAndPush, copyPrimaryEnvFiles, currentBranch, materializeBinding, sessionSlug, worktreePath, ensureCommitExcludes } from "./workspace.mjs";
 import { ServiceRunner, detectDevConfig, previewMcpServer, readDevConfig } from "./preview.mjs";
-import { describeHarnesses, installHarness } from "./harnesses.mjs";
+import { describeHarnesses, installHarness, probeHarnessAuth } from "./harnesses.mjs";
+import { probeHarnessModels } from "./models.mjs";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -33,6 +34,10 @@ const HELD_LOCKS = new Set();
 const REALTIME_RETRY_MS = 15_000;
 const HEARTBEAT_MS = 30_000;
 const USAGE_REFRESH_MS = 10 * 60_000;
+// Harness model catalogues change on releases, not by the minute.
+const MODELS_REFRESH_MS = 6 * 60 * 60_000;
+/** Harnesses that can tell us which models they offer (Cursor has no such surface). */
+const MODEL_PROBE_HARNESSES = ["claude", "codex"];
 const VERSION = "0.1.0";
 
 export function createLogger(kaiHome = KAI_HOME) {
@@ -102,6 +107,7 @@ export class BridgeDaemon {
     this.services = new Map(); // sessionId → ServiceRunner (lives across turns)
     this.repoGroups = [];
     this.usageByProfile = new Map(); // profileId → plan-usage snapshot (claude only)
+    this.modelsByHarness = new Map(); // harnessId → models the signed-in login offers (see refreshHarnessModels)
     this.stopped = false;
   }
 
@@ -120,7 +126,7 @@ export class BridgeDaemon {
       name: this.config.device?.name,
       platform: platform(),
       version: VERSION,
-      harnesses: describeHarnesses(this.kaiHome).map(({ binary, ...h }) => h),
+      harnesses: this.describeHarnessesWithModels(),
       profiles,
       repos,
       roots: [...defaultRoots(), ...(this.config.roots || [])],
@@ -179,9 +185,63 @@ export class BridgeDaemon {
     void this.refreshUsageLimits();
     this.usageTimer = setInterval(() => void this.refreshUsageLimits(), USAGE_REFRESH_MS);
     this.usageTimer.unref?.();
+    // Which models the local Claude Code / Codex offer — same rules as
+    // the usage probe (spawns the CLI, so off hello's path, never mid-turn).
+    void this.refreshHarnessModels();
+    this.modelsTimer = setInterval(() => void this.refreshHarnessModels(), MODELS_REFRESH_MS);
+    this.modelsTimer.unref?.();
     this.log("info", "started", { device: this.config.device.id });
   }
 
+  /** Install/version state per harness, plus the models it reported (when probed). */
+  describeHarnessesWithModels() {
+    return describeHarnesses(this.kaiHome).map(({ binary, ...h }) => {
+      const models = this.modelsByHarness.get(h.id);
+      return models ? { ...h, models } : h;
+    });
+  }
+
+  /**
+   * Ask each installed harness which models its signed-in login offers
+   * (Claude Code: the SDK's `supportedModels`; Codex: `models_cache.json`)
+   * and, when a list changed, re-announce via hello so the dashboard's
+   * picker lists what THIS machine can actually run — including models
+   * newer than the Server's catalogue. Never while a turn is running:
+   * the Claude probe spawns the CLI under the same login. A failed probe
+   * keeps the previous list (a timeout must not blank the picker); a
+   * signed-out harness clears it.
+   */
+  async refreshHarnessModels() {
+    if (this.stopped || this.running.size > 0) return;
+    let changed = false;
+    const profiles = resolveProfiles(this.config, this.kaiHome);
+    for (const harness of MODEL_PROBE_HARNESSES) {
+      // The user's own ~/.claude / ~/.codex first, then any signed-in
+      // managed profile — the catalogue is per account, not per profile.
+      const candidates = profiles
+        .filter((p) => p.harness === harness && p.kind !== "gleap-key" && p.configDir)
+        .sort((a, b) => Number(b.kind === "ambient") - Number(a.kind === "ambient"));
+      const profile = candidates.find((p) => probeHarnessAuth(harness, p.configDir, this.kaiHome)?.state === "signed_in");
+      let models = null;
+      if (profile) {
+        try {
+          models = await probeHarnessModels(harness, profile.configDir, this.kaiHome);
+        } catch (err) {
+          this.log("warn", "models.probe.failed", { harness, profile: profile.id, error: err?.message });
+          continue;
+        }
+      }
+      const prev = this.modelsByHarness.get(harness) ?? null;
+      if (JSON.stringify(models) !== JSON.stringify(prev)) changed = true;
+      if (models) this.modelsByHarness.set(harness, models);
+      else this.modelsByHarness.delete(harness);
+    }
+    if (changed && !this.stopped) {
+      await this.hello().catch((err) => this.log("warn", "models.hello.failed", { error: err?.message }));
+      this.log("info", "models.refreshed", Object.fromEntries([...this.modelsByHarness].map(([k, v]) => [k, v.length])));
+    }
+  }
+
   /**
    * Probe each claude profile's plan-usage windows and, when anything
    * changed, push the fresh profile list via hello (idempotent $set on
@@ -216,6 +276,7 @@ export class BridgeDaemon {
     this.stopped = true;
     clearInterval(this.heartbeat);
     clearInterval(this.usageTimer);
+    clearInterval(this.modelsTimer);
     if (this.realtimeRetry) clearTimeout(this.realtimeRetry);
     for (const ctrl of this.running.values()) ctrl.abort();
     for (const runner of this.services.values()) runner.stopAll();
@@ -426,6 +487,9 @@ export class BridgeDaemon {
         return;
       case "bridge.rescan":
         await this.scanRepos();
+        // A rescan is the user's "look again" — refresh the model lists too
+        // (hello runs again by itself when they changed).
+        void this.refreshHarnessModels();
         return this.hello();
       case "bridge.repo.clone":
         return this.cloneRepo(data);
@@ -674,6 +738,53 @@ export class BridgeDaemon {
     return bound;
   }
 
+  /**
+   * The agent's repo brief: which checkouts are part of the session (only
+   * those get committed, pushed and turned into PRs), and the recipe for
+   * bringing another repo on this device into the session. Ticket #146130:
+   * the session was scoped to Desktop, the fix belonged in JavaScript-SDK,
+   * and the agent's work there was stranded because nothing told it how a
+   * repo joins a session.
+   */
+  repoBrief(turn, bound) {
+    const slug = sessionSlug(turn.sessionId, turn.title);
+    const lines = ["", "", "Repositories for this task (changes here are committed, pushed and opened as pull requests when the turn ends — you cannot commit or push yourself):"];
+    for (const b of bound) lines.push(`- ${b.key}: ${b.cwd}`);
+    const others = this.repoGroups.filter((g) => !bound.some((b) => b.key === g.key));
+    if (others.length) {
+      lines.push(
+        "",
+        "If the fix belongs in a repository that is NOT listed above, do not edit its primary checkout. Create the session worktree for it with the command below and work there — it is picked up like the repositories above (branch kai/" + slug + ", pushed at turn end, PR opened by Gleap):",
+      );
+      for (const g of others.slice(0, 40)) {
+        const base = g.primary.defaultBranch || "main";
+        lines.push(`- ${g.key}: git -C ${g.primary.path} fetch origin ${base} --quiet && git -C ${g.primary.path} worktree add -b kai/${slug} ${worktreePath(this.kaiHome, g.name, slug)} origin/${base}`);
+      }
+      if (others.length > 40) lines.push(`- (${others.length - 40} more repositories on this device — same recipe, path ~/.kai/worktrees/<repo>/${slug})`);
+    }
+    return lines.join("\n");
+  }
+
+  /**
+   * Session worktrees the agent created for repos outside the turn's
+   * bindings (via the recipe in `repoBrief`). They are bound like the
+   * declared repos so their changes are committed, pushed and reported.
+   */
+  adoptSessionWorktrees(turn, bound) {
+    const slug = sessionSlug(turn.sessionId, turn.title);
+    const adopted = [];
+    for (const g of this.repoGroups) {
+      if (bound.some((b) => b.key === g.key)) continue;
+      const cwd = worktreePath(this.kaiHome, g.name, slug);
+      if (!existsSync(cwd)) continue;
+      const branch = currentBranch(cwd);
+      if (!branch || branch === "HEAD") continue;
+      adopted.push({ key: g.key, cwd, mode: "worktree", branch, base: g.primary.defaultBranch || "main", adopted: true });
+      this.log("info", "worktree.adopted", { turnId: turn.turnId, repo: g.key, cwd, branch });
+    }
+    return adopted;
+  }
+
   async startTurn(turn) {
     const { turnId } = turn;
     if (this.running.has(turnId)) return;
@@ -691,7 +802,7 @@ export class BridgeDaemon {
       // local paths — the prompt lists them.
       const workDir = bound[0]?.cwd;
       if (!workDir) throw new Error("Turn has no repositories.");
-      const repoNote = bound.length > 1 ? `\n\nRepositories for this task:\n${bound.map((b) => `- ${b.key}: ${b.cwd}`).join("\n")}` : "";
+      const repoNote = this.repoBrief(turn, bound);
       // Previews are manual-only (dashboard "Start preview") — a turn
       // never boots dev servers on its own. When the user already has a
       // preview running for this session, describe it to the agent and
@@ -709,7 +820,7 @@ export class BridgeDaemon {
       });
       await batcher.flush();
       const completed = !ctrl.signal.aborted && res.code === 0 && !res.rateLimited;
-      const changes = bound.map((b) => {
+      const changes = [...bound, ...this.adoptSessionWorktrees(turn, bound)].map((b) => {
         ensureCommitExcludes(b.cwd, { allowDevConfig: !!turn.allowDevConfig });
         const diff = collectChanges(b.cwd);
         // Build turns in worktree mode publish the session branch so the
@@ -722,7 +833,9 @@ export class BridgeDaemon {
               message: `${turn.title || "Kai Code changes"}\n\nSession ${turn.sessionId} · run on ${this.config.device?.name || "a paired device"}`,
             })
           : null;
-        return { key: b.key, mode: b.mode, branch: b.branch, base: b.base, ...diff, push };
+        // `cwd` travels with the change so the dashboard can point at
+        // work that stayed on this machine (files but no push).
+        return { key: b.key, mode: b.mode, branch: b.branch, base: b.base, cwd: b.cwd, adopted: b.adopted || undefined, ...diff, push };
       });
       // Built OUTSIDE the report call: if posting the result throws, the
       // catch below must not turn a finished turn into a failed one. The
@@ -894,7 +1007,12 @@ export class BridgeDaemon {
     if (!child) throw new Error(`Could not open a terminal for ${profile.harness} login on this device.`);
     child.unref?.();
     if (commandId) await this.api.commandAck(commandId, { ok: true, opened: "terminal" });
-    const poll = setInterval(() => this.hello().catch(() => {}), 15_000);
+    const poll = setInterval(() => {
+      this.hello().catch(() => {});
+      // First sign-in for this harness: learn its models as soon as the
+      // login lands (later refreshes ride the slow timer).
+      if (!this.modelsByHarness.has(profile.harness)) void this.refreshHarnessModels();
+    }, 15_000);
     poll.unref?.();
     setTimeout(() => clearInterval(poll), 10 * 60_000).unref?.();
   }

package/src/models.mjs

@@ -0,0 +1,186 @@
+// Harness model discovery: which models THIS device's harness logins can
+// run, reported to the Server on `hello` (per harness, next to
+// install/version state) so the dashboard's model picker lists what the
+// local Claude Code / Codex actually offers — not only Gleap's static
+// catalogue. A model the catalogue doesn't know yet (a release newer
+// than the Server's registry) becomes selectable on the device the day
+// the harness ships it.
+//
+//   claude — the Agent SDK's `supportedModels()` control request: the
+//            same list the CLI's own /model picker shows for this login
+//            (subscription tier, `availableModels` allowlist, gateway
+//            settings all applied by the CLI itself). Spawns the CLI
+//            (~2s), so never on hello's path — see the daemon's refresh.
+//   codex  — `<CODEX_HOME>/models_cache.json`, the model catalogue the
+//            Codex CLI fetches for the signed-in ChatGPT account. No
+//            spawn, plain file read.
+//   cursor — no catalogue surface; the dashboard keeps its static list.
+//
+// Ids are namespaced exactly like the Server's registry (`anthropic/…`,
+// `openai/…`) so the harness derivation, the BYO gate and the runner's
+// engine-slug derivation all keep working unchanged.
+
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import { harnessBinary } from "./harnesses.mjs";
+import { ambientConfigDir } from "./profiles.mjs";
+
+const HOME = homedir();
+
+/** Harness effort vocabulary → Gleap's effort ids (`extra_high` = CLI `xhigh`). */
+const EFFORT_MAP = { low: "low", medium: "medium", high: "high", xhigh: "extra_high", max: "max" };
+
+export function mapEfforts(levels) {
+  if (!Array.isArray(levels)) return undefined;
+  const out = [];
+  for (const l of levels) {
+    const mapped = EFFORT_MAP[String(l?.effort ?? l)];
+    if (mapped && !out.includes(mapped)) out.push(mapped);
+  }
+  return out;
+}
+
+const cleanLabel = (s, fallback) => {
+  const v = String(s || "").trim();
+  return v || fallback;
+};
+
+/**
+ * Claude Code: the SDK's `ModelInfo[]` → picker rows. Aliases (`sonnet`,
+ * `opus`, `default`) collapse onto the wire id they resolve to
+ * (`resolvedModel`), so the list carries each model once under its
+ * canonical `claude-*` id. Rows the CLI can't name a `claude-*` id for
+ * (custom gateway models) are skipped — the Server's catalogue is the
+ * authority for those.
+ */
+export function claudeModelsFromSdk(infos) {
+  const out = [];
+  const seen = new Set();
+  for (const m of Array.isArray(infos) ? infos : []) {
+    const value = String(m?.value || "").trim();
+    if (!value || value === "default") continue;
+    const canonical = String(m?.resolvedModel || value).trim();
+    if (!canonical.startsWith("claude-")) continue;
+    if (seen.has(canonical)) continue;
+    seen.add(canonical);
+    const row = {
+      id: `anthropic/${canonical}`,
+      label: cleanLabel(m.displayName, canonical),
+      vendor: "Anthropic",
+    };
+    if (canonical.includes("[1m]")) row.tag = "1M";
+    if (m.supportsEffort === false) row.supportedEfforts = [];
+    else if (Array.isArray(m.supportedEffortLevels)) row.supportedEfforts = mapEfforts(m.supportedEffortLevels);
+    out.push(row);
+  }
+  return out;
+}
+
+/**
+ * Codex: `models_cache.json` → picker rows. Only rows Codex itself lists
+ * (`visibility: "list"`; hidden internal SKUs like `codex-auto-review`
+ * stay out), ordered by Codex's own `priority`.
+ */
+export function codexModelsFromCache(cache) {
+  const models = Array.isArray(cache?.models) ? cache.models : [];
+  return models
+    .filter((m) => m && typeof m.slug === "string" && m.slug && (m.visibility ?? "list") === "list")
+    .map((m, i) => ({ m, i }))
+    .sort((a, b) => (a.m.priority ?? 1e9) - (b.m.priority ?? 1e9) || a.i - b.i)
+    .map(({ m }) => {
+      const row = {
+        id: `openai/${m.slug}`,
+        label: cleanLabel(m.display_name, m.slug),
+        vendor: "OpenAI",
+      };
+      if (Number.isFinite(m.context_window) && m.context_window > 0) row.contextWindow = m.context_window;
+      const efforts = mapEfforts(m.supported_reasoning_levels);
+      if (efforts) row.supportedEfforts = efforts;
+      const def = EFFORT_MAP[String(m.default_reasoning_level || "")];
+      if (def && (!efforts || efforts.includes(def))) row.defaultEffort = def;
+      return row;
+    });
+}
+
+export function readCodexModelsCache(configDir) {
+  const file = join(configDir, "models_cache.json");
+  if (!existsSync(file)) return null;
+  try {
+    return JSON.parse(readFileSync(file, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function withTimeout(promise, ms, what) {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error(`${what} timed out after ${ms}ms`)), ms);
+  });
+  return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
+
+/**
+ * Ask the bundled Claude Code (under the profile's login) which models it
+ * offers. The query never sends a prompt: a gated async iterator keeps
+ * the CLI alive just long enough for the `supportedModels` control
+ * request, then the process is closed. Same env rules as every other
+ * probe: ambient login = leave CLAUDE_CONFIG_DIR unset (macOS keychain),
+ * managed = export the profile dir; never Gleap's API key.
+ */
+export async function probeClaudeModels(configDir, kaiHome = process.env.KAI_HOME || join(HOME, ".kai"), { timeoutMs = 45_000, sdk } = {}) {
+  const bin = harnessBinary("claude", kaiHome);
+  if (!bin) return null;
+  const { query } = sdk ?? (await import("@anthropic-ai/claude-agent-sdk"));
+  const env = { ...process.env };
+  delete env.ANTHROPIC_API_KEY;
+  if (resolve(configDir) === resolve(ambientConfigDir("claude"))) delete env.CLAUDE_CONFIG_DIR;
+  else env.CLAUDE_CONFIG_DIR = configDir;
+  let release;
+  const gate = new Promise((r) => (release = r));
+  async function* idle() {
+    await gate;
+  }
+  const q = query({
+    prompt: idle(),
+    options: {
+      pathToClaudeCodeExecutable: bin,
+      env,
+      cwd: kaiHome,
+      // No project settings, no MCP servers: this is a catalogue read,
+      // not a turn — nothing here may spawn or bill.
+      settingSources: ["user"],
+      strictMcpConfig: true,
+      mcpServers: {},
+    },
+  });
+  try {
+    const infos = await withTimeout(q.supportedModels(), timeoutMs, "claude supportedModels");
+    return claudeModelsFromSdk(infos);
+  } finally {
+    release();
+    try {
+      q.close?.();
+    } catch {
+      /* already gone */
+    }
+  }
+}
+
+export function probeCodexModels(configDir) {
+  const cache = readCodexModelsCache(configDir);
+  return cache ? codexModelsFromCache(cache) : null;
+}
+
+/**
+ * Models a harness offers under the given login dir. `null` = nothing
+ * learned (harness missing, not signed in, probe failed) — the Server
+ * then keeps its catalogue for that harness; an empty array means the
+ * harness answered with no models.
+ */
+export async function probeHarnessModels(harness, configDir, kaiHome, opts) {
+  if (harness === "claude") return probeClaudeModels(configDir, kaiHome, opts);
+  if (harness === "codex") return probeCodexModels(configDir);
+  return null;
+}

package/src/workspace.mjs

@@ -107,6 +107,15 @@ export function materializeBinding({ kaiHome, repo, binding, sessionId, title, b
   return { cwd: dir, mode, branch, base, resumed: false };
 }
 
+/** The branch checked out at `cwd` (null when it is not a git checkout). */
+export function currentBranch(cwd) {
+  try {
+    return git(cwd, ["rev-parse", "--abbrev-ref", "HEAD"]) || null;
+  } catch {
+    return null;
+  }
+}
+
 /** Diff of what the turn changed (for the dashboard's file-changes panel). */
 export function collectChanges(cwd) {
   const status = git(cwd, ["status", "--porcelain"]);