@cabane/companion 0.6.29 → 0.6.31

package/dist/cli.js

@@ -6475,7 +6475,7 @@ var ConnectorHealthStore = class {
 
 // src/dispatcher.ts
 import { randomUUID } from "crypto";
-import { appendFileSync as appendFileSync2, existsSync as existsSync11, mkdirSync as mkdirSync11, statSync } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync11, mkdirSync as mkdirSync11, readdirSync as readdirSync2, statSync } from "fs";
 import { join as join15 } from "path";
 
 // src/summon.ts
@@ -7371,10 +7371,19 @@ var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
 var DEFAULT_AGENT_IDLE_TIMEOUT_MS = 10 * 6e4;
 var DEFAULT_AGENT_TOTAL_TIMEOUT_MS = 6 * 60 * 6e4;
 function checkoutState(cwd) {
-  if (!cwd) return { ok: false, reason: "no checkout was resolved for this turn" };
-  if (!existsSync11(cwd)) return { ok: false, reason: `the checkout directory is gone (${cwd})` };
+  if (!cwd) return { ok: false, reason: "no working directory was resolved for this turn" };
+  if (!existsSync11(cwd)) return { ok: false, reason: `the working directory is gone (${cwd})` };
+  let entries;
+  try {
+    entries = readdirSync2(cwd);
+  } catch (error) {
+    return { ok: false, reason: `${cwd} is unreadable (${error.message})` };
+  }
+  if (entries.length === 0) {
+    return { ok: false, reason: `${cwd} is empty \u2014 a recreated shell, not a prepared directory` };
+  }
   const gitPath = join15(cwd, ".git");
-  if (!existsSync11(gitPath)) return { ok: false, reason: `${cwd} holds no git metadata` };
+  if (!existsSync11(gitPath)) return { ok: true, reason: "usable" };
   let stat;
   try {
     stat = statSync(gitPath);
@@ -8588,7 +8597,7 @@ async function enumerateOpencodeModels(serverUrl, fetchImpl = fetch) {
 import {
   existsSync as existsSync12,
   mkdirSync as mkdirSync12,
-  readdirSync as readdirSync2,
+  readdirSync as readdirSync3,
   readFileSync as readFileSync9,
   renameSync as renameSync3,
   rmSync as rmSync7,
@@ -8645,7 +8654,7 @@ var Outbox = class {
     if (!existsSync12(dir2)) return [];
     let names;
     try {
-      names = readdirSync2(dir2);
+      names = readdirSync3(dir2);
     } catch {
       return [];
     }
@@ -8680,7 +8689,7 @@ var Outbox = class {
     const dir2 = this.dir();
     if (!existsSync12(dir2)) return 0;
     try {
-      return readdirSync2(dir2).filter((n) => n.endsWith(".json")).length;
+      return readdirSync3(dir2).filter((n) => n.endsWith(".json")).length;
     } catch {
       return 0;
     }
@@ -8807,6 +8816,7 @@ var SseSubscriber = class {
       try {
         await this.connect();
         backoff = 500;
+        if (!this.aborted) await sleep3(backoff);
       } catch (err) {
         if (this.aborted) return;
         if (err instanceof ApiError && (err.status === 401 || err.status === 403)) {
@@ -8832,8 +8842,8 @@ var SseSubscriber = class {
   }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
-    const query = this.lastEventId ? "" : "?replayPending=1";
-    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
+    const query = this.opts.path ? "" : this.lastEventId ? "" : "?replayPending=1";
+    const url = this.opts.path ? `${base}${this.opts.path}` : `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
     this.controller = new AbortController();
     const headers = {
       Authorization: `Bearer ${this.opts.token}`,
@@ -8925,6 +8935,7 @@ var CompanionSupervisor = class {
   reexecFn;
   dispatcherFactory;
   deviceApi = null;
+  deviceSub = null;
   heartbeatTimer = null;
   inFlightHeartbeat = null;
   pollTimer = null;
@@ -8978,6 +8989,24 @@ var CompanionSupervisor = class {
       baseUrl: this.config.baseUrl,
       deviceToken: this.config.deviceToken
     });
+    this.deviceSub = new SseSubscriber({
+      baseUrl: this.config.baseUrl,
+      workspaceId: "device-control",
+      path: "/api/companion/events",
+      token: this.config.deviceToken,
+      log: this.log,
+      lastEventId: null,
+      onMessage: async (ev) => {
+        if (ev.event === "assignments_changed") {
+          if (this.refreshing && this.inFlightRefresh) await this.inFlightRefresh;
+          await this.refreshAssignments();
+        }
+      },
+      onAuthFailure: () => {
+        this.log.error("companion: device control stream authentication failed");
+      }
+    });
+    this.deviceSub.start();
     await this.refreshAssignments();
     this.kickHeartbeat();
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
@@ -8990,7 +9019,10 @@ var CompanionSupervisor = class {
   // at least the loops keeping the event loop alive; the SSE promises let a
   // clean teardown resolve.
   finishedPromises() {
-    return [...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : []);
+    return [
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : [])
+    ];
   }
   // ---- device-level loops ----
   kickHeartbeat() {
@@ -9674,13 +9706,15 @@ var CompanionSupervisor = class {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    this.deviceSub?.stop();
     for (const wr of this.workspaces.values()) {
       for (const a of wr.agents.values()) a.cancelDrain();
       if (wr.sub) wr.sub.stop();
     }
-    await Promise.all(
-      [...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
-    );
+    await Promise.all([
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
+    ]);
   }
   async drainForRestart(graceMs) {
     this.restartPending = true;
@@ -10033,7 +10067,7 @@ companion: deploy drain requested (${graceMs}ms grace)\u2026
 }
 
 // src/commands/status.ts
-import { readdirSync as readdirSync3 } from "fs";
+import { readdirSync as readdirSync4 } from "fs";
 async function status(deps = {}) {
   const readService = deps.service ?? serviceStatus;
   const cfg = loadConfig();
@@ -10104,7 +10138,7 @@ function transcriptsLine() {
   let count = 0;
   let newest;
   try {
-    const files = readdirSync3(dir2).filter((f) => f.endsWith(".jsonl")).sort();
+    const files = readdirSync4(dir2).filter((f) => f.endsWith(".jsonl")).sort();
     count = files.length;
     newest = files[files.length - 1];
   } catch {
@@ -10204,7 +10238,7 @@ function isAlive(kill, pid) {
 }
 
 // src/commands/transcript.ts
-import { existsSync as existsSync14, readFileSync as readFileSync11, readdirSync as readdirSync4 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync11, readdirSync as readdirSync5 } from "fs";
 import { isAbsolute, join as join18 } from "path";
 async function transcript(opts = {}) {
   const dir2 = transcriptsDir();
@@ -10330,7 +10364,7 @@ async function followTranscripts(dir2) {
 }
 function listFiles(dir2) {
   try {
-    return readdirSync4(dir2).filter((f) => f.endsWith(".jsonl")).sort().reverse();
+    return readdirSync5(dir2).filter((f) => f.endsWith(".jsonl")).sort().reverse();
   } catch {
     return [];
   }

package/dist/runtime.js

@@ -5587,7 +5587,7 @@ var ConnectorHealthStore = class {
 
 // src/dispatcher.ts
 import { randomUUID } from "crypto";
-import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync9, statSync } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync9, mkdirSync as mkdirSync9, readdirSync as readdirSync2, statSync } from "fs";
 import { join as join13 } from "path";
 
 // src/summon.ts
@@ -6483,10 +6483,19 @@ var DEFAULT_PREPARING_ROW_DELAY_MS = 1500;
 var DEFAULT_AGENT_IDLE_TIMEOUT_MS = 10 * 6e4;
 var DEFAULT_AGENT_TOTAL_TIMEOUT_MS = 6 * 60 * 6e4;
 function checkoutState(cwd) {
-  if (!cwd) return { ok: false, reason: "no checkout was resolved for this turn" };
-  if (!existsSync9(cwd)) return { ok: false, reason: `the checkout directory is gone (${cwd})` };
+  if (!cwd) return { ok: false, reason: "no working directory was resolved for this turn" };
+  if (!existsSync9(cwd)) return { ok: false, reason: `the working directory is gone (${cwd})` };
+  let entries;
+  try {
+    entries = readdirSync2(cwd);
+  } catch (error) {
+    return { ok: false, reason: `${cwd} is unreadable (${error.message})` };
+  }
+  if (entries.length === 0) {
+    return { ok: false, reason: `${cwd} is empty \u2014 a recreated shell, not a prepared directory` };
+  }
   const gitPath = join13(cwd, ".git");
-  if (!existsSync9(gitPath)) return { ok: false, reason: `${cwd} holds no git metadata` };
+  if (!existsSync9(gitPath)) return { ok: true, reason: "usable" };
   let stat;
   try {
     stat = statSync(gitPath);
@@ -7700,7 +7709,7 @@ async function enumerateOpencodeModels(serverUrl, fetchImpl = fetch) {
 import {
   existsSync as existsSync10,
   mkdirSync as mkdirSync10,
-  readdirSync as readdirSync2,
+  readdirSync as readdirSync3,
   readFileSync as readFileSync8,
   renameSync as renameSync3,
   rmSync as rmSync6,
@@ -7757,7 +7766,7 @@ var Outbox = class {
     if (!existsSync10(dir2)) return [];
     let names;
     try {
-      names = readdirSync2(dir2);
+      names = readdirSync3(dir2);
     } catch {
       return [];
     }
@@ -7792,7 +7801,7 @@ var Outbox = class {
     const dir2 = this.dir();
     if (!existsSync10(dir2)) return 0;
     try {
-      return readdirSync2(dir2).filter((n) => n.endsWith(".json")).length;
+      return readdirSync3(dir2).filter((n) => n.endsWith(".json")).length;
     } catch {
       return 0;
     }
@@ -7919,6 +7928,7 @@ var SseSubscriber = class {
       try {
         await this.connect();
         backoff = 500;
+        if (!this.aborted) await sleep2(backoff);
       } catch (err) {
         if (this.aborted) return;
         if (err instanceof ApiError && (err.status === 401 || err.status === 403)) {
@@ -7944,8 +7954,8 @@ var SseSubscriber = class {
   }
   async connect() {
     const base = this.opts.baseUrl.endsWith("/") ? this.opts.baseUrl.slice(0, -1) : this.opts.baseUrl;
-    const query = this.lastEventId ? "" : "?replayPending=1";
-    const url = `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
+    const query = this.opts.path ? "" : this.lastEventId ? "" : "?replayPending=1";
+    const url = this.opts.path ? `${base}${this.opts.path}` : `${base}/api/workspaces/${this.opts.workspaceId}/events${query}`;
     this.controller = new AbortController();
     const headers = {
       Authorization: `Bearer ${this.opts.token}`,
@@ -8037,6 +8047,7 @@ var CompanionSupervisor = class {
   reexecFn;
   dispatcherFactory;
   deviceApi = null;
+  deviceSub = null;
   heartbeatTimer = null;
   inFlightHeartbeat = null;
   pollTimer = null;
@@ -8090,6 +8101,24 @@ var CompanionSupervisor = class {
       baseUrl: this.config.baseUrl,
       deviceToken: this.config.deviceToken
     });
+    this.deviceSub = new SseSubscriber({
+      baseUrl: this.config.baseUrl,
+      workspaceId: "device-control",
+      path: "/api/companion/events",
+      token: this.config.deviceToken,
+      log: this.log,
+      lastEventId: null,
+      onMessage: async (ev) => {
+        if (ev.event === "assignments_changed") {
+          if (this.refreshing && this.inFlightRefresh) await this.inFlightRefresh;
+          await this.refreshAssignments();
+        }
+      },
+      onAuthFailure: () => {
+        this.log.error("companion: device control stream authentication failed");
+      }
+    });
+    this.deviceSub.start();
     await this.refreshAssignments();
     this.kickHeartbeat();
     this.heartbeatTimer = setInterval(() => this.kickHeartbeat(), HEARTBEAT_INTERVAL_MS);
@@ -8102,7 +8131,10 @@ var CompanionSupervisor = class {
   // at least the loops keeping the event loop alive; the SSE promises let a
   // clean teardown resolve.
   finishedPromises() {
-    return [...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : []);
+    return [
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((w) => w.sub ? [w.sub.finished] : [])
+    ];
   }
   // ---- device-level loops ----
   kickHeartbeat() {
@@ -8786,13 +8818,15 @@ var CompanionSupervisor = class {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    this.deviceSub?.stop();
     for (const wr of this.workspaces.values()) {
       for (const a of wr.agents.values()) a.cancelDrain();
       if (wr.sub) wr.sub.stop();
     }
-    await Promise.all(
-      [...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
-    );
+    await Promise.all([
+      ...this.deviceSub ? [this.deviceSub.finished] : [],
+      ...[...this.workspaces.values()].flatMap((wr) => wr.sub ? [wr.sub.finished] : [])
+    ]);
   }
   async drainForRestart(graceMs) {
     this.restartPending = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.29",
+  "version": "0.6.31",
   "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",