@gleapai/kai-bridge 0.2.0 → 0.2.1

package/package.json

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