@cabane/companion 0.6.50 → 0.6.51

package/dist/cli.js

@@ -5,7 +5,7 @@ import { Command, Option } from "commander";
 
 // src/control-socket.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync2, rmSync as rmSync2, mkdirSync as mkdirSync2 } from "fs";
+import { chmodSync as chmodSync2, existsSync as existsSync2, rmSync as rmSync2, mkdirSync as mkdirSync2 } from "fs";
 import { createServer, connect } from "net";
 import { join as join2 } from "path";
 
@@ -495,13 +495,18 @@ function deleteConfig() {
 
 // src/control-socket.ts
 var CONTROL_TIMEOUT_MS = 1e3;
+var MAX_UNIX_SOCKET_PATH_BYTES = 103;
 function controlSocketPath() {
   const dir2 = cabaneDir();
+  const key = createHash("sha256").update(dir2).digest("hex").slice(0, 16);
   if (process.platform === "win32") {
-    const key = createHash("sha256").update(dir2).digest("hex").slice(0, 16);
     return `\\\\.\\pipe\\cabane-companion-${key}`;
   }
-  return join2(dir2, "companion.sock");
+  const besideRuntime = join2(dir2, "companion.sock");
+  if (Buffer.byteLength(besideRuntime) <= MAX_UNIX_SOCKET_PATH_BYTES) return besideRuntime;
+  const filename = `cabane-companion-${key}.sock`;
+  const xdgPath = process.env.XDG_RUNTIME_DIR && existsSync2(process.env.XDG_RUNTIME_DIR) ? join2(process.env.XDG_RUNTIME_DIR, filename) : null;
+  return xdgPath && Buffer.byteLength(xdgPath) <= MAX_UNIX_SOCKET_PATH_BYTES ? xdgPath : join2("/tmp", filename);
 }
 async function startControlServer(handlers) {
   const path = controlSocketPath();
@@ -522,6 +527,18 @@ async function startControlServer(handlers) {
       resolve();
     });
   });
+  if (process.platform !== "win32") {
+    try {
+      chmodSync2(path, 384);
+    } catch (err) {
+      await new Promise((resolve) => server.close(() => resolve()));
+      try {
+        rmSync2(path, { force: true });
+      } catch {
+      }
+      throw err;
+    }
+  }
   server.on("error", () => {
   });
   return {
@@ -1348,7 +1365,7 @@ import { confirm as confirm2 } from "@inquirer/prompts";
 
 // src/credentials.ts
 import {
-  chmodSync as chmodSync2,
+  chmodSync as chmodSync3,
   existsSync as existsSync4,
   mkdirSync as mkdirSync4,
   readFileSync as readFileSync3,
@@ -1383,14 +1400,14 @@ function save(map) {
   const path = credentialsPath();
   mkdirSync4(dirname2(path), { recursive: true });
   try {
-    chmodSync2(cabaneDir(), 448);
+    chmodSync3(cabaneDir(), 448);
   } catch {
   }
   const tmp = `${path}.${process.pid}.tmp`;
   try {
     writeFileSync3(tmp, JSON.stringify(map, null, 2) + "\n", { mode: 384 });
     try {
-      chmodSync2(tmp, 384);
+      chmodSync3(tmp, 384);
     } catch {
     }
     renameSync2(tmp, path);
@@ -7188,7 +7205,7 @@ function resolveMcpSecrets(mcpServers, store) {
 }
 
 // src/transcript-writer.ts
-import { appendFileSync, chmodSync as chmodSync3, copyFileSync, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync6 } from "fs";
+import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync6 } from "fs";
 import { basename, dirname as dirname5, join as join13 } from "path";
 function transcriptsDir() {
   return join13(cabaneDir(), "transcripts");
@@ -7205,7 +7222,7 @@ var TranscriptWriter = class {
     try {
       mkdirSync9(dir2, { recursive: true });
       try {
-        chmodSync3(dir2, 448);
+        chmodSync4(dir2, 448);
       } catch {
       }
       pruneOld(dir2, RETAIN);
@@ -7232,10 +7249,10 @@ var TranscriptWriter = class {
     try {
       const dir2 = join13(dirname5(this.path), "anomalies");
       mkdirSync9(dir2, { recursive: true, mode: 448 });
-      chmodSync3(dir2, 448);
+      chmodSync4(dir2, 448);
       const target = join13(dir2, basename(this.path));
       copyFileSync(this.path, target);
-      chmodSync3(target, 384);
+      chmodSync4(target, 384);
       pruneOld(dir2, ANOMALY_RETAIN);
     } catch (err) {
       this.fail(err);
@@ -10120,7 +10137,8 @@ async function createCompanionRuntime(opts = {}) {
   if (!claim.acquired) {
     return { ok: false, reason: "already-running", existing: claim.existing ?? null };
   }
-  process.on("exit", () => clearRuntimeStateIfOurs(instanceId));
+  const clearRuntimeOnExit = () => clearRuntimeStateIfOurs(instanceId);
+  process.on("exit", clearRuntimeOnExit);
   const hub = new CompanionStateHub({
     // CT29: one device, one base URL — the cabane instance this device is paired
     // with. The dashboard's connection line shows it.
@@ -10155,41 +10173,60 @@ async function createCompanionRuntime(opts = {}) {
     if (!result.ok) return { ok: false, error: result.error };
     return { ok: true, message: connectedLine(runtime, verdict) };
   };
-  const control = await startControlServer({
-    status: () => hub.statusJson(),
-    connect: async (runtime, serverUrl) => {
-      const result = await connectHarness(runtime, serverUrl);
-      return result.ok ? { ok: true, message: result.message } : { ok: false, message: result.error };
-    },
-    stop: () => void supervisor.requestStop()
-  });
+  let control = null;
   let dashboard = null;
-  if (opts.dashboard) {
-    const preferredPort = opts.port ?? cfg.dashboardPort;
-    dashboard = await startDashboard({
-      supervisor,
-      hub,
-      ...preferredPort !== void 0 ? { port: preferredPort } : {}
+  try {
+    control = await startControlServer({
+      status: () => hub.statusJson(),
+      connect: async (runtime, serverUrl) => {
+        const result = await connectHarness(runtime, serverUrl);
+        return result.ok ? { ok: true, message: result.message } : { ok: false, message: result.error };
+      },
+      stop: () => void supervisor.requestStop()
+    });
+    if (opts.dashboard) {
+      const preferredPort = opts.port ?? cfg.dashboardPort;
+      dashboard = await startDashboard({
+        supervisor,
+        hub,
+        ...preferredPort !== void 0 ? { port: preferredPort } : {}
+      });
+      hub.setDashboardUrl(dashboard.url);
+    }
+    writeRuntimeState({
+      pid: process.pid,
+      socket: control.path,
+      ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
+      startedAt,
+      // SJ495: the daemon launcher sets this env on the detached child, so the
+      // marker records whether this companion is backgrounded (foreground start
+      // leaves it unset → false).
+      daemon: process.env.CABANE_COMPANION_DAEMON === "1",
+      instanceId
     });
-    hub.setDashboardUrl(dashboard.url);
+    clearCrash();
+  } catch (err) {
+    clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
+    await Promise.allSettled([
+      supervisor.shutdown(),
+      ...control ? [control.close()] : [],
+      ...dashboard ? [dashboard.close()] : []
+    ]);
+    recordCrash({
+      reason: err instanceof Error ? err.message : String(err),
+      ...errorCode(err) ? { code: errorCode(err) } : {},
+      origin: "startup",
+      at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    throw err;
   }
-  writeRuntimeState({
-    pid: process.pid,
-    socket: control.path,
-    ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
-    startedAt,
-    // SJ495: the daemon launcher sets this env on the detached child, so the
-    // marker records whether this companion is backgrounded (foreground start
-    // leaves it unset → false).
-    daemon: process.env.CABANE_COMPANION_DAEMON === "1",
-    instanceId
-  });
-  clearCrash();
   let stopped = false;
   const stop2 = async () => {
     if (stopped) return;
     stopped = true;
     clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
     try {
       await supervisor.shutdown();
       await closeSurfaces(control, dashboard);

package/dist/runtime.js

@@ -1387,17 +1387,22 @@ function resolveStaticDir() {
 
 // src/control-socket.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync3, rmSync as rmSync2, mkdirSync as mkdirSync3 } from "fs";
+import { chmodSync as chmodSync2, existsSync as existsSync3, rmSync as rmSync2, mkdirSync as mkdirSync3 } from "fs";
 import { createServer, connect } from "net";
 import { join as join5 } from "path";
 var CONTROL_TIMEOUT_MS = 1e3;
+var MAX_UNIX_SOCKET_PATH_BYTES = 103;
 function controlSocketPath() {
   const dir2 = cabaneDir();
+  const key = createHash("sha256").update(dir2).digest("hex").slice(0, 16);
   if (process.platform === "win32") {
-    const key = createHash("sha256").update(dir2).digest("hex").slice(0, 16);
     return `\\\\.\\pipe\\cabane-companion-${key}`;
   }
-  return join5(dir2, "companion.sock");
+  const besideRuntime = join5(dir2, "companion.sock");
+  if (Buffer.byteLength(besideRuntime) <= MAX_UNIX_SOCKET_PATH_BYTES) return besideRuntime;
+  const filename = `cabane-companion-${key}.sock`;
+  const xdgPath = process.env.XDG_RUNTIME_DIR && existsSync3(process.env.XDG_RUNTIME_DIR) ? join5(process.env.XDG_RUNTIME_DIR, filename) : null;
+  return xdgPath && Buffer.byteLength(xdgPath) <= MAX_UNIX_SOCKET_PATH_BYTES ? xdgPath : join5("/tmp", filename);
 }
 async function startControlServer(handlers) {
   const path = controlSocketPath();
@@ -1418,6 +1423,18 @@ async function startControlServer(handlers) {
       resolve();
     });
   });
+  if (process.platform !== "win32") {
+    try {
+      chmodSync2(path, 384);
+    } catch (err) {
+      await new Promise((resolve) => server.close(() => resolve()));
+      try {
+        rmSync2(path, { force: true });
+      } catch {
+      }
+      throw err;
+    }
+  }
   server.on("error", () => {
   });
   return {
@@ -2162,7 +2179,7 @@ function errorMessage2(status, body) {
 
 // src/credentials.ts
 import {
-  chmodSync as chmodSync2,
+  chmodSync as chmodSync3,
   existsSync as existsSync5,
   mkdirSync as mkdirSync5,
   readFileSync as readFileSync3,
@@ -2197,14 +2214,14 @@ function save(map) {
   const path = credentialsPath();
   mkdirSync5(dirname4(path), { recursive: true });
   try {
-    chmodSync2(cabaneDir(), 448);
+    chmodSync3(cabaneDir(), 448);
   } catch {
   }
   const tmp = `${path}.${process.pid}.tmp`;
   try {
     writeFileSync3(tmp, JSON.stringify(map, null, 2) + "\n", { mode: 384 });
     try {
-      chmodSync2(tmp, 384);
+      chmodSync3(tmp, 384);
     } catch {
     }
     renameSync2(tmp, path);
@@ -6687,7 +6704,7 @@ function resolveMcpSecrets(mcpServers, store) {
 }
 
 // src/transcript-writer.ts
-import { appendFileSync, chmodSync as chmodSync3, copyFileSync, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync6 } from "fs";
+import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync9, readdirSync, rmSync as rmSync6 } from "fs";
 import { basename, dirname as dirname5, join as join13 } from "path";
 function transcriptsDir() {
   return join13(cabaneDir(), "transcripts");
@@ -6704,7 +6721,7 @@ var TranscriptWriter = class {
     try {
       mkdirSync9(dir2, { recursive: true });
       try {
-        chmodSync3(dir2, 448);
+        chmodSync4(dir2, 448);
       } catch {
       }
       pruneOld(dir2, RETAIN);
@@ -6731,10 +6748,10 @@ var TranscriptWriter = class {
     try {
       const dir2 = join13(dirname5(this.path), "anomalies");
       mkdirSync9(dir2, { recursive: true, mode: 448 });
-      chmodSync3(dir2, 448);
+      chmodSync4(dir2, 448);
       const target = join13(dir2, basename(this.path));
       copyFileSync(this.path, target);
-      chmodSync3(target, 384);
+      chmodSync4(target, 384);
       pruneOld(dir2, ANOMALY_RETAIN);
     } catch (err) {
       this.fail(err);
@@ -9619,7 +9636,8 @@ async function createCompanionRuntime(opts = {}) {
   if (!claim.acquired) {
     return { ok: false, reason: "already-running", existing: claim.existing ?? null };
   }
-  process.on("exit", () => clearRuntimeStateIfOurs(instanceId));
+  const clearRuntimeOnExit = () => clearRuntimeStateIfOurs(instanceId);
+  process.on("exit", clearRuntimeOnExit);
   const hub = new CompanionStateHub({
     // CT29: one device, one base URL — the cabane instance this device is paired
     // with. The dashboard's connection line shows it.
@@ -9654,41 +9672,60 @@ async function createCompanionRuntime(opts = {}) {
     if (!result.ok) return { ok: false, error: result.error };
     return { ok: true, message: connectedLine(runtime, verdict) };
   };
-  const control = await startControlServer({
-    status: () => hub.statusJson(),
-    connect: async (runtime, serverUrl) => {
-      const result = await connectHarness(runtime, serverUrl);
-      return result.ok ? { ok: true, message: result.message } : { ok: false, message: result.error };
-    },
-    stop: () => void supervisor.requestStop()
-  });
+  let control = null;
   let dashboard = null;
-  if (opts.dashboard) {
-    const preferredPort = opts.port ?? cfg.dashboardPort;
-    dashboard = await startDashboard({
-      supervisor,
-      hub,
-      ...preferredPort !== void 0 ? { port: preferredPort } : {}
+  try {
+    control = await startControlServer({
+      status: () => hub.statusJson(),
+      connect: async (runtime, serverUrl) => {
+        const result = await connectHarness(runtime, serverUrl);
+        return result.ok ? { ok: true, message: result.message } : { ok: false, message: result.error };
+      },
+      stop: () => void supervisor.requestStop()
+    });
+    if (opts.dashboard) {
+      const preferredPort = opts.port ?? cfg.dashboardPort;
+      dashboard = await startDashboard({
+        supervisor,
+        hub,
+        ...preferredPort !== void 0 ? { port: preferredPort } : {}
+      });
+      hub.setDashboardUrl(dashboard.url);
+    }
+    writeRuntimeState({
+      pid: process.pid,
+      socket: control.path,
+      ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
+      startedAt,
+      // SJ495: the daemon launcher sets this env on the detached child, so the
+      // marker records whether this companion is backgrounded (foreground start
+      // leaves it unset → false).
+      daemon: process.env.CABANE_COMPANION_DAEMON === "1",
+      instanceId
     });
-    hub.setDashboardUrl(dashboard.url);
+    clearCrash();
+  } catch (err) {
+    clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
+    await Promise.allSettled([
+      supervisor.shutdown(),
+      ...control ? [control.close()] : [],
+      ...dashboard ? [dashboard.close()] : []
+    ]);
+    recordCrash({
+      reason: err instanceof Error ? err.message : String(err),
+      ...errorCode(err) ? { code: errorCode(err) } : {},
+      origin: "startup",
+      at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    throw err;
   }
-  writeRuntimeState({
-    pid: process.pid,
-    socket: control.path,
-    ...dashboard ? { url: dashboard.url, port: dashboard.port } : {},
-    startedAt,
-    // SJ495: the daemon launcher sets this env on the detached child, so the
-    // marker records whether this companion is backgrounded (foreground start
-    // leaves it unset → false).
-    daemon: process.env.CABANE_COMPANION_DAEMON === "1",
-    instanceId
-  });
-  clearCrash();
   let stopped = false;
   const stop = async () => {
     if (stopped) return;
     stopped = true;
     clearRuntimeStateIfOurs(instanceId);
+    process.removeListener("exit", clearRuntimeOnExit);
     try {
       await supervisor.shutdown();
       await closeSurfaces(control, dashboard);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.50",
+  "version": "0.6.51",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",