zooid 0.8.0 → 0.9.1

package/dist/bin.js

@@ -16,7 +16,7 @@ import {
   renderRegistration,
   startDaemonSocketServer,
   startWorkforcePublisher
-} from "./chunk-R6EDLH23.js";
+} from "./chunk-PDSJJWQW.js";
 
 // src/bin.ts
 import { resolve as resolve6 } from "path";
@@ -25,8 +25,8 @@ import { cac } from "cac";
 // src/commands/dev.ts
 import chalk from "chalk";
 import { Listr } from "listr2";
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname6, join as join10, resolve as resolve3 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync6 } from "fs";
+import { dirname as dirname6, join as join12, resolve as resolve3 } from "path";
 import { fileURLToPath } from "url";
 import { serve as serve2 } from "@hono/node-server";
 
@@ -57,7 +57,19 @@ async function ensureAdminUser(opts) {
 }
 
 // src/bootstrap/configs.ts
+import { join } from "path";
 import { mkdirSync, writeFileSync } from "fs";
+
+// src/bootstrap/registration-url.ts
+function deriveRegistrationUrl(opts) {
+  if (opts.port != null && opts.advertise_url != null)
+    throw new Error("registration url: 'port' and 'advertise_url' are mutually exclusive");
+  if (opts.advertise_url != null) return opts.advertise_url;
+  if (opts.port != null) return `http://host.docker.internal:${opts.port}`;
+  throw new Error("registration url: need port or advertise_url");
+}
+
+// src/bootstrap/configs.ts
 var TUWUNEL_INTERNAL_PORT = 8448;
 function renderTuwunelToml(opts) {
   return [
@@ -80,9 +92,13 @@ function writeBootstrapConfigs(opts) {
   mkdirSync(paths.mediaDir, { recursive: true });
   mkdirSync(paths.registrationsDir, { recursive: true });
   writeFileSync(paths.tuwunelTomlPath, renderTuwunelToml({ serverName }));
+  const id = opts.workstation ?? "zooid";
+  const url = opts.workstation ? deriveRegistrationUrl({ port: opts.port ?? 9099, advertise_url: opts.advertiseUrl }) : `http://host.docker.internal:9099`;
+  const exclusive = !!opts.workstation;
+  const registrationPath = join(paths.registrationsDir, `${id}.yaml`);
   const yaml = renderRegistration({
-    id: "zooid",
-    url: `http://host.docker.internal:9099`,
+    id,
+    url,
     homeserver: `http://localhost:${TUWUNEL_INTERNAL_PORT}`,
     asToken,
     hsToken,
@@ -91,28 +107,26 @@ function writeBootstrapConfigs(opts) {
     // BotPool.bootstrap creates `#alias:<server>` rooms when missing — the
     // AS needs an aliases namespace to legally claim them.
     aliasNamespace: `#.*:${serverName}`,
-    // zooid dev shares @.*:<server_name> between bots and the predefined
-    // admin human, so the AS cannot claim the namespace exclusively.
-    exclusive: false
+    exclusive
   });
-  writeFileSync(paths.appserviceYamlPath, yaml);
+  writeFileSync(registrationPath, yaml);
 }
 
 // src/bootstrap/data-layout.ts
-import { join } from "path";
+import { join as join2 } from "path";
 function resolveDataLayout(dataRoot) {
-  const agentsDir = join(dataRoot, "agents");
+  const agentsDir = join2(dataRoot, "agents");
   return {
     dataRoot,
-    matrixDir: join(dataRoot, "matrix"),
-    logsDir: join(dataRoot, "logs"),
+    matrixDir: join2(dataRoot, "matrix"),
+    logsDir: join2(dataRoot, "logs"),
     agentsDir,
-    agentDir: (id) => join(agentsDir, id)
+    agentDir: (id) => join2(agentsDir, id)
   };
 }
 
 // src/bootstrap/derive.ts
-var NAMESPACE_RE = /^@\.\*:([A-Za-z0-9.-]+)$/;
+var NAMESPACE_RE = /^@(?:\.\*|[a-z0-9-]+\\\.\.\*):([A-Za-z0-9.-]+)$/;
 function deriveHomeserverShape(matrix, agentUserIds) {
   const url = new URL(matrix.homeserver);
   const host = url.hostname;
@@ -120,7 +134,7 @@ function deriveHomeserverShape(matrix, agentUserIds) {
   const m = NAMESPACE_RE.exec(matrix.user_namespace);
   if (!m) {
     throw new Error(
-      `user_namespace ${matrix.user_namespace}: expected the simple form '@.*:<server_name>'`
+      `user_namespace ${matrix.user_namespace}: expected '@.*:<server_name>' or '@<workstation>\\..*:<server_name>'`
     );
   }
   const serverName = m[1];
@@ -135,19 +149,19 @@ function deriveHomeserverShape(matrix, agentUserIds) {
 }
 
 // src/bootstrap/paths.ts
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 function resolvePaths(dataDir) {
-  const configDir = join2(dataDir, "config");
-  const registrationsDir = join2(configDir, "registrations");
+  const configDir = join3(dataDir, "config");
+  const registrationsDir = join3(configDir, "registrations");
   return {
     dataDir,
-    dbDir: join2(dataDir, "db"),
-    mediaDir: join2(dataDir, "media"),
+    dbDir: join3(dataDir, "db"),
+    mediaDir: join3(dataDir, "media"),
     configDir,
     registrationsDir,
-    tuwunelTomlPath: join2(configDir, "tuwunel.toml"),
-    appserviceYamlPath: join2(registrationsDir, "zooid.yaml"),
-    envPath: join2(configDir, ".env")
+    tuwunelTomlPath: join3(configDir, "tuwunel.toml"),
+    appserviceYamlPath: join3(registrationsDir, "zooid.yaml"),
+    envPath: join3(configDir, ".env")
   };
 }
 
@@ -187,10 +201,10 @@ MATRIX_HS_TOKEN=${tokens.hsToken}
 }
 
 // src/daemon/start-daemon.ts
-import { readFileSync as readFileSync2 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 import { mkdir, unlink } from "fs/promises";
 import { tmpdir } from "os";
-import { dirname as dirname2, isAbsolute, join as join3, resolve } from "path";
+import { dirname as dirname2, isAbsolute, join as join5, resolve } from "path";
 import { serve } from "@hono/node-server";
 
 // ../transport-http/src/server.ts
@@ -465,6 +479,31 @@ var defaultExec = async (cmd, args) => {
   }
 };
 
+// src/daemon/sync-cursors.ts
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+function makeSyncCursorStore(agentsDir) {
+  const fileFor = (agentName) => join4(agentsDir, agentName, "sync-since");
+  return {
+    loadSince(agentName) {
+      try {
+        return readFileSync2(fileFor(agentName), "utf8").trim() || null;
+      } catch {
+        return null;
+      }
+    },
+    saveSince(agentName, since) {
+      mkdirSync3(join4(agentsDir, agentName), { recursive: true });
+      writeFileSync3(fileFor(agentName), since, "utf8");
+    }
+  };
+}
+
+// src/daemon/pull-wiring.ts
+function shouldBindHttpListener(mode) {
+  return mode !== "client";
+}
+
 // src/daemon/start-daemon.ts
 function listenAsync(server) {
   return new Promise((resolve7) => {
@@ -486,10 +525,10 @@ async function startDaemon(opts = {}) {
   const found = opts.configPath ? { path: opts.configPath } : findConfigFile(cwd);
   if (!found) throw new Error("zooid.yaml is required");
   const configDir = dirname2(found.path);
-  const base = loadZooidConfig(readFileSync2(found.path, "utf8"), { configDir });
+  const base = loadZooidConfig(readFileSync3(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`);
+  const daemonSockPath = opts.agentsDir ? join5(opts.agentsDir, "..", "run", "context.sock") : join5(tmpdir(), `zooid-context-${process.pid}.sock`);
   await mkdir(dirname2(daemonSockPath), { recursive: true }).catch(() => {
   });
   const contextSpawnRegistry = new SpawnRegistry();
@@ -527,6 +566,7 @@ async function startDaemon(opts = {}) {
     `[context] socket=${daemonSockPath} status=${contextSocket ? "listening" : "disabled"} agents={${agentNames.map((n) => `${n}:${registry.hasContextSpawn(n) ? "yes" : "no"}`).join(", ")}}`
   );
   let server = null;
+  let syncLoops;
   let stopped = false;
   let resolveStopped;
   const whenStopped = new Promise((r) => {
@@ -535,9 +575,15 @@ async function startDaemon(opts = {}) {
   const matrix = findMatrixTransport(config);
   let port;
   if (matrix) {
+    const mode = matrix.transport.mode ?? "appservice";
+    if (mode === "client" && !opts.agentsDir) {
+      throw new Error("matrix client (pull) mode requires a data dir for since-cursor persistence");
+    }
+    const cursors = opts.agentsDir ? makeSyncCursorStore(opts.agentsDir) : void 0;
     const client = new MatrixClient({
       homeserver: matrix.transport.homeserver,
-      asToken: matrix.transport.as_token
+      asToken: matrix.transport.as_token,
+      ...opts.fetch ? { fetch: opts.fetch } : {}
     });
     const mediaClient = new MediaClient({
       homeserver: matrix.transport.homeserver,
@@ -559,6 +605,9 @@ async function startDaemon(opts = {}) {
       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 nameByUserId = new Map(bindings.map((b) => [b.userId, b.name]));
     const transport = createMatrixTransport({
       agents: registry,
       approvals,
@@ -566,13 +615,25 @@ async function startDaemon(opts = {}) {
       bindings,
       hsToken: matrix.transport.hs_token,
       adminUserId: opts.adminUserId,
-      media: mediaClient
+      botUserId: asUserId,
+      media: mediaClient,
+      mode,
+      loadSince: (uid) => {
+        const name = nameByUserId.get(uid);
+        return name && cursors ? cursors.loadSince(name) : null;
+      },
+      saveSince: (uid, since) => {
+        const name = nameByUserId.get(uid);
+        if (name && cursors) cursors.saveSince(name, since);
+      }
     });
-    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}`;
+    if (shouldBindHttpListener(mode)) {
+      const requestedPort = matrix.transport.port ?? 9e3;
+      server = serve({ fetch: transport.app.fetch, port: requestedPort, hostname: "0.0.0.0" });
+      port = await listenAsync(server);
+    } else {
+      port = 0;
+    }
     const spaceLocalpart = matrix.transport.space ?? "dev";
     const adminUserIds = opts.adminUserId ? [opts.adminUserId] : [];
     let spaceRoomId;
@@ -591,6 +652,11 @@ async function startDaemon(opts = {}) {
       console.warn("[matrix] workforce space provisioning failed:", err);
     }
     await transport.bootstrap({ spaceRoomId, asUserId, adminUserIds });
+    syncLoops = transport.syncLoops;
+    if (syncLoops?.length) {
+      for (const loop of syncLoops) void loop.run();
+      console.log(`[matrix] pull mode: ${syncLoops.length} sync loop(s) running`);
+    }
     if (spaceRoomId) {
       try {
         const generalRoomId = await ensureDefaultChannel({
@@ -611,7 +677,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);
@@ -629,6 +695,10 @@ async function startDaemon(opts = {}) {
   const stop = async () => {
     if (stopped) return whenStopped;
     stopped = true;
+    try {
+      if (syncLoops) for (const loop of syncLoops) loop.stop();
+    } catch {
+    }
     try {
       if (server) await closeAsync(server);
     } catch {
@@ -773,18 +843,18 @@ function execEngine(engine, args) {
 
 // src/web/resolve.ts
 import { existsSync as existsSync3 } from "fs";
-import { dirname as dirname3, join as join5, resolve as resolve2 } from "path";
+import { dirname as dirname3, join as join7, 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 { mkdirSync as mkdirSync4, renameSync, rmSync, existsSync as existsSync2, readdirSync, writeFileSync as writeFileSync4 } from "fs";
+import { join as join6 } from "path";
 import { createHash, randomUUID as randomUUID2 } from "crypto";
 import * as tar from "tar";
-var PKG = "@zooid/zoon-web";
+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;
+  const target = join6(opts.cacheDir, opts.version);
+  if (existsSync2(join6(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(/\/$/, "");
@@ -812,11 +882,11 @@ async function fetchWebBundle(opts) {
   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");
+  const tmp = join6(opts.cacheDir, `.tmp-${randomUUID2().slice(0, 8)}`);
+  mkdirSync4(tmp, { recursive: true });
+  const tgzPath = join6(tmp, ".bundle.tgz");
   try {
-    writeFileSync3(tgzPath, tgz);
+    writeFileSync4(tgzPath, tgz);
     await tar.extract({
       file: tgzPath,
       cwd: tmp,
@@ -825,7 +895,7 @@ async function fetchWebBundle(opts) {
       filter: (p) => p === "package/dist" || p.startsWith("package/dist/")
     });
     rmSync(tgzPath);
-    if (!existsSync2(join4(tmp, "index.html"))) {
+    if (!existsSync2(join6(tmp, "index.html"))) {
       throw new Error(`${PKG}@${opts.version} tarball has no dist/index.html`);
     }
     renameSync(tmp, target);
@@ -835,7 +905,7 @@ async function fetchWebBundle(opts) {
   }
   for (const entry of readdirSync(opts.cacheDir)) {
     if (entry !== opts.version) {
-      rmSync(join4(opts.cacheDir, entry), { recursive: true, force: true });
+      rmSync(join6(opts.cacheDir, entry), { recursive: true, force: true });
     }
   }
   return target;
@@ -845,42 +915,42 @@ async function fetchWebBundle(opts) {
 var ENV_OVERRIDE = "ZOOID_DEV_WEB_ROOT_OVERRIDE";
 async function ensureWebRoot(opts) {
   const override = process.env[ENV_OVERRIDE];
-  if (override && existsSync3(join5(override, "index.html"))) return resolve2(override);
+  if (override && existsSync3(join7(override, "index.html"))) return resolve2(override);
   const fromSource = webSourcePackage(opts.cliRoot);
-  if (fromSource && existsSync3(join5(fromSource, "dist", "index.html"))) {
-    return join5(fromSource, "dist");
+  if (fromSource && existsSync3(join7(fromSource, "dist", "index.html"))) {
+    return join7(fromSource, "dist");
   }
   if (!opts.version) {
     throw new Error(
-      `No @zooid/zoon-web version pin (zooid.zoonWebVersion) in the cli package.json and no monorepo sibling build found.
+      `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/zoon-web ${opts.version}\u2026`);
+  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 = join5(workspaceRoot, "zoon", "packages", "web");
-  return existsSync3(join5(candidate, "package.json")) ? candidate : null;
+  const candidate = join7(workspaceRoot, "zooid-clients", "packages", "web");
+  return existsSync3(join7(candidate, "package.json")) ? candidate : null;
 }
 
 // src/web/pin.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { join as join6 } from "path";
+import { readFileSync as readFileSync4 } from "fs";
+import { join as join8 } from "path";
 function readZoonWebPin(cliRoot) {
   try {
-    const pkg = JSON.parse(readFileSync3(join6(cliRoot, "package.json"), "utf8"));
-    return pkg.zooid?.zoonWebVersion;
+    const pkg = JSON.parse(readFileSync4(join8(cliRoot, "package.json"), "utf8"));
+    return pkg.zooid?.webVersion;
   } catch {
     return void 0;
   }
 }
 
 // src/web/static.ts
-import { readFileSync as readFileSync4, statSync } from "fs";
-import { extname, join as join7, normalize } from "path";
+import { readFileSync as readFileSync5, statSync } from "fs";
+import { extname, join as join9, normalize } from "path";
 import { Hono as Hono2 } from "hono";
 var MIME = {
   ".html": "text/html; charset=utf-8",
@@ -906,19 +976,19 @@ function webStatic(opts) {
     const requested = decodeURIComponent(url.pathname);
     const wantFile = requested === "/" ? "/index.html" : requested;
     const safe = normalize(wantFile).replace(/^(\.\.[/\\])+/g, "");
-    const filePath = join7(opts.webRoot, safe);
+    const filePath = join9(opts.webRoot, safe);
     if (!filePath.startsWith(opts.webRoot)) return c.notFound();
     try {
       const stat = statSync(filePath);
       if (stat.isFile()) {
-        const body = readFileSync4(filePath);
+        const body = readFileSync5(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 = readFileSync4(join7(opts.webRoot, "index.html"));
+    const indexBytes = readFileSync5(join9(opts.webRoot, "index.html"));
     return c.body(indexBytes, 200, {
       "content-type": MIME[".html"]
     });
@@ -929,10 +999,10 @@ function webStatic(opts) {
 // src/web/watch.ts
 import { spawn as spawn2 } from "child_process";
 import { existsSync as existsSync4, statSync as statSync2 } from "fs";
-import { join as join8 } from "path";
+import { join as join10 } from "path";
 async function startWebWatch(opts) {
-  const distPath = join8(opts.webPackageDir, "dist");
-  const indexPath = join8(distPath, "index.html");
+  const distPath = join10(opts.webPackageDir, "dist");
+  const indexPath = join10(distPath, "index.html");
   const timeoutMs = opts.firstBuildTimeoutMs ?? 6e4;
   const spawnTime = Date.now();
   const child = spawn2(
@@ -1006,7 +1076,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 join9 } from "path";
+import { join as join11 } from "path";
 function localDateSlug(d) {
   const y = d.getFullYear();
   const m = String(d.getMonth() + 1).padStart(2, "0");
@@ -1016,19 +1086,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 = join9(dataDir, "logs");
-  const dayDir = join9(logsDir, slug);
+  const logsDir = join11(dataDir, "logs");
+  const dayDir = join11(logsDir, slug);
   return {
     dataDir,
     logsDir,
     dayDir,
     daySlug: slug,
-    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`)
+    todayLink: join11(logsDir, "today"),
+    tuwunelLog: join11(dayDir, "tuwunel.log"),
+    daemonLog: join11(dayDir, "daemon.log"),
+    devLog: join11(dayDir, "dev.log"),
+    agentLog: (n) => join11(dayDir, `agent-${n}.log`),
+    agentTap: (n) => join11(dayDir, `agent-${n}.acp.jsonl`)
   };
 }
 async function ensureDayFolder(p) {
@@ -1041,7 +1111,7 @@ async function ensureDayFolder(p) {
 }
 async function pruneOldDays(opts) {
   if (opts.retainDays <= 0) return [];
-  const logsDir = join9(opts.dataDir, "logs");
+  const logsDir = join11(opts.dataDir, "logs");
   let entries;
   try {
     entries = await readdir(logsDir);
@@ -1060,7 +1130,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(join9(logsDir, name), { recursive: true, force: true });
+      await rm(join11(logsDir, name), { recursive: true, force: true });
       removed.push(name);
     }
   }
@@ -1210,7 +1280,7 @@ var CLI_ROOT = (() => {
     const pkgPath = resolve3(dir, "package.json");
     if (existsSync5(pkgPath)) {
       try {
-        const pkg = JSON.parse(readFileSync5(pkgPath, "utf8"));
+        const pkg = JSON.parse(readFileSync6(pkgPath, "utf8"));
         if (pkg.name === "zooid" || pkg.name === "@zooid/cli") return dir;
       } catch {
       }
@@ -1233,7 +1303,7 @@ async function runDev(flags) {
   const tokens = ensureTokens(paths.envPath);
   process.env.MATRIX_AS_TOKEN = tokens.asToken;
   process.env.MATRIX_HS_TOKEN = tokens.hsToken;
-  const rawYaml = readFileSync5(found.path, "utf8");
+  const rawYaml = readFileSync6(found.path, "utf8");
   const preview = loadZooidConfig(rawYaml, { configDir: dirname6(found.path) });
   const matrix = findMatrixTransport(preview);
   if (!matrix) {
@@ -1327,14 +1397,14 @@ async function runDev(flags) {
       },
       ...flags.watchWeb ? [
         {
-          title: "Start @zooid/zoon-web watcher (vite build --watch)",
+          title: "Start @zooid/web watcher (vite build --watch)",
           task: async () => {
             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: @zooid/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 });
@@ -1342,11 +1412,11 @@ Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
         }
       ] : [],
       {
-        title: `Serve @zooid/zoon-web on http://localhost:${flags.uiPort}`,
+        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"),
+            cacheDir: join12(layout.dataRoot, "web"),
             version: readZoonWebPin(CLI_ROOT),
             onProgress: (msg) => {
               t.output = msg;
@@ -1397,10 +1467,10 @@ Pass an explicit path: --watch-web=/path/to/zoon/packages/web`
     [
       "",
       chalk.bold("Tuwunel is up.") + ` ${homeserver}`,
-      chalk.bold("UI:        ") + ` http://localhost:${flags.uiPort}`,
+      chalk.bold("UI:        ") + ` http://localhost:${ctx.uiServer?.address()?.port ?? 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 @zooid/zoon-web)`] : [],
+      ...ctx.webWatch ? [`  ${chalk.cyan("web watcher:")} live (vite build --watch on @zooid/web)`] : [],
       "",
       chalk.dim("Press Ctrl-C to stop."),
       ""
@@ -1424,15 +1494,21 @@ function loadEnvFiles(cwd) {
 }
 
 // src/commands/init.ts
-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";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, readdirSync as readdirSync2, writeFileSync as writeFileSync5 } from "fs";
+import { dirname as dirname7, join as join14, resolve as resolve4 } from "path";
 
 // src/commands/init/generators.ts
 function generateZooidYaml(opts) {
-  const acpBlock = opts.preset === "opencode" ? `    acp: { preset: opencode }` : `    acp:
+  const acpBlock = opts.preset === "opencode" || !opts.model ? `    acp: { preset: ${opts.preset} }` : `    acp:
       preset: ${opts.preset}
       model: ${opts.model}`;
   return `runtime: local
+workstation: dev
+
+# This daemon connects in push mode: the homeserver reaches the listener on
+# \`port\` below. To run it against a homeserver it can't open a port to \u2014
+# e.g. on your laptop, behind NAT \u2014 switch to pull mode: set \`mode: client\`
+# under transports.matrix and drop \`port\`. Agents are reachable either way.
 
 transports:
   matrix:
@@ -1489,23 +1565,20 @@ function generateOpencodeJson(opts) {
     return JSON.stringify(
       {
         $schema: "https://opencode.ai/config.json",
-        model: "TODO/your-model",
         provider: { TODO: { options: {} } }
       },
       null,
       2
     ) + "\n";
   }
-  const cfg = {
-    $schema: "https://opencode.ai/config.json",
-    model: `${opts.provider}/${opts.model}`,
-    provider: {
-      [opts.provider]: {
-        options: { apiKey: `{env:${opts.apiKeyEnvVar}}` }
-      }
-    },
-    permission: { webfetch: "allow" }
+  const cfg = { $schema: "https://opencode.ai/config.json" };
+  if (opts.model) cfg.model = `${opts.provider}/${opts.model}`;
+  cfg.provider = {
+    [opts.provider]: {
+      options: { apiKey: `{env:${opts.apiKeyEnvVar}}` }
+    }
   };
+  cfg.permission = { webfetch: "allow" };
   return JSON.stringify(cfg, null, 2) + "\n";
 }
 function generateEnv(opts) {
@@ -1525,7 +1598,6 @@ provider-specific options and per-tool permissions.
 var SIMPLE_PRESETS = [
   {
     preset: "claude",
-    models: ["claude-sonnet-4-6", "claude-opus-4-7", "claude-haiku-4-5"],
     subscriptionLabel: "Claude subscription (Pro / Max / Team / Enterprise)",
     apiKeyEnvVar: "ANTHROPIC_API_KEY",
     apiKeyPromptLabel: "Anthropic",
@@ -1533,7 +1605,6 @@ var SIMPLE_PRESETS = [
   },
   {
     preset: "codex",
-    models: ["gpt-5.5"],
     subscriptionLabel: "ChatGPT subscription (Plus / Pro / Team)",
     apiKeyEnvVar: "OPENAI_API_KEY",
     apiKeyPromptLabel: "OpenAI",
@@ -1545,28 +1616,24 @@ var OPENCODE_PROVIDERS = [
     id: "opencode-go",
     label: "opencode-go",
     description: "$10/mo subscription \u2014 Kimi, GLM, MiniMax",
-    models: ["kimi-k2.6", "kimi-k2.5", "glm-5.1", "glm-5", "minimax-m2.7"],
     apiKeyEnvVar: "OPENCODE_API_KEY"
   },
   {
     id: "opencode",
     label: "opencode (Zen)",
     description: "free tier \u2014 curated models",
-    models: ["kimi-k2.5-free", "glm-4.7-free", "minimax-m2.1-free"],
     apiKeyEnvVar: "OPENCODE_API_KEY"
   },
   {
     id: "anthropic",
     label: "Anthropic",
     description: "Claude via direct Anthropic API",
-    models: ["claude-sonnet-4-6", "claude-opus-4-7", "claude-haiku-4-5"],
     apiKeyEnvVar: "ANTHROPIC_API_KEY"
   },
   {
     id: "openrouter",
     label: "OpenRouter",
     description: "many providers via OpenRouter",
-    models: ["anthropic/claude-sonnet-4-6", "zhipuai/glm-5", "moonshot/kimi-k2.6"],
     apiKeyEnvVar: "OPENROUTER_API_KEY"
   }
 ];
@@ -1580,11 +1647,11 @@ function findOpencodeProvider(id) {
 // src/commands/init/sniff.ts
 import { existsSync as existsSync6 } from "fs";
 import { homedir } from "os";
-import { join as join11 } from "path";
+import { join as join13 } from "path";
 function sniffCredentials(preset, home = homedir()) {
   const meta = findSimplePreset(preset);
   if (!meta) return { found: false };
-  const full = join11(home, meta.credentialDir);
+  const full = join13(home, meta.credentialDir);
   if (existsSync6(full)) return { found: true, path: full };
   return { found: false };
 }
@@ -1603,7 +1670,7 @@ var IGNORED_PREEXISTING = /* @__PURE__ */ new Set([
 ]);
 async function runInit(opts) {
   const dir = resolve4(opts.dir);
-  mkdirSync4(dir, { recursive: true });
+  mkdirSync5(dir, { recursive: true });
   if (!opts.force) {
     const blocking = readdirSync2(dir).filter((n) => !IGNORED_PREEXISTING.has(n));
     if (blocking.length > 0) {
@@ -1614,7 +1681,6 @@ async function runInit(opts) {
   }
   const writes = [];
   if (opts.preset === "claude" || opts.preset === "codex") {
-    if (!opts.model) throw new Error(`--model is required for preset ${opts.preset}`);
     if (!opts.auth) throw new Error("--auth (subscription|api-key) is required for claude/codex");
     const meta = findSimplePreset(opts.preset);
     writes.push({
@@ -1644,7 +1710,6 @@ async function runInit(opts) {
     const isCustom = opts.provider === "custom";
     const providerMeta = isCustom ? void 0 : findOpencodeProvider(opts.provider);
     if (!isCustom && !providerMeta) throw new Error(`unknown opencode provider: ${opts.provider}`);
-    if (!isCustom && !opts.model) throw new Error("--model is required (paired with --provider)");
     if (!isCustom && !opts.apiKey) throw new Error("--api-key is required for opencode");
     writes.push({ path: "zooid.yaml", content: generateZooidYaml({ preset: "opencode" }) });
     writes.push({ path: "agents/zooid-assistant/AGENTS.md", content: generateAgentsMd() });
@@ -1672,14 +1737,14 @@ async function runInit(opts) {
   }
   writes.push({ path: ".gitignore", content: generateGitignore() });
   for (const w of writes) {
-    const full = join12(dir, w.path);
+    const full = join14(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;
     }
-    mkdirSync4(dirname7(full), { recursive: true });
-    writeFileSync4(full, w.content);
+    mkdirSync5(dirname7(full), { recursive: true });
+    writeFileSync5(full, w.content);
     console.log(`\u2713 Created ${w.path}`);
   }
   if ((opts.preset === "claude" || opts.preset === "codex") && opts.auth === "subscription") {
@@ -1715,19 +1780,7 @@ async function resolveOptions(flags) {
     () => "--preset is required (claude | codex | opencode)"
   );
   if (preset === "opencode") {
-    const provider = flags.provider ?? await ask(
-      () => select({
-        message: "Which provider?",
-        choices: [
-          ...OPENCODE_PROVIDERS.map((p) => ({
-            name: `${p.label}  (${p.description})`,
-            value: p.id
-          })),
-          { name: "custom (write your own opencode.json block)", value: "custom" }
-        ]
-      }),
-      () => "--provider is required for opencode"
-    );
+    const provider = flags.provider ?? "opencode-go";
     if (provider === "custom") {
       return {
         dir: flags.dir,
@@ -1739,13 +1792,6 @@ async function resolveOptions(flags) {
     }
     const meta2 = findOpencodeProvider(provider);
     if (!meta2) throw new Error(`unknown opencode provider: ${provider}`);
-    const model2 = flags.model ?? await ask(
-      () => select({
-        message: "Which model?",
-        choices: meta2.models.map((m) => ({ name: m, value: m }))
-      }),
-      () => "--model is required"
-    );
     const apiKey2 = flags.apiKey ?? await ask(
       () => password({ message: `${meta2.label} API key:` }),
       () => "--api-key is required"
@@ -1754,7 +1800,7 @@ async function resolveOptions(flags) {
       dir: flags.dir,
       preset,
       provider,
-      model: model2,
+      model: flags.model,
       apiKey: apiKey2,
       force: flags.force,
       overwrite: flags.overwrite
@@ -1772,13 +1818,6 @@ async function resolveOptions(flags) {
     }),
     () => "--auth is required (subscription | api-key)"
   );
-  const model = flags.model ?? await ask(
-    () => select({
-      message: "Which model?",
-      choices: meta.models.map((m) => ({ name: m, value: m }))
-    }),
-    () => "--model is required"
-  );
   const apiKey = auth === "api-key" ? flags.apiKey ?? await ask(
     () => password({ message: `${meta.apiKeyPromptLabel} API key:` }),
     () => "--api-key is required when --auth=api-key"
@@ -1787,7 +1826,7 @@ async function resolveOptions(flags) {
     dir: flags.dir,
     preset,
     auth,
-    model,
+    model: flags.model,
     apiKey,
     force: flags.force,
     overwrite: flags.overwrite
@@ -1797,7 +1836,7 @@ async function resolveOptions(flags) {
 // src/commands/logs.ts
 import { readFile, readdir as readdir2, readlink } from "fs/promises";
 import { existsSync as existsSync8 } from "fs";
-import { join as join13 } from "path";
+import { join as join15 } from "path";
 var KNOWN_SOURCES = ["tuwunel", "daemon", "dev"];
 async function runLogs(flags) {
   const writer = flags.writer ?? ((s) => process.stdout.write(s));
@@ -1816,7 +1855,7 @@ async function runLogs(flags) {
     writer("no logs yet\n");
     return;
   }
-  const dayDir = join13(flags.dataDir, "logs", day);
+  const dayDir = join15(flags.dataDir, "logs", day);
   if (!existsSync8(dayDir)) {
     writer(`no logs for ${day}
 `);
@@ -1845,7 +1884,7 @@ async function runLogs(flags) {
   writer(await readFile(path, "utf8"));
 }
 async function resolveTodaySlug(dataDir) {
-  const link = join13(dataDir, "logs", "today");
+  const link = join15(dataDir, "logs", "today");
   try {
     return await readlink(link);
   } catch {
@@ -1854,18 +1893,18 @@ async function resolveTodaySlug(dataDir) {
 }
 function resolveSourcePath(dayDir, source) {
   if (source.startsWith("agent-")) {
-    if (source.endsWith(".acp")) return join13(dayDir, `${source.slice(0, -4)}.acp.jsonl`);
-    return join13(dayDir, `${source}.log`);
+    if (source.endsWith(".acp")) return join15(dayDir, `${source.slice(0, -4)}.acp.jsonl`);
+    return join15(dayDir, `${source}.log`);
   }
   if (KNOWN_SOURCES.includes(source))
-    return join13(dayDir, `${source}.log`);
-  return join13(dayDir, source);
+    return join15(dayDir, `${source}.log`);
+  return join15(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(join13(dayDir, f), "utf8");
+    const text = await readFile(join15(dayDir, f), "utf8");
     for (const line of text.split("\n")) {
       if (!line) continue;
       try {
@@ -1899,7 +1938,7 @@ async function runStart(flags) {
 }
 
 // src/commands/status.ts
-import { readFileSync as readFileSync6 } from "fs";
+import { readFileSync as readFileSync7 } from "fs";
 import { dirname as dirname8 } from "path";
 import chalk2 from "chalk";
 async function probe(url, timeoutMs = 2e3) {
@@ -1924,7 +1963,7 @@ async function collectStatus(opts) {
       agents: []
     };
   }
-  const cfg = loadZooidConfig(readFileSync6(found.path, "utf8"), {
+  const cfg = loadZooidConfig(readFileSync7(found.path, "utf8"), {
     configDir: dirname8(found.path)
   });
   const matrixEntry = Object.entries(cfg.transports).find(
@@ -1955,7 +1994,7 @@ async function runStatus(flags) {
   if (port === void 0) {
     const found = findConfigFile(cwd);
     if (found) {
-      const cfg = loadZooidConfig(readFileSync6(found.path, "utf8"), {
+      const cfg = loadZooidConfig(readFileSync7(found.path, "utf8"), {
         configDir: dirname8(found.path)
       });
       const matrix = findMatrixTransport(cfg);
@@ -1992,7 +2031,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 @zooid/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,