@gleapai/kai-bridge 0.2.4 → 0.2.5

package/package.json

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

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, 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, probeHarnessAuth } from "./harnesses.mjs";
 import { probeHarnessModels } from "./models.mjs";
@@ -738,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;
@@ -755,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
@@ -773,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
@@ -786,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

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"]);