@gleapai/kai-bridge 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gleapai/kai-bridge",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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",

package/src/daemon.mjs

@@ -20,7 +20,7 @@ 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 } from "./workspace.mjs";
+import { collectChanges, commitAndPush, copyPrimaryEnvFiles, materializeBinding, sessionSlug, worktreePath, ensureCommitExcludes } from "./workspace.mjs";
 import { ServiceRunner, detectDevConfig, previewMcpServer, readDevConfig } from "./preview.mjs";
 import { describeHarnesses, installHarness } from "./harnesses.mjs";
 import { dirname } from "node:path";
@@ -444,6 +444,12 @@ export class BridgeDaemon {
         return this.previewStart(data);
       case "bridge.preview.stop":
         return this.previewStop(data);
+      case "bridge.preview.keepalive":
+        // Dashboard heartbeat while someone is actually LOOKING at the
+        // preview — makes the idle auto-stop mean real idleness instead
+        // of a fixed TTL since boot.
+        if (this.services.has(data.sessionId)) this.armPreviewIdleTimer(data.sessionId);
+        return;
       default:
         this.log("warn", "command.unknown", { name });
     }
@@ -488,7 +494,15 @@ export class BridgeDaemon {
           const copied = copyPrimaryEnvFiles(group.primary.path, cwd);
           if (copied.length) this.log("info", "preview.env.copied", { cwd, copied });
         }
-        const config = readDevConfig(cwd) ?? detectDevConfig(cwd);
+        // Config resolution order: this worktree's own config, then the
+        // PRIMARY checkout's (a repo verified by the setup agent has its
+        // dev.yaml on an unmerged config PR — session worktrees cut from
+        // the base branch don't carry it yet), then the package.json
+        // heuristic. Closes the verified-before-config-merge window.
+        const config =
+          readDevConfig(cwd) ??
+          (cwd !== group.primary.path ? readDevConfig(group.primary.path) : null) ??
+          detectDevConfig(cwd);
         if (!config) continue;
         if (config.error) {
           await report({ status: "error", error: config.error });
@@ -594,8 +608,8 @@ export class BridgeDaemon {
   /**
    * Previews are for looking at, not for hosting: stop everything after
    * 30 idle minutes (Lukas 08-26 — was 4h). Re-armed on every (re)start,
-   * cleared on manual stop and session close. Turn-path services are
-   * unaffected until a preview start adopts the same runner.
+   * cleared on manual stop and session close. Turns never boot services
+   * themselves — they only reuse this runner while it is alive.
    */
   armPreviewIdleTimer(sessionId) {
     this.previewIdleTimers ??= new Map();
@@ -628,7 +642,7 @@ export class BridgeDaemon {
     await this.api.sessionPreview(sessionId, { status: "stopped" }).catch((err) => this.log("warn", "preview.report.failed", { error: err.message }));
   }
 
-  /** One ServiceRunner per session, shared by the turn path and on-demand preview. */
+  /** One ServiceRunner per session — created only by the on-demand preview; turns reuse it. */
   runnerFor(sessionId, onStatus) {
     let runner = this.services.get(sessionId);
     if (!runner) {
@@ -678,11 +692,12 @@ export class BridgeDaemon {
       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")}` : "";
-      // Preview tier A: start the repos' dev services (from .gleap/dev.yaml)
-      // once per session, tell the agent where they run, and hand it the
-      // Playwright MCP so it can verify in a real browser.
-      const previewNote = await this.startServices(turn, bound, batcher);
-      const mcpServers = previewNote ? [...(turn.mcpServers || []), previewMcpServer(RUNNER_DIR)] : turn.mcpServers;
+      // 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
+      // hand it the Playwright MCP so it can verify in a real browser.
+      const { note: previewNote, hasLivePreview } = await this.describeLivePreview(turn, bound, batcher);
+      const mcpServers = hasLivePreview ? [...(turn.mcpServers || []), previewMcpServer(RUNNER_DIR)] : turn.mcpServers;
       const res = await runTurn({
         turn: { ...turn, task: `${turn.task}${repoNote}${previewNote}`, mcpServers },
         profile,
@@ -695,12 +710,17 @@ export class BridgeDaemon {
       await batcher.flush();
       const completed = !ctrl.signal.aborted && res.code === 0 && !res.rateLimited;
       const changes = 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
         // Server can open the PR; plan turns and local mode never push.
         const shouldPush = completed && b.mode === "worktree" && !turn.planMode && diff.files.length > 0;
         const push = shouldPush
-          ? commitAndPush(b.cwd, { branch: b.branch, message: `${turn.title || "Kai Code changes"}\n\nSession ${turn.sessionId} · run on ${this.config.device?.name || "a paired device"}` })
+          ? commitAndPush(b.cwd, {
+              branch: b.branch,
+              allowDevConfig: !!turn.allowDevConfig,
+              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 };
       });
@@ -738,17 +758,22 @@ export class BridgeDaemon {
     }
   }
 
-  /** Start/adopt dev services for the turn's repos; returns the prompt note ("" when no dev.yaml). */
-  async startServices(turn, bound, batcher) {
+  /**
+   * Turn-path preview policy: previews start MANUALLY only. A turn never
+   * boots dev servers — that surprised people ("Kai always starts a
+   * preview") and tied every turn to a heavyweight app boot. When a
+   * dashboard-started preview is already RUNNING for this session, reuse
+   * it: describe the live services to the agent (plus browser tools via
+   * the caller). Returns { note, hasLivePreview }.
+   */
+  async describeLivePreview(turn, bound, batcher) {
     const notes = [];
     const previews = [];
+    // Only a runner created by the dashboard's "Start preview" counts —
+    // the map is cleared on manual stop, idle stop, and session close.
+    const live = this.services.get(turn.sessionId);
     for (const b of bound) {
-      // Turn path starts ONLY committed .gleap/dev.yaml services — the
-      // package.json heuristic is reserved for the user-initiated
-      // "Start preview" (auto-booting every node repo's dev server on
-      // every turn would be a heavyweight surprise).
       const committed = readDevConfig(b.cwd);
-      const config = committed;
       if (!committed && !turn.planMode) {
         // Nudge the agent to make the setup durable once it has learned it.
         notes.push(
@@ -757,32 +782,31 @@ export class BridgeDaemon {
             `so Gleap can run live previews for this repo in future sessions.`,
         );
       }
-      if (!config) continue;
-      if (config.error) {
-        batcher.push({ type: "text", message: `⚠️ ${config.error}` });
+      if (!committed || !live) continue;
+      if (committed.error) {
+        batcher.push({ type: "text", message: `⚠️ ${committed.error}` });
         continue;
       }
-      const runner = this.runnerFor(turn.sessionId, (message) =>
-        batcher.push({ type: "tool_status", message, toolName: "DevServer", toolSummary: message, toolStatus: "completed", toolPartId: `svc-${Date.now()}` }),
-      );
       try {
-        const started = await runner.start(b.cwd, config, { mode: b.mode });
-        notes.push(runner.describeForAgent(started));
+        // start() on the live runner reuses already-running processes and
+        // their ports — for a booted preview this only describes it.
+        const started = await live.start(b.cwd, committed, { mode: b.mode });
+        notes.push(live.describeForAgent(started));
         if (started.preview) previews.push({ repo: b.key, ...started.preview });
       } catch (err) {
-        this.log("error", "services.start.failed", { repo: b.key, error: err.message });
-        batcher.push({ type: "text", message: `⚠️ Could not start dev services for ${b.key}: ${err.message}` });
+        this.log("error", "preview.reuse.failed", { repo: b.key, error: err.message });
+        batcher.push({ type: "text", message: `⚠️ Could not reuse the running preview for ${b.key}: ${err.message}` });
       }
     }
     if (previews.length > 0) {
-      // Session-keyed report (new servers) with the turn-keyed route as
-      // fallback for servers that predate it.
+      // Refresh the session-keyed report (URLs may have changed) with the
+      // turn-keyed route as fallback for servers that predate it.
       await this.api
         .sessionPreview(turn.sessionId, { status: "running", previews })
         .catch(() => this.api.turnPreview(turn.turnId, { previews }))
         .catch((err) => this.log("warn", "preview.report.failed", { error: err.message }));
     }
-    return notes.join("");
+    return { note: notes.join(""), hasLivePreview: previews.length > 0 };
   }
 
   async cloneRepo({ commandId, remote, name }) {

package/src/preview.mjs

@@ -24,7 +24,7 @@ import { spawn } from "node:child_process";
 import { createServer, connect } from "node:net";
 import { existsSync, mkdirSync, openSync, readFileSync } from "node:fs";
 import { networkInterfaces } from "node:os";
-import { join, resolve } from "node:path";
+import { join, resolve, basename } from "node:path";
 import YAML from "yaml";
 
 export const DEV_CONFIG_PATHS = [".gleap/dev.yaml", ".gleap/dev.yml"];
@@ -45,7 +45,14 @@ export function readDevConfig(repoRoot) {
 
 export function normalizeDevConfig(raw) {
   const services = {};
-  for (const [name, s] of Object.entries(raw?.services || {})) {
+  // Accept both shapes: `services: {api: {...}}` and the list form
+  // `services: [- name: api ...]` people naturally write in YAML —
+  // Object.entries on an array yields index keys, which used to name
+  // services "0", "1".
+  const rawServices = Array.isArray(raw?.services)
+    ? Object.fromEntries(raw.services.filter((s) => s && typeof s === "object").map((s, i) => [String(s.name || i), s]))
+    : raw?.services || {};
+  for (const [name, s] of Object.entries(rawServices)) {
     if (!s || typeof s !== "object" || !s.run) continue;
     services[name] = {
       name,
@@ -94,13 +101,21 @@ export function detectDevConfig(repoRoot) {
     : existsSync(join(repoRoot, "yarn.lock"))
       ? "yarn"
       : "npm";
+  // Name the service after the package (else the repo folder):
+  // heuristic configs from two repos in one session used to both be
+  // called "app" and collide in the shared per-session port map — the
+  // second repo silently reused the first one's port and never booted.
+  // package.json name beats the folder because WORKTREE folders are
+  // named after the session slug — identical for every repo in it.
+  const slug = (v) => String(v || "").toLowerCase().replace(/^@[^/]+\//, "").replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
+  const name = slug(pkg.name) || slug(basename(repoRoot)) || "app";
   return normalizeDevConfig({
     services: {
       // No declared port: ServiceRunner assigns a free one and exports
       // PORT; readiness falls back to the port-listen probe.
-      app: { cwd: ".", run: `${pm} run ${script}`, readyTimeoutMs: 90_000 },
+      [name]: { cwd: ".", run: `${pm} run ${script}`, readyTimeoutMs: 90_000 },
     },
-    preview: "app",
+    preview: name,
   });
 }
 
@@ -193,8 +208,28 @@ export class ServiceRunner {
   async start(repoRoot, config, { mode = "worktree" } = {}) {
     mkdirSync(this.logDir, { recursive: true });
     const out = [];
+    // Same service name from a DIFFERENT repo is a collision, not a
+    // reuse: silently sharing the port map entry made the second repo
+    // ride the first one's port and never boot. Uniquify with the repo
+    // folder as prefix and say so — committed configs should pick
+    // collision-safe names, but the runtime must not break when they
+    // don't.
+    this.serviceRoots ??= new Map();
+    const services = Object.values(config.services).map((svc) => {
+      const owner = this.serviceRoots.get(svc.name);
+      if (owner && owner !== repoRoot) {
+        const unique = `${basename(repoRoot).toLowerCase().replace(/[^a-z0-9_-]+/g, "-")}-${svc.name}`;
+        this.onStatus(`Service name "${svc.name}" is already used by another repo in this session — running this one as "${unique}".`);
+        svc = { ...svc, name: unique };
+      }
+      this.serviceRoots.set(svc.name, repoRoot);
+      return svc;
+    });
+    const previewName = config.preview && !services.some((s) => s.name === config.preview)
+      ? services.find((s) => s.name.endsWith(`-${config.preview}`))?.name ?? config.preview
+      : config.preview;
     // Assign ports first so cross-references resolve.
-    for (const svc of Object.values(config.services)) {
+    for (const svc of services) {
       if (this.ports[svc.name]) continue;
       const declared = svc.port;
       if (mode === "local" && declared && (await isPortListening(declared))) {
@@ -206,7 +241,7 @@ export class ServiceRunner {
         this.ports[svc.name] = await getFreePort();
       }
     }
-    for (const svc of Object.values(config.services)) {
+    for (const svc of services) {
       const port = this.ports[svc.name];
       const logPath = join(this.logDir, `${svc.name}.log`);
       if (this.adopted.has(svc.name)) {
@@ -254,7 +289,7 @@ export class ServiceRunner {
       this.onStatus(ready ? `${svc.name} ready on http://localhost:${port}` : `${svc.name} did not become ready within ${Math.round(svc.readyTimeoutMs / 1000)}s — see ${logPath}`);
       out.push({ name: svc.name, port, url: `http://localhost:${port}`, logPath, adopted: false, ready });
     }
-    const previewSvc = config.preview ? out.find((s) => s.name === config.preview) : null;
+    const previewSvc = previewName ? out.find((s) => s.name === previewName) : null;
     const lan = lanAddress();
     return {
       services: out,

package/src/workspace.mjs

@@ -145,19 +145,47 @@ export function removeWorktree({ kaiHome, repo, sessionId, title }) {
  * A failed push is NOT fatal: the dashboard still shows the diff, and the
  * result carries the reason (no credentials, protected branch, …).
  */
-export function commitAndPush(cwd, { branch, message, allowEmpty = false } = {}) {
+/**
+ * Git-level guard rails for what a turn may publish. Agent state dirs
+ * never enter commits; the preview config (.gleap/dev.yaml) stays out
+ * of FEATURE commits too — agents write it to self-verify with a dev
+ * server mid-turn, and it kept riding along into unrelated PRs (08-26
+ * release E2E). Preview-setup turns pass allowDevConfig: there the
+ * file IS the deliverable. On-demand previews read it uncommitted, so
+ * excluding it breaks nothing. Run before BOTH collectChanges and the
+ * commit so the reported diff matches what actually ships.
+ */
+export function ensureCommitExcludes(cwd, { allowDevConfig = false } = {}) {
+  const always = [".codex-kai/", ".kai-acp-state/", ".kai-carry.patch"];
+  const devConfig = [".gleap/dev.yaml", ".gleap/dev.yml"];
+  try {
+    // Worktrees have a FILE at .git — resolve the real exclude path via
+    // git itself. (The old join(cwd, ".git", …) silently failed in
+    // worktrees, which is how dev.yaml slipped into feature commits in
+    // the first place.) info/exclude is SHARED across a repo's
+    // worktrees, so the dev-config lines are managed both ways: added
+    // for feature turns, removed again for allowDevConfig turns.
+    const excludePath = git(cwd, ["rev-parse", "--git-path", "info/exclude"]);
+    const absolute = excludePath.startsWith("/") ? excludePath : join(cwd, excludePath);
+    mkdirSync(dirname(absolute), { recursive: true });
+    const current = existsSync(absolute) ? readFileSync(absolute, "utf8") : "";
+    const kept = current
+      .split("\n")
+      .filter((line) => !devConfig.includes(line.trim()));
+    const wanted = [...always, ...(allowDevConfig ? [] : devConfig)];
+    const merged = [...kept.filter((l, i) => l.trim() !== "" || i < kept.length - 1)];
+    for (const e of wanted) if (!merged.some((l) => l.trim() === e)) merged.push(e);
+    const next = merged.join("\n").trimEnd() + "\n";
+    if (next !== current) writeFileSync(absolute, next);
+  } catch {
+    /* best-effort — a failed exclude write must never block the turn */
+  }
+}
+
+export function commitAndPush(cwd, { branch, message, allowEmpty = false, allowDevConfig = false } = {}) {
   const out = { committed: false, pushed: false, branch, commitSha: null, remote: null, error: null };
   try {
-    // Agent state dirs must never enter the commit.
-    const excludes = [".codex-kai/", ".kai-acp-state/", ".kai-carry.patch"];
-    const excludePath = join(cwd, ".git", "info", "exclude");
-    try {
-      const current = existsSync(excludePath) ? readFileSync(excludePath, "utf8") : "";
-      const missing = excludes.filter((e) => !current.includes(e));
-      if (missing.length) writeFileSync(excludePath, `${current.trimEnd()}\n${missing.join("\n")}\n`);
-    } catch {
-      /* worktree .git is a file → exclude lives in the main repo; fine */
-    }
+    ensureCommitExcludes(cwd, { allowDevConfig });
     git(cwd, ["add", "-A"]);
     const staged = git(cwd, ["diff", "--cached", "--name-only"]);
     if (staged || allowEmpty) {