zooid 0.7.1 → 0.7.3

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-SUPTPSN3.js";
+} from "./chunk-3IKBBKGI.js";
 
 // src/bin.ts
 import { resolve as resolve5 } from "path";
@@ -557,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({
@@ -570,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,
@@ -633,6 +648,9 @@ async function startDaemon(opts = {}) {
 
 // src/services/tuwunel.ts
 import { spawn } from "child_process";
+import { execFile as execFile2 } from "child_process";
+import { promisify as promisify2 } from "util";
+var execFileAsync = promisify2(execFile2);
 var DEFAULT_IMAGE = "ghcr.io/matrix-construct/tuwunel:latest";
 function buildRunArgs(opts) {
   const image = opts.image ?? DEFAULT_IMAGE;
@@ -680,6 +698,16 @@ var TuwunelService = class {
   }
   async waitHealthy(opts) {
     const deadline = Date.now() + opts.timeoutMs;
+    while (Date.now() < deadline) {
+      const state = await this.inspectState().catch(() => null);
+      if (state?.status === "running") break;
+      if (state?.status === "exited") {
+        throw new Error(
+          `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));
+    }
     while (Date.now() < deadline) {
       try {
         const r = await fetch(`${opts.url}/_matrix/client/versions`);
@@ -688,10 +716,35 @@ var TuwunelService = class {
       }
       await new Promise((resolve6) => setTimeout(resolve6, 500));
     }
+    const finalState = await this.inspectState().catch(() => null);
+    const detail = finalState ? ` (container status=${finalState.status}${finalState.exitCode !== void 0 ? `, exit=${finalState.exitCode}` : ""})` : "";
     throw new Error(
-      `Tuwunel did not become healthy at ${opts.url} in ${opts.timeoutMs}ms`
+      `Tuwunel did not become healthy at ${opts.url} in ${opts.timeoutMs}ms${detail}`
     );
   }
+  /**
+   * Read the engine's view of the container. Returns null if the container
+   * isn't known to the engine (e.g. before spawn completed or after `--rm`).
+   */
+  async inspectState() {
+    try {
+      const { stdout } = await execFileAsync(this.opts.engine, [
+        "inspect",
+        this.opts.name,
+        "--format",
+        "{{.State.Status}}|{{.State.ExitCode}}|{{.State.Error}}"
+      ]);
+      const [status, exitCodeRaw, error] = stdout.trim().split("|");
+      const exitCode = exitCodeRaw && exitCodeRaw !== "<no value>" ? Number(exitCodeRaw) : void 0;
+      return {
+        status: status ?? "unknown",
+        ...Number.isFinite(exitCode) ? { exitCode } : {},
+        ...error ? { error } : {}
+      };
+    } catch {
+      return null;
+    }
+  }
 };
 function execEngine(engine, args) {
   return new Promise((resolve6, reject) => {
@@ -1132,7 +1185,7 @@ async function runDev(flags) {
         title: "Wait for Tuwunel /_matrix/client/versions",
         task: async () => {
           if (!ctx.svc) throw new Error("service not started");
-          await ctx.svc.waitHealthy({ url: homeserver, timeoutMs: 6e4 });
+          await ctx.svc.waitHealthy({ url: homeserver, timeoutMs: 18e4 });
         }
       },
       {