zooid 0.7.4 → 0.9.0

package/dist/bin.js

@@ -2,6 +2,7 @@
 import {
   ApprovalCorrelator,
   MatrixClient,
+  MediaClient,
   SpawnRegistry,
   buildAcpRegistry,
   createMatrixTransport,
@@ -15,17 +16,17 @@ import {
   renderRegistration,
   startDaemonSocketServer,
   startWorkforcePublisher
-} from "./chunk-OKGNOROJ.js";
+} from "./chunk-LOILUENL.js";
 
 // src/bin.ts
-import { resolve as resolve5 } from "path";
+import { resolve as resolve6 } from "path";
 import { cac } from "cac";
 
 // src/commands/dev.ts
 import chalk from "chalk";
 import { Listr } from "listr2";
-import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname6, resolve as resolve2 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { dirname as dirname6, join as join10, resolve as resolve3 } from "path";
 import { fileURLToPath } from "url";
 import { serve as serve2 } from "@hono/node-server";
 
@@ -189,7 +190,7 @@ MATRIX_HS_TOKEN=${tokens.hsToken}
 import { readFileSync as readFileSync2 } from "fs";
 import { mkdir, unlink } from "fs/promises";
 import { tmpdir } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { dirname as dirname2, isAbsolute, join as join3, resolve } from "path";
 import { serve } from "@hono/node-server";
 
 // ../transport-http/src/server.ts
@@ -466,18 +467,18 @@ var defaultExec = async (cmd, args) => {
 
 // src/daemon/start-daemon.ts
 function listenAsync(server) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     const check = () => {
       const addr = server.address();
-      if (addr && typeof addr === "object") resolve6(addr.port);
+      if (addr && typeof addr === "object") resolve7(addr.port);
       else setImmediate(check);
     };
     check();
   });
 }
 function closeAsync(server) {
-  return new Promise((resolve6) => {
-    server.close(() => resolve6());
+  return new Promise((resolve7) => {
+    server.close(() => resolve7());
   });
 }
 async function startDaemon(opts = {}) {
@@ -538,6 +539,11 @@ async function startDaemon(opts = {}) {
       homeserver: matrix.transport.homeserver,
       asToken: matrix.transport.as_token
     });
+    const mediaClient = new MediaClient({
+      homeserver: matrix.transport.homeserver,
+      asToken: matrix.transport.as_token
+    });
+    const isContainerRuntime = config.runtime !== "local";
     const bindings = [];
     for (const a of Object.values(config.agents)) {
       if (a.matrix?.transport !== matrix.name) continue;
@@ -548,21 +554,26 @@ async function startDaemon(opts = {}) {
         trigger: a.matrix.trigger
       };
       if (a.matrix.display_name !== void 0) binding.displayName = a.matrix.display_name;
+      const workspaceDir = isAbsolute(a.workdir) ? a.workdir : resolve(configDir, a.workdir);
+      binding.workspaceDir = workspaceDir;
+      binding.agentWorkspacePath = isContainerRuntime ? "/workspace" : workspaceDir;
       bindings.push(binding);
     }
+    const serverName = matrix.transport.user_namespace.split(":").slice(1).join(":").replace(/\\?\)?$/, "") || new URL(matrix.transport.homeserver).hostname;
+    const asUserId = `@${matrix.transport.sender_localpart}:${serverName}`;
     const transport = createMatrixTransport({
       agents: registry,
       approvals,
       client,
       bindings,
       hsToken: matrix.transport.hs_token,
-      adminUserId: opts.adminUserId
+      adminUserId: opts.adminUserId,
+      botUserId: asUserId,
+      media: mediaClient
     });
     const requestedPort = matrix.transport.port ?? 9e3;
     server = serve({ fetch: transport.app.fetch, port: requestedPort, hostname: "0.0.0.0" });
     port = await listenAsync(server);
-    const serverName = matrix.transport.user_namespace.split(":").slice(1).join(":").replace(/\\?\)?$/, "") || new URL(matrix.transport.homeserver).hostname;
-    const asUserId = `@${matrix.transport.sender_localpart}:${serverName}`;
     const spaceLocalpart = matrix.transport.space ?? "dev";
     const adminUserIds = opts.adminUserId ? [opts.adminUserId] : [];
     let spaceRoomId;
@@ -573,7 +584,8 @@ async function startDaemon(opts = {}) {
         serverName,
         spaceLocalpart,
         preset: "public_chat",
-        admins: adminUserIds
+        admins: adminUserIds,
+        joinRule: opts.publicWorkforceSpace ? "public" : "invite"
       });
       console.log(`[matrix] ensured workforce space #${spaceLocalpart}:${serverName} \u2192 ${spaceRoomId}`);
     } catch (err) {
@@ -600,7 +612,7 @@ async function startDaemon(opts = {}) {
           asUserId,
           getAgents: () => bindings
         });
-        console.log(`[matrix] published eco.zoon.workforce (${bindings.length} agents)`);
+        console.log(`[matrix] published dev.zooid.workforce (${bindings.length} agents)`);
         void publisher;
       } catch (err) {
         console.warn("[matrix] workforce roster publication failed:", err);
@@ -688,8 +700,8 @@ var TuwunelService = class {
   async stop() {
     if (this.child && this.child.exitCode === null) {
       this.child.kill("SIGTERM");
-      await new Promise((resolve6) => {
-        this.child.on("exit", () => resolve6());
+      await new Promise((resolve7) => {
+        this.child.on("exit", () => resolve7());
       });
     }
     this.child = null;
@@ -706,7 +718,7 @@ var TuwunelService = class {
           `Tuwunel container exited before serving HTTP (exit=${state.exitCode}${state.error ? `, error=${state.error}` : ""}). Check the engine logs (\`${this.opts.engine} logs ${this.opts.name}\`).`
         );
       }
-      await new Promise((resolve6) => setTimeout(resolve6, 500));
+      await new Promise((resolve7) => setTimeout(resolve7, 500));
     }
     while (Date.now() < deadline) {
       try {
@@ -714,7 +726,7 @@ var TuwunelService = class {
         if (r.ok) return;
       } catch {
       }
-      await new Promise((resolve6) => setTimeout(resolve6, 500));
+      await new Promise((resolve7) => setTimeout(resolve7, 500));
     }
     const finalState = await this.inspectState().catch(() => null);
     const detail = finalState ? ` (container status=${finalState.status}${finalState.exitCode !== void 0 ? `, exit=${finalState.exitCode}` : ""})` : "";
@@ -747,12 +759,12 @@ var TuwunelService = class {
   }
 };
 function execEngine(engine, args) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const child = spawn(engine, args, { stdio: "pipe" });
     let stderr = "";
     child.stderr.on("data", (b) => stderr += String(b));
     child.on("exit", (code) => {
-      if (code === 0) resolve6();
+      if (code === 0) resolve7();
       else reject(new Error(`${engine} ${args.join(" ")} failed: ${stderr.trim()}`));
     });
     child.on("error", reject);
@@ -760,34 +772,115 @@ function execEngine(engine, args) {
 }
 
 // src/web/resolve.ts
-import { existsSync as existsSync2 } from "fs";
-import { dirname as dirname3, join as join4, resolve } from "path";
+import { existsSync as existsSync3 } from "fs";
+import { dirname as dirname3, join as join5, resolve as resolve2 } from "path";
+
+// src/web/fetch.ts
+import { mkdirSync as mkdirSync3, renameSync, rmSync, existsSync as existsSync2, readdirSync, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+import { createHash, randomUUID as randomUUID2 } from "crypto";
+import * as tar from "tar";
+var PKG = "@zooid/web";
+var DEFAULT_REGISTRY = "https://registry.npmjs.org";
+async function fetchWebBundle(opts) {
+  const target = join4(opts.cacheDir, opts.version);
+  if (existsSync2(join4(target, "index.html"))) return target;
+  if (existsSync2(target)) rmSync(target, { recursive: true, force: true });
+  const f = opts.fetch ?? globalThis.fetch;
+  const registry = (opts.registryUrl ?? DEFAULT_REGISTRY).replace(/\/$/, "");
+  let tgz;
+  try {
+    const metaRes = await f(`${registry}/${PKG}`);
+    if (!metaRes.ok) throw new Error(`registry metadata: HTTP ${metaRes.status}`);
+    const meta = await metaRes.json();
+    const dist = meta.versions?.[opts.version]?.dist;
+    if (!dist?.tarball || !dist.integrity) {
+      throw new Error(`${PKG}@${opts.version} not found on the registry`);
+    }
+    const tgzRes = await f(dist.tarball);
+    if (!tgzRes.ok) throw new Error(`tarball: HTTP ${tgzRes.status}`);
+    tgz = Buffer.from(await tgzRes.arrayBuffer());
+    const sha = "sha512-" + createHash("sha512").update(tgz).digest("base64");
+    if (sha !== dist.integrity) {
+      throw new Error(`integrity mismatch for ${PKG}@${opts.version}: got ${sha}`);
+    }
+  } catch (err) {
+    throw new Error(
+      `Failed to fetch ${PKG}@${opts.version} from ${registry}.
+  Cache: ${opts.cacheDir}
+  Offline? Point ZOOID_DEV_WEB_ROOT_OVERRIDE at a built dist as a manual escape hatch.
+  Cause: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  const tmp = join4(opts.cacheDir, `.tmp-${randomUUID2().slice(0, 8)}`);
+  mkdirSync3(tmp, { recursive: true });
+  const tgzPath = join4(tmp, ".bundle.tgz");
+  try {
+    writeFileSync3(tgzPath, tgz);
+    await tar.extract({
+      file: tgzPath,
+      cwd: tmp,
+      strip: 2,
+      // package/dist/<file> → <file>
+      filter: (p) => p === "package/dist" || p.startsWith("package/dist/")
+    });
+    rmSync(tgzPath);
+    if (!existsSync2(join4(tmp, "index.html"))) {
+      throw new Error(`${PKG}@${opts.version} tarball has no dist/index.html`);
+    }
+    renameSync(tmp, target);
+  } catch (err) {
+    rmSync(tmp, { recursive: true, force: true });
+    throw err;
+  }
+  for (const entry of readdirSync(opts.cacheDir)) {
+    if (entry !== opts.version) {
+      rmSync(join4(opts.cacheDir, entry), { recursive: true, force: true });
+    }
+  }
+  return target;
+}
+
+// src/web/resolve.ts
 var ENV_OVERRIDE = "ZOOID_DEV_WEB_ROOT_OVERRIDE";
-function resolveWebRoot(cliRoot) {
+async function ensureWebRoot(opts) {
   const override = process.env[ENV_OVERRIDE];
-  if (override && existsSync2(join4(override, "index.html"))) return resolve(override);
-  const published = join4(cliRoot, "dist", "web");
-  if (existsSync2(join4(published, "index.html"))) return published;
-  const fromSource = webSourcePackage(cliRoot);
-  if (fromSource && existsSync2(join4(fromSource, "dist", "index.html"))) {
-    return join4(fromSource, "dist");
+  if (override && existsSync3(join5(override, "index.html"))) return resolve2(override);
+  const fromSource = webSourcePackage(opts.cliRoot);
+  if (fromSource && existsSync3(join5(fromSource, "dist", "index.html"))) {
+    return join5(fromSource, "dist");
   }
-  throw new Error(
-    `@zoon/web build not found.
-  Tried: ${published}
-  Tried: ${fromSource ?? "(no monorepo source)"}
-Run \`pnpm -C zoon/packages/web build\` (or set ${ENV_OVERRIDE} to a built dist).`
-  );
+  if (!opts.version) {
+    throw new Error(
+      `No @zooid/web version pin (zooid.webVersion) in the cli package.json and no monorepo sibling build found.
+Set ${ENV_OVERRIDE} to a built dist, or run from the monorepo.`
+    );
+  }
+  opts.onProgress?.(`Fetching @zooid/web ${opts.version}\u2026`);
+  const fetchBundleFn = opts.fetchBundle ?? fetchWebBundle;
+  return fetchBundleFn({ version: opts.version, cacheDir: opts.cacheDir });
 }
 function webSourcePackage(cliRoot) {
   const workspaceRoot = dirname3(dirname3(dirname3(cliRoot)));
-  const candidate = join4(workspaceRoot, "zoon", "packages", "web");
-  return existsSync2(join4(candidate, "package.json")) ? candidate : null;
+  const candidate = join5(workspaceRoot, "zoon", "packages", "web");
+  return existsSync3(join5(candidate, "package.json")) ? candidate : null;
+}
+
+// src/web/pin.ts
+import { readFileSync as readFileSync3 } from "fs";
+import { join as join6 } from "path";
+function readZoonWebPin(cliRoot) {
+  try {
+    const pkg = JSON.parse(readFileSync3(join6(cliRoot, "package.json"), "utf8"));
+    return pkg.zooid?.webVersion;
+  } catch {
+    return void 0;
+  }
 }
 
 // src/web/static.ts
-import { readFileSync as readFileSync3, statSync } from "fs";
-import { extname, join as join5, normalize } from "path";
+import { readFileSync as readFileSync4, statSync } from "fs";
+import { extname, join as join7, normalize } from "path";
 import { Hono as Hono2 } from "hono";
 var MIME = {
   ".html": "text/html; charset=utf-8",
@@ -813,19 +906,19 @@ function webStatic(opts) {
     const requested = decodeURIComponent(url.pathname);
     const wantFile = requested === "/" ? "/index.html" : requested;
     const safe = normalize(wantFile).replace(/^(\.\.[/\\])+/g, "");
-    const filePath = join5(opts.webRoot, safe);
+    const filePath = join7(opts.webRoot, safe);
     if (!filePath.startsWith(opts.webRoot)) return c.notFound();
     try {
       const stat = statSync(filePath);
       if (stat.isFile()) {
-        const body = readFileSync3(filePath);
+        const body = readFileSync4(filePath);
         const ct = MIME[extname(filePath)] ?? "application/octet-stream";
         return c.body(body, 200, { "content-type": ct });
       }
     } catch {
     }
     if (isAssetPath(requested)) return c.notFound();
-    const indexBytes = readFileSync3(join5(opts.webRoot, "index.html"));
+    const indexBytes = readFileSync4(join7(opts.webRoot, "index.html"));
     return c.body(indexBytes, 200, {
       "content-type": MIME[".html"]
     });
@@ -835,11 +928,11 @@ function webStatic(opts) {
 
 // src/web/watch.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync3, statSync as statSync2 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync4, statSync as statSync2 } from "fs";
+import { join as join8 } from "path";
 async function startWebWatch(opts) {
-  const distPath = join6(opts.webPackageDir, "dist");
-  const indexPath = join6(distPath, "index.html");
+  const distPath = join8(opts.webPackageDir, "dist");
+  const indexPath = join8(distPath, "index.html");
   const timeoutMs = opts.firstBuildTimeoutMs ?? 6e4;
   const spawnTime = Date.now();
   const child = spawn2(
@@ -873,7 +966,7 @@ async function startWebWatch(opts) {
       attachStdio();
       throw new Error(`vite build --watch exited before first build (code ${child.exitCode})`);
     }
-    if (existsSync3(indexPath)) {
+    if (existsSync4(indexPath)) {
       const m = statSync2(indexPath).mtimeMs;
       if (m >= spawnTime - 500) return makeHandle();
     }
@@ -893,12 +986,12 @@ async function startWebWatch(opts) {
 async function stopChild(child) {
   if (child.exitCode !== null) return;
   child.kill("SIGTERM");
-  await new Promise((resolve6) => {
+  await new Promise((resolve7) => {
     let done = false;
     const finish = () => {
       if (done) return;
       done = true;
-      resolve6();
+      resolve7();
     };
     child.once("exit", finish);
     setTimeout(() => {
@@ -913,7 +1006,7 @@ async function stopChild(child) {
 
 // src/observability/paths.ts
 import { mkdir as mkdir2, readdir, rm, symlink, unlink as unlink2 } from "fs/promises";
-import { join as join7 } from "path";
+import { join as join9 } from "path";
 function localDateSlug(d) {
   const y = d.getFullYear();
   const m = String(d.getMonth() + 1).padStart(2, "0");
@@ -923,19 +1016,19 @@ function localDateSlug(d) {
 var DAY_RE = /^\d{4}-\d{2}-\d{2}$/;
 function resolveLogPaths({ dataDir, now }) {
   const slug = localDateSlug(now ?? /* @__PURE__ */ new Date());
-  const logsDir = join7(dataDir, "logs");
-  const dayDir = join7(logsDir, slug);
+  const logsDir = join9(dataDir, "logs");
+  const dayDir = join9(logsDir, slug);
   return {
     dataDir,
     logsDir,
     dayDir,
     daySlug: slug,
-    todayLink: join7(logsDir, "today"),
-    tuwunelLog: join7(dayDir, "tuwunel.log"),
-    daemonLog: join7(dayDir, "daemon.log"),
-    devLog: join7(dayDir, "dev.log"),
-    agentLog: (n) => join7(dayDir, `agent-${n}.log`),
-    agentTap: (n) => join7(dayDir, `agent-${n}.acp.jsonl`)
+    todayLink: join9(logsDir, "today"),
+    tuwunelLog: join9(dayDir, "tuwunel.log"),
+    daemonLog: join9(dayDir, "daemon.log"),
+    devLog: join9(dayDir, "dev.log"),
+    agentLog: (n) => join9(dayDir, `agent-${n}.log`),
+    agentTap: (n) => join9(dayDir, `agent-${n}.acp.jsonl`)
   };
 }
 async function ensureDayFolder(p) {
@@ -948,7 +1041,7 @@ async function ensureDayFolder(p) {
 }
 async function pruneOldDays(opts) {
   if (opts.retainDays <= 0) return [];
-  const logsDir = join7(opts.dataDir, "logs");
+  const logsDir = join9(opts.dataDir, "logs");
   let entries;
   try {
     entries = await readdir(logsDir);
@@ -967,7 +1060,7 @@ async function pruneOldDays(opts) {
     const [y, m, d] = name.split("-").map(Number);
     const t = new Date(y, m - 1, d).getTime();
     if (t < cutoff) {
-      await rm(join7(logsDir, name), { recursive: true, force: true });
+      await rm(join9(logsDir, name), { recursive: true, force: true });
       removed.push(name);
     }
   }
@@ -995,14 +1088,14 @@ var JsonlSink = class {
     await this.readyPromise;
     const capped = capStrings(obj, this.maxStringLen);
     const line = JSON.stringify(capped) + "\n";
-    return new Promise((resolve6, reject) => {
-      this.stream.write(line, (err) => err ? reject(err) : resolve6());
+    return new Promise((resolve7, reject) => {
+      this.stream.write(line, (err) => err ? reject(err) : resolve7());
     });
   }
   async close() {
     await this.readyPromise;
-    return new Promise((resolve6) => {
-      this.stream.end(() => resolve6());
+    return new Promise((resolve7) => {
+      this.stream.end(() => resolve7());
     });
   }
 };
@@ -1077,8 +1170,8 @@ function captureChildToFile(child, path) {
     const stream = createWriteStream2(path, { flags: "a" });
     if (child.stdout) child.stdout.on("data", (b) => stream.write(b));
     if (child.stderr) child.stderr.on("data", (b) => stream.write(b));
-    await new Promise((resolve6) => {
-      child.on("exit", () => stream.end(() => resolve6()));
+    await new Promise((resolve7) => {
+      child.on("exit", () => stream.end(() => resolve7()));
     });
   })();
 }
@@ -1113,10 +1206,10 @@ function buildShutdown(layers) {
 var CLI_ROOT = (() => {
   let dir = dirname6(fileURLToPath(import.meta.url));
   for (let i = 0; i < 8; i++) {
-    const pkgPath = resolve2(dir, "package.json");
-    if (existsSync4(pkgPath)) {
+    const pkgPath = resolve3(dir, "package.json");
+    if (existsSync5(pkgPath)) {
       try {
-        const pkg = JSON.parse(readFileSync4(pkgPath, "utf8"));
+        const pkg = JSON.parse(readFileSync5(pkgPath, "utf8"));
         if (pkg.name === "zooid" || pkg.name === "@zooid/cli") return dir;
       } catch {
       }
@@ -1132,14 +1225,14 @@ async function runDev(flags) {
   const found = findConfigFile(cwd);
   if (!found) throw new Error(`zooid.yaml not found in ${cwd}`);
   loadEnvFiles(cwd);
-  const dataRoot = resolve2(cwd, flags.dataDir);
+  const dataRoot = resolve3(cwd, flags.dataDir);
   const layout = resolveDataLayout(dataRoot);
   const paths = resolvePaths(layout.matrixDir);
   const logPaths = resolveLogPaths({ dataDir: layout.dataRoot });
   const tokens = ensureTokens(paths.envPath);
   process.env.MATRIX_AS_TOKEN = tokens.asToken;
   process.env.MATRIX_HS_TOKEN = tokens.hsToken;
-  const rawYaml = readFileSync4(found.path, "utf8");
+  const rawYaml = readFileSync5(found.path, "utf8");
   const preview = loadZooidConfig(rawYaml, { configDir: dirname6(found.path) });
   const matrix = findMatrixTransport(preview);
   if (!matrix) {
@@ -1220,6 +1313,10 @@ async function runDev(flags) {
             installSignalHandlers: false,
             adminUserId: `@${flags.adminUser}:${shape.serverName}`,
             agentsDir: layout.agentsDir,
+            // Local-only homeserver: make the workforce space publicly joinable
+            // so a self-service-registered dev account lands in #<space> from
+            // the web client without needing an invite.
+            publicWorkforceSpace: true,
             onTap: (agentName, event) => captures[agentName]?.onTap(event),
             prepullLog: (line) => {
               t.output = line.replace(/^\[zooid\]\s+/, "").trim();
@@ -1229,14 +1326,14 @@ async function runDev(flags) {
       },
       ...flags.watchWeb ? [
         {
-          title: "Start @zoon/web watcher (vite build --watch)",
+          title: "Start @zooid/web watcher (vite build --watch)",
           task: async () => {
-            const pkgDir = typeof flags.watchWeb === "string" ? resolve2(flags.watchWeb) : webSourcePackage(CLI_ROOT);
+            const pkgDir = typeof flags.watchWeb === "string" ? resolve3(flags.watchWeb) : webSourcePackage(CLI_ROOT);
             if (!pkgDir) {
-              const defaultPath = dirname6(dirname6(dirname6(CLI_ROOT))) + "/zoon/packages/web";
+              const defaultPath = dirname6(dirname6(dirname6(CLI_ROOT))) + "/zooid-clients/packages/web";
               throw new Error(
-                `--watch-web: @zoon/web not found at ${defaultPath}.
-Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
+                `--watch-web: @zooid/web not found at ${defaultPath}.
+Pass an explicit path: --watch-web=/path/to/zooid-clients/packages/web`
               );
             }
             ctx.webWatch = await startWebWatch({ webPackageDir: pkgDir });
@@ -1244,9 +1341,16 @@ Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
         }
       ] : [],
       {
-        title: `Serve @zoon/web on http://localhost:${flags.uiPort}`,
-        task: () => {
-          const webRoot = ctx.webWatch?.distPath ?? resolveWebRoot(CLI_ROOT);
+        title: `Serve @zooid/web on http://localhost:${flags.uiPort}`,
+        task: async (_, t) => {
+          const webRoot = ctx.webWatch?.distPath ?? await ensureWebRoot({
+            cliRoot: CLI_ROOT,
+            cacheDir: join10(layout.dataRoot, "web"),
+            version: readZoonWebPin(CLI_ROOT),
+            onProgress: (msg) => {
+              t.output = msg;
+            }
+          });
           const app = webStatic({ webRoot, homeserverUrl: homeserver });
           ctx.uiServer = serve2({ fetch: app.fetch, port: flags.uiPort });
         }
@@ -1295,7 +1399,7 @@ Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
       chalk.bold("UI:        ") + ` http://localhost:${flags.uiPort}`,
       `  ${chalk.cyan("admin user:")} ${flags.adminUser} / ${flags.adminPassword}`,
       `  ${chalk.cyan("data dir:")} ${layout.dataRoot}`,
-      ...ctx.webWatch ? [`  ${chalk.cyan("web watcher:")} live (vite build --watch on @zoon/web)`] : [],
+      ...ctx.webWatch ? [`  ${chalk.cyan("web watcher:")} live (vite build --watch on @zooid/web)`] : [],
       "",
       chalk.dim("Press Ctrl-C to stop."),
       ""
@@ -1308,8 +1412,8 @@ Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
 }
 function loadEnvFiles(cwd) {
   for (const name of [".env.local", ".env"]) {
-    const path = resolve2(cwd, name);
-    if (!existsSync4(path)) continue;
+    const path = resolve3(cwd, name);
+    if (!existsSync5(path)) continue;
     try {
       process.loadEnvFile(path);
     } catch (err) {
@@ -1319,8 +1423,8 @@ function loadEnvFiles(cwd) {
 }
 
 // src/commands/init.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, readdirSync, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname7, join as join9, resolve as resolve3 } from "path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, readdirSync as readdirSync2, writeFileSync as writeFileSync4 } from "fs";
+import { dirname as dirname7, join as join12, resolve as resolve4 } from "path";
 
 // src/commands/init/generators.ts
 function generateZooidYaml(opts) {
@@ -1473,14 +1577,14 @@ function findOpencodeProvider(id) {
 }
 
 // src/commands/init/sniff.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 import { homedir } from "os";
-import { join as join8 } from "path";
+import { join as join11 } from "path";
 function sniffCredentials(preset, home = homedir()) {
   const meta = findSimplePreset(preset);
   if (!meta) return { found: false };
-  const full = join8(home, meta.credentialDir);
-  if (existsSync5(full)) return { found: true, path: full };
+  const full = join11(home, meta.credentialDir);
+  if (existsSync6(full)) return { found: true, path: full };
   return { found: false };
 }
 
@@ -1497,10 +1601,10 @@ var IGNORED_PREEXISTING = /* @__PURE__ */ new Set([
   "yarn.lock"
 ]);
 async function runInit(opts) {
-  const dir = resolve3(opts.dir);
-  mkdirSync3(dir, { recursive: true });
+  const dir = resolve4(opts.dir);
+  mkdirSync4(dir, { recursive: true });
   if (!opts.force) {
-    const blocking = readdirSync(dir).filter((n) => !IGNORED_PREEXISTING.has(n));
+    const blocking = readdirSync2(dir).filter((n) => !IGNORED_PREEXISTING.has(n));
     if (blocking.length > 0) {
       throw new Error(
         `${dir} is non-empty (use --force to allow scaffolding into it). Conflicting entries: ${blocking.join(", ")}`
@@ -1567,14 +1671,14 @@ async function runInit(opts) {
   }
   writes.push({ path: ".gitignore", content: generateGitignore() });
   for (const w of writes) {
-    const full = join9(dir, w.path);
-    const exists = existsSync6(full);
+    const full = join12(dir, w.path);
+    const exists = existsSync7(full);
     if (exists && !opts.overwrite) {
       console.warn(`\u26A0 ${w.path} exists; left as-is (use --force --overwrite to replace)`);
       continue;
     }
-    mkdirSync3(dirname7(full), { recursive: true });
-    writeFileSync3(full, w.content);
+    mkdirSync4(dirname7(full), { recursive: true });
+    writeFileSync4(full, w.content);
     console.log(`\u2713 Created ${w.path}`);
   }
   if ((opts.preset === "claude" || opts.preset === "codex") && opts.auth === "subscription") {
@@ -1691,8 +1795,8 @@ async function resolveOptions(flags) {
 
 // src/commands/logs.ts
 import { readFile, readdir as readdir2, readlink } from "fs/promises";
-import { existsSync as existsSync7 } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync8 } from "fs";
+import { join as join13 } from "path";
 var KNOWN_SOURCES = ["tuwunel", "daemon", "dev"];
 async function runLogs(flags) {
   const writer = flags.writer ?? ((s) => process.stdout.write(s));
@@ -1711,8 +1815,8 @@ async function runLogs(flags) {
     writer("no logs yet\n");
     return;
   }
-  const dayDir = join10(flags.dataDir, "logs", day);
-  if (!existsSync7(dayDir)) {
+  const dayDir = join13(flags.dataDir, "logs", day);
+  if (!existsSync8(dayDir)) {
     writer(`no logs for ${day}
 `);
     return;
@@ -1732,7 +1836,7 @@ async function runLogs(flags) {
     return;
   }
   const path = resolveSourcePath(dayDir, flags.source);
-  if (!existsSync7(path)) {
+  if (!existsSync8(path)) {
     writer(`no such source: ${flags.source}
 `);
     return;
@@ -1740,7 +1844,7 @@ async function runLogs(flags) {
   writer(await readFile(path, "utf8"));
 }
 async function resolveTodaySlug(dataDir) {
-  const link = join10(dataDir, "logs", "today");
+  const link = join13(dataDir, "logs", "today");
   try {
     return await readlink(link);
   } catch {
@@ -1749,18 +1853,18 @@ async function resolveTodaySlug(dataDir) {
 }
 function resolveSourcePath(dayDir, source) {
   if (source.startsWith("agent-")) {
-    if (source.endsWith(".acp")) return join10(dayDir, `${source.slice(0, -4)}.acp.jsonl`);
-    return join10(dayDir, `${source}.log`);
+    if (source.endsWith(".acp")) return join13(dayDir, `${source.slice(0, -4)}.acp.jsonl`);
+    return join13(dayDir, `${source}.log`);
   }
   if (KNOWN_SOURCES.includes(source))
-    return join10(dayDir, `${source}.log`);
-  return join10(dayDir, source);
+    return join13(dayDir, `${source}.log`);
+  return join13(dayDir, source);
 }
 async function dumpByTurn(dayDir, turnId, writer) {
   const entries = await readdir2(dayDir);
   const taps = entries.filter((e) => e.endsWith(".acp.jsonl")).sort();
   for (const f of taps) {
-    const text = await readFile(join10(dayDir, f), "utf8");
+    const text = await readFile(join13(dayDir, f), "utf8");
     for (const line of text.split("\n")) {
       if (!line) continue;
       try {
@@ -1774,14 +1878,14 @@ async function dumpByTurn(dayDir, turnId, writer) {
 
 // src/commands/start.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { resolve as resolve4 } from "path";
+import { resolve as resolve5 } from "path";
 async function runStart(flags) {
   if (flags.printToken) {
     process.stdout.write(`${randomBytes2(32).toString("hex")}
 `);
     return;
   }
-  const dataRoot = resolve4(process.cwd(), flags.dataDir ?? "./data");
+  const dataRoot = resolve5(process.cwd(), flags.dataDir ?? "./data");
   const layout = resolveDataLayout(dataRoot);
   const handle = await startDaemon({
     cliFlags: flags,
@@ -1794,7 +1898,7 @@ async function runStart(flags) {
 }
 
 // src/commands/status.ts
-import { readFileSync as readFileSync5 } from "fs";
+import { readFileSync as readFileSync6 } from "fs";
 import { dirname as dirname8 } from "path";
 import chalk2 from "chalk";
 async function probe(url, timeoutMs = 2e3) {
@@ -1819,7 +1923,7 @@ async function collectStatus(opts) {
       agents: []
     };
   }
-  const cfg = loadZooidConfig(readFileSync5(found.path, "utf8"), {
+  const cfg = loadZooidConfig(readFileSync6(found.path, "utf8"), {
     configDir: dirname8(found.path)
   });
   const matrixEntry = Object.entries(cfg.transports).find(
@@ -1850,7 +1954,7 @@ async function runStatus(flags) {
   if (port === void 0) {
     const found = findConfigFile(cwd);
     if (found) {
-      const cfg = loadZooidConfig(readFileSync5(found.path, "utf8"), {
+      const cfg = loadZooidConfig(readFileSync6(found.path, "utf8"), {
         configDir: dirname8(found.path)
       });
       const matrix = findMatrixTransport(cfg);
@@ -1887,7 +1991,7 @@ cli.command("start", "Run the daemon (production entry-point)").option("--data <
 });
 cli.command("dev", "Tuwunel + daemon + UI for local development").option("--data <dir>", "Persistent data root dir", { default: "./data" }).option("--engine <docker|podman>", "Container engine", { default: "docker" }).option("--ui-port <n>", "UI HTTP port", { default: 5173 }).option("--admin-user <name>", "Admin username", { default: "admin" }).option("--admin-password <pw>", "Admin password", { default: "admin" }).option(
   "--watch-web [path]",
-  "Run vite build --watch on @zoon/web. Path defaults to sibling ../zoon/packages/web."
+  "Run vite build --watch on @zooid/web. Path defaults to sibling ../zooid-clients/packages/web."
 ).action(async (flags) => {
   await runDev({
     dataDir: flags.data,
@@ -1904,14 +2008,14 @@ cli.command(
 ).option("--data <dir>", "Persistent data root dir", { default: "./data" }).option("--day <YYYY-MM-DD>", "Day partition (defaults to today)").option("--turn <id>", "Filter ACP taps to a single turn id").option("-f, --follow", "Tail the file (not yet implemented)").option("--keep <n>", "For `logs prune`: days to retain", { default: 14 }).action(async (source, flags) => {
   if (source === "prune") {
     await runLogs({
-      dataDir: resolve5(process.cwd(), flags.data),
+      dataDir: resolve6(process.cwd(), flags.data),
       subcommand: "prune",
       keep: Number(flags.keep)
     });
     return;
   }
   await runLogs({
-    dataDir: resolve5(process.cwd(), flags.data),
+    dataDir: resolve6(process.cwd(), flags.data),
     source,
     day: flags.day,
     turn: flags.turn,