@corenel/sidecar 0.4.1 → 0.4.2

package/dist/cli.js

@@ -23292,6 +23292,15 @@ async function resolveCredential(env = process.env, stateDir, now2 = Date.now) {
 }
 
 // src/controlPlane.ts
+function describeBackend(url, mirrors, cred) {
+  if (!mirrors) return { url, mirrors: false };
+  return {
+    url,
+    mirrors: true,
+    signedIn: !!cred.token,
+    ...cred.expired ? { expired: true } : {}
+  };
+}
 function makeControlPlane(deps) {
   if (!deps || !deps.baseUrl) return null;
   const log = deps.log ?? (() => void 0);
@@ -28408,10 +28417,65 @@ async function listOwnerRoots(stateDir) {
   return roots;
 }
 
+// src/crewDeployment.ts
+import { readFile } from "node:fs/promises";
+import { join as join9 } from "node:path";
+
+// ../crew/deployment.ts
+var DEPLOYMENT_FILE = "deployment.json";
+function emptyDeployment() {
+  return { agents: /* @__PURE__ */ Object.create(null) };
+}
+function deploymentKey(name, wsId) {
+  return wsId ? `workspaces/${wsId}/crew/${name}` : `crew/${name}`;
+}
+function parseDeployment(text) {
+  const out = emptyDeployment();
+  let raw;
+  try {
+    raw = JSON.parse(text);
+  } catch {
+    return out;
+  }
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return out;
+  const agents = raw.agents;
+  if (!agents || typeof agents !== "object" || Array.isArray(agents)) return out;
+  for (const [key, value] of Object.entries(agents)) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) continue;
+    const root = value.root;
+    if (typeof root === "string" && root) out.agents[key] = { root };
+  }
+  return out;
+}
+function deploymentRootFor(d2, key) {
+  if (!Object.prototype.hasOwnProperty.call(d2.agents, key)) return void 0;
+  return d2.agents[key].root;
+}
+
+// src/crewDeployment.ts
+function splitOwner(owner) {
+  if (owner === "") return void 0;
+  const parts = owner.split("/");
+  if (parts.length === 1) return { dirName: parts[0] };
+  if (parts.length === 3 && parts[1] === "ws") return { dirName: parts[0], wsId: parts[2] };
+  return void 0;
+}
+async function deployedRoot(stateDir, owner, agent) {
+  const parts = splitOwner(owner);
+  if (!parts) return void 0;
+  let text;
+  try {
+    text = await readFile(join9(hostsDirFor(stateDir, parts.dirName), DEPLOYMENT_FILE), "utf8");
+  } catch {
+    return void 0;
+  }
+  return deploymentRootFor(parseDeployment(text), deploymentKey(agent, parts.wsId));
+}
+
 // src/cert.ts
 import { promises as fs8 } from "node:fs";
 import { networkInterfaces } from "node:os";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 import selfsigned from "selfsigned";
 function lanIPv4s() {
   const out = [];
@@ -28422,9 +28486,9 @@ function lanIPv4s() {
   }
   return [...new Set(out)];
 }
-var certPath = () => join9(sidecarSubdir(), "sidecar.crt");
-var keyPath = () => join9(sidecarSubdir(), "sidecar.key");
-var sansPath = () => join9(sidecarSubdir(), "sidecar.sans.json");
+var certPath = () => join10(sidecarSubdir(), "sidecar.crt");
+var keyPath = () => join10(sidecarSubdir(), "sidecar.key");
+var sansPath = () => join10(sidecarSubdir(), "sidecar.sans.json");
 function isIp(s2) {
   return /^\d{1,3}(?:\.\d{1,3}){3}$/.test(s2) || s2.includes(":");
 }
@@ -38505,7 +38569,7 @@ var NodeRunnerService = class {
         fromWorkdir ? `crew agent not found: ${agent} (looked in ${fromWorkdir} and the owner's own crew)` : `crew agent not found: ${agent}`
       );
     }
-    const workDir = this.opts.workRootFor?.(def) ?? this.opts.roots[0];
+    const workDir = await this.opts.workRootFor?.(def, owner) ?? this.opts.roots[0];
     if (!workDir) throw new Error("daemon has no --root workspace to run an agent in");
     const workFiles = new NodeFileService(workDir);
     const deps = this.opts.deps ?? {
@@ -38617,7 +38681,7 @@ var NodeRunnerService = class {
 // src/runner/core.ts
 import { watch } from "node:fs";
 import { readdir as readdir2, stat } from "node:fs/promises";
-import { join as join10, relative as relative5, sep as sep3 } from "node:path";
+import { join as join11, relative as relative5, sep as sep3 } from "node:path";
 
 // src/runner/triggerConfig.ts
 function inputFor(trigger, fallback) {
@@ -39127,9 +39191,9 @@ function startDaemonCore(opts) {
     for (const entry of entries) {
       if (entry.isDirectory()) {
         if (isExcludedSegment(entry.name, dotDir)) continue;
-        await walkForChanges(root, join10(dir, entry.name), since);
+        await walkForChanges(root, join11(dir, entry.name), since);
       } else {
-        const abs = join10(dir, entry.name);
+        const abs = join11(dir, entry.name);
         let mtimeMs;
         try {
           mtimeMs = (await stat(abs)).mtimeMs;
@@ -39410,9 +39474,9 @@ function makeRunHub(opts = {}) {
 import { promises as fs10 } from "node:fs";
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { hostname } from "node:os";
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 function idPath(dir = sidecarSubdir()) {
-  return join11(dir, "daemon.id");
+  return join12(dir, "daemon.id");
 }
 async function loadOrCreateSidecarId(dir = sidecarSubdir()) {
   const path = idPath(dir);
@@ -39441,7 +39505,7 @@ function sidecarName(opts) {
 // src/hosts.ts
 import { promises as fs11 } from "node:fs";
 import { randomBytes as randomBytes3 } from "node:crypto";
-import { join as join12 } from "node:path";
+import { join as join13, dirname as dirname4 } from "node:path";
 var MAX_DIR = 32;
 var MAX_FIELD_LEN = 200;
 var MAX_HOSTS = 200;
@@ -39474,8 +39538,8 @@ function sanitizeDirName(raw) {
   const safe = collapsed || "host";
   return RESERVED_WINDOWS_NAMES.has(safe) ? `${safe}-host` : safe;
 }
-function hostsPath(dir) {
-  return join12(dir, "hosts.json");
+function hostsPath(stateDir) {
+  return join13(stateDir, "sidecar", "hosts.json");
 }
 function emptyManifest() {
   return /* @__PURE__ */ Object.create(null);
@@ -39514,10 +39578,11 @@ async function read(dir, fallbackLastSeen) {
   }
   return manifest;
 }
-async function write(dir, manifest) {
+async function write(stateDir, manifest) {
+  const dir = dirname4(hostsPath(stateDir));
   await fs11.mkdir(dir, { recursive: true });
-  const target = hostsPath(dir);
-  const tmp = join12(dir, `.hosts.json.tmp-${randomBytes3(8).toString("hex")}`);
+  const target = hostsPath(stateDir);
+  const tmp = join13(dir, `.hosts.json.tmp-${randomBytes3(8).toString("hex")}`);
   try {
     await fs11.writeFile(tmp, JSON.stringify(manifest, null, 2));
     await fs11.rename(tmp, target);
@@ -39670,7 +39735,7 @@ function makeHostSync(opts) {
 }
 
 // src/hostsCli.ts
-import { resolve as resolve5, join as join13 } from "node:path";
+import { resolve as resolve5 } from "node:path";
 import { promises as fs12 } from "node:fs";
 async function listHosts(manifest) {
   const m2 = await manifest.list();
@@ -39705,10 +39770,10 @@ async function forgetHost(stateDir, manifest, dirName2) {
   return { ok: true };
 }
 async function checkHostsDrift(stateDir, manifest, log) {
-  const hostsRoot2 = join13(stateDir, HOSTS_SEG);
+  const root = hostsRoot(stateDir);
   let entries;
   try {
-    entries = (await fs12.readdir(hostsRoot2, { withFileTypes: true })).filter((d2) => d2.isDirectory()).map((d2) => d2.name);
+    entries = (await fs12.readdir(root, { withFileTypes: true })).filter((d2) => d2.isDirectory()).map((d2) => d2.name);
   } catch {
     return [];
   }
@@ -41992,7 +42057,7 @@ async function main() {
   }
   const sidecarId = await loadOrCreateSidecarId(sidecarSubdir(args.stateDir));
   const friendlyName = sidecarName({ name: args.name });
-  const hosts = makeHostsManifest(sidecarSubdir(args.stateDir));
+  const hosts = makeHostsManifest(args.stateDir);
   if (args.tlsCert && !args.tlsKey || !args.tlsCert && args.tlsKey) {
     throw new Error("TLS needs both --tls-cert and --tls-key");
   }
@@ -42020,7 +42085,7 @@ async function main() {
   };
   await assertPortFree(probeAddress(args.host), args.port);
   await assertStateDirFree(sidecarSubdir(args.stateDir));
-  await checkHostsDrift(sidecarSubdir(args.stateDir), hosts, slog);
+  await checkHostsDrift(args.stateDir, hosts, slog);
   const hostSync = makeHostSync({ stateDir: args.stateDir, manifest: hosts, log: slog });
   const attendance = makeAttendanceRegistry({ log: slog });
   const runs = makeRunHub({ log: slog });
@@ -42045,8 +42110,8 @@ async function main() {
      * run. Removing a --root should not silently convert an agent into a
      * dead one; it runs where it always did, and the browser is what reports
      * the mismatch. */
-    workRootFor: (def) => {
-      const want = def.settings.workRoots?.[sidecarId];
+    workRootFor: async (def, owner) => {
+      const want = await deployedRoot(args.stateDir, owner, def.name) ?? def.settings.workRoots?.[sidecarId];
       if (want && args.roots.includes(want)) return want;
       if (want) slog(`crew: "${def.name}" asks for root "${want}", which is not approved \u2014 using ${args.roots[0]}`);
       return args.roots[0];
@@ -42168,16 +42233,21 @@ async function main() {
     ...args.stateDir ? { stateDir: args.stateDir } : {},
     log: slog
   });
+  let backendInfo;
   if (controlPlane) {
     const caps = await controlPlane.backend.probe();
     if (caps.includes("sessions")) {
       slog(`backend: ${args.endpoint} mirrors sessions (as "${friendlyName || sidecarId}")`);
       const cred = await resolveCredential(process.env, args.stateDir);
+      backendInfo = describeBackend(args.endpoint, true, cred);
       if (!cred.token) {
         slog("backend: NOT SIGNED IN \u2014 pushes will be refused until `corenel login` (or CORENEL_TOKEN)");
+      } else if (cred.expired) {
+        slog("backend: SIGN-IN EXPIRED \u2014 pushes will be refused until `corenel login`");
       }
     } else {
       slog(`backend: ${args.endpoint} holds no sessions \u2014 working local-only`);
+      backendInfo = describeBackend(args.endpoint, false, { token: null });
       controlPlane.dispose();
       controlPlane = null;
     }
@@ -42245,7 +42315,9 @@ async function main() {
           billing: acpAuth.billing,
           notes: [...acpAuth.notes]
         }
-      } : {}
+      } : {},
+      // Absent when this daemon has no backend at all — see backendInfo above.
+      ...backendInfo ? { backend: backendInfo } : {}
     },
     // The mutable root set. Present only so a client may add a working directory
     // mid-session; with no --allow-add-under its areas are empty and every add is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corenel/sidecar",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "license": "Elastic-2.0",
   "description": "Prompd sidecar — a local capability server. Run it next to Prompd (prompd.app) so the browser app can reach your machine: local LLMs (Ollama/LM Studio/vLLM) without CORS, your filesystem, and (opt-in) shell.",
@@ -36,10 +36,10 @@
     "esbuild": "^0.21.5",
     "tsx": "^4.19.2",
     "typescript": "^5.9.3",
-    "@corenel/harness": "0.4.1",
+    "@corenel/protocol": "0.4.2",
     "@corenel/tools-node": "0.2.2",
-    "@corenel/protocol": "0.4.1",
-    "@corenel/crew": "0.0.0"
+    "@corenel/crew": "0.0.0",
+    "@corenel/harness": "0.4.1"
   },
   "scripts": {
     "prebuild": "pnpm --filter @corenel/protocol build && pnpm --filter @corenel/harness build",