zooid 0.7.0 → 0.7.2

package/dist/bin.js

@@ -5,6 +5,7 @@ import {
   SpawnRegistry,
   buildAcpRegistry,
   createMatrixTransport,
+  ensureDefaultChannel,
   ensureWorkforceSpace,
   findConfigFile,
   findHttpTransport,
@@ -14,7 +15,7 @@ import {
   renderRegistration,
   startDaemonSocketServer,
   startWorkforcePublisher
-} from "./chunk-N5POSZX5.js";
+} from "./chunk-O6E4CDTV.js";
 
 // src/bin.ts
 import { resolve as resolve5 } from "path";
@@ -401,6 +402,68 @@ function createApp({
   return app;
 }
 
+// src/prepull-images.ts
+import { execFile } from "child_process";
+import { promisify } from "util";
+var pExecFile = promisify(execFile);
+async function prepullImages(registry, opts) {
+  if (opts.skip || opts.runtime === "local") return;
+  const exec = opts.exec ?? defaultExec;
+  const log = opts.log ?? ((l) => console.log(l));
+  const images = /* @__PURE__ */ new Set();
+  for (const name of registry.agentNames()) {
+    const img = registry.resolveSpawnImage(name);
+    if (img) images.add(img);
+  }
+  const toPull = [];
+  let cached = 0;
+  if (opts.refresh) {
+    toPull.push(...images);
+  } else {
+    await Promise.all(
+      [...images].map(async (img) => {
+        const r = await exec(opts.engine, ["image", "inspect", img]);
+        if (r.code === 0) cached++;
+        else toPull.push(img);
+      })
+    );
+  }
+  log(
+    `[zooid] image prepull: ${images.size} unique images (${cached} cached, ${toPull.length} to pull)`
+  );
+  if (toPull.length === 0) return;
+  await Promise.all(
+    toPull.map(async (img) => {
+      log(`[zooid]   ${img}  pulling\u2026`);
+      const start = Date.now();
+      const r = await exec(opts.engine, ["pull", img]);
+      const secs = ((Date.now() - start) / 1e3).toFixed(1);
+      if (r.code !== 0) {
+        throw new Error(
+          `image prepull failed for ${img}:
+${r.stderr.trim() || "(no stderr)"}`
+        );
+      }
+      log(`[zooid]   ${img}  \u2713 ${secs}s`);
+    })
+  );
+}
+var defaultExec = async (cmd, args) => {
+  try {
+    const { stdout, stderr } = await pExecFile(cmd, args, {
+      maxBuffer: 16 * 1024 * 1024
+    });
+    return { code: 0, stdout, stderr };
+  } catch (err) {
+    const e = err;
+    return {
+      code: typeof e.code === "number" ? e.code : 1,
+      stdout: e.stdout ?? "",
+      stderr: e.stderr ?? String(e)
+    };
+  }
+};
+
 // src/daemon/start-daemon.ts
 function listenAsync(server) {
   return new Promise((resolve6) => {
@@ -421,7 +484,8 @@ async function startDaemon(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
   const found = opts.configPath ? { path: opts.configPath } : findConfigFile(cwd);
   if (!found) throw new Error("zooid.yaml is required");
-  const base = loadZooidConfig(readFileSync2(found.path, "utf8"));
+  const configDir = dirname2(found.path);
+  const base = loadZooidConfig(readFileSync2(found.path, "utf8"), { configDir });
   const config = mergeCliFlags(base, opts.cliFlags ?? {});
   const approvals = new ApprovalCorrelator();
   const daemonSockPath = opts.agentsDir ? join3(opts.agentsDir, "..", "run", "context.sock") : join3(tmpdir(), `zooid-context-${process.pid}.sock`);
@@ -437,14 +501,27 @@ async function startDaemon(opts = {}) {
   } catch (err) {
     console.warn("[context] daemon socket startup failed; zooid-context MCP disabled:", err);
   }
+  const dataDir = opts.agentsDir ? dirname2(opts.agentsDir) : void 0;
   const registry = buildAcpRegistry(config, {
     approvals,
     onTap: opts.onTap,
     agentsDir: opts.agentsDir,
     contextSpawnRegistry: contextSocket ? contextSpawnRegistry : void 0,
-    daemonSockPath: contextSocket ? daemonSockPath : void 0
+    daemonSockPath: contextSocket ? daemonSockPath : void 0,
+    configDir,
+    dataDir,
+    daemonHome: process.env.HOME
   });
   const agentNames = Object.keys(config.agents);
+  if (config.runtime !== "local") {
+    await prepullImages(registry, {
+      engine: config.runtime === "podman" ? "podman" : "docker",
+      runtime: config.runtime,
+      skip: opts.noPrepull ?? process.env.ZOOID_NO_PREPULL === "1",
+      refresh: opts.refreshImages ?? process.env.ZOOID_REFRESH_IMAGES === "1",
+      log: opts.prepullLog
+    });
+  }
   console.log(
     `[context] socket=${daemonSockPath} status=${contextSocket ? "listening" : "disabled"} agents={${agentNames.map((n) => `${n}:${registry.hasContextSpawn(n) ? "yes" : "no"}`).join(", ")}}`
   );
@@ -481,12 +558,13 @@ async function startDaemon(opts = {}) {
       hsToken: matrix.transport.hs_token,
       adminUserId: opts.adminUserId
     });
-    const requestedPort = matrix.transport.port ?? 8080;
+    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;
     try {
       spaceRoomId = await ensureWorkforceSpace({
@@ -494,14 +572,27 @@ async function startDaemon(opts = {}) {
         asUserId,
         serverName,
         spaceLocalpart,
-        preset: "public_chat"
+        preset: "public_chat",
+        admins: adminUserIds
       });
       console.log(`[matrix] ensured workforce space #${spaceLocalpart}:${serverName} \u2192 ${spaceRoomId}`);
     } catch (err) {
       console.warn("[matrix] workforce space provisioning failed:", err);
     }
-    await transport.bootstrap({ spaceRoomId, asUserId });
+    await transport.bootstrap({ spaceRoomId, asUserId, adminUserIds });
     if (spaceRoomId) {
+      try {
+        const generalRoomId = await ensureDefaultChannel({
+          client,
+          asUserId,
+          serverName,
+          spaceId: spaceRoomId,
+          admins: adminUserIds
+        });
+        console.log(`[matrix] ensured default channel #general:${serverName} \u2192 ${generalRoomId}`);
+      } catch (err) {
+        console.warn("[matrix] default channel provisioning failed:", err);
+      }
       try {
         const publisher = await startWorkforcePublisher({
           client,
@@ -1011,7 +1102,7 @@ async function runDev(flags) {
   process.env.MATRIX_AS_TOKEN = tokens.asToken;
   process.env.MATRIX_HS_TOKEN = tokens.hsToken;
   const rawYaml = readFileSync4(found.path, "utf8");
-  const preview = loadZooidConfig(rawYaml);
+  const preview = loadZooidConfig(rawYaml, { configDir: dirname6(found.path) });
   const matrix = findMatrixTransport(preview);
   if (!matrix) {
     throw new Error("zooid.yaml: zooid dev requires at least one matrix transport");
@@ -1072,7 +1163,7 @@ async function runDev(flags) {
       },
       {
         title: "Start daemon",
-        task: async () => {
+        task: async (_ctx, t) => {
           const captures = {};
           for (const name of Object.keys(preview.agents)) {
             captures[name] = wireAgentCapture({
@@ -1091,7 +1182,10 @@ async function runDev(flags) {
             installSignalHandlers: false,
             adminUserId: `@${flags.adminUser}:${shape.serverName}`,
             agentsDir: layout.agentsDir,
-            onTap: (agentName, event) => captures[agentName]?.onTap(event)
+            onTap: (agentName, event) => captures[agentName]?.onTap(event),
+            prepullLog: (line) => {
+              t.output = line.replace(/^\[zooid\]\s+/, "").trim();
+            }
           });
         }
       },
@@ -1099,10 +1193,12 @@ async function runDev(flags) {
         {
           title: "Start @zoon/web watcher (vite build --watch)",
           task: async () => {
-            const pkgDir = webSourcePackage(CLI_ROOT);
+            const pkgDir = typeof flags.watchWeb === "string" ? resolve2(flags.watchWeb) : webSourcePackage(CLI_ROOT);
             if (!pkgDir) {
+              const defaultPath = dirname6(dirname6(dirname6(CLI_ROOT))) + "/zoon/packages/web";
               throw new Error(
-                "--watch-web requires running from the monorepo source (no zoon/packages/web found)."
+                `--watch-web: @zoon/web not found at ${defaultPath}.
+Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
               );
             }
             ctx.webWatch = await startWebWatch({ webPackageDir: pkgDir });
@@ -1218,6 +1314,11 @@ You are the zooid setup assistant. Your job is to help the operator get a workfo
 - Zooid documentation: https://zooid.dev/docs/
 - Use your web fetch tool to read documentation pages when answering questions.
 
+## Stack facts
+
+- **Tuwunel** is a lightweight Rust Matrix homeserver (Conduit fork) backed by RocksDB. Single binary, low resource floor \u2014 not "heavy" for typical workforces.
+- **Logs land on disk** in \`./data/\` inside this zooid home dir: tuwunel logs, the daemon, and each agent's ACP stream. Use \`zooid logs <source>\` to tail them (sources: \`tuwunel\`, \`daemon\`, \`dev\`, \`agent-<name>\`, \`agent-<name>.acp\`). Debugging is mostly "read the log file" \u2014 don't tell the operator it's opaque.
+
 ## Behavior
 
 - Be terse. Give the answer; link to the doc page; stop.
@@ -1656,6 +1757,7 @@ async function runStart(flags) {
 
 // src/commands/status.ts
 import { readFileSync as readFileSync5 } from "fs";
+import { dirname as dirname8 } from "path";
 import chalk2 from "chalk";
 async function probe(url, timeoutMs = 2e3) {
   try {
@@ -1679,7 +1781,9 @@ async function collectStatus(opts) {
       agents: []
     };
   }
-  const cfg = loadZooidConfig(readFileSync5(found.path, "utf8"));
+  const cfg = loadZooidConfig(readFileSync5(found.path, "utf8"), {
+    configDir: dirname8(found.path)
+  });
   const matrixEntry = Object.entries(cfg.transports).find(
     ([, t]) => t.type === "matrix"
   );
@@ -1708,7 +1812,9 @@ async function runStatus(flags) {
   if (port === void 0) {
     const found = findConfigFile(cwd);
     if (found) {
-      const cfg = loadZooidConfig(readFileSync5(found.path, "utf8"));
+      const cfg = loadZooidConfig(readFileSync5(found.path, "utf8"), {
+        configDir: dirname8(found.path)
+      });
       const matrix = findMatrixTransport(cfg);
       if (matrix) {
         const userIds = Object.values(cfg.agents).filter((a) => a.matrix?.transport === matrix.name).map((a) => a.matrix.user_id);
@@ -1741,14 +1847,17 @@ cli.command("start", "Run the daemon (production entry-point)").option("--data <
     printToken: flags.printToken
   });
 });
-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", "Run vite build --watch on @zoon/web (monorepo source only)").action(async (flags) => {
+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."
+).action(async (flags) => {
   await runDev({
     dataDir: flags.data,
     engine: flags.engine,
     uiPort: Number(flags.uiPort),
     adminUser: flags.adminUser,
     adminPassword: flags.adminPassword,
-    watchWeb: Boolean(flags.watchWeb)
+    watchWeb: flags.watchWeb
   });
 });
 cli.command(