zooid 0.14.1 → 0.16.0

package/README.md

@@ -42,7 +42,7 @@ zooid dev
 
 > **Prerequisite:** `zooid dev` runs Tuwunel inside a container, so you need a container engine installed and running first — either **Docker** (with the daemon started) or **Podman** aliased as `docker`.
 
-`zooid dev` starts a Tuwunel Matrix homeserver in a container, generates the Application Service registration, registers an `admin:admin` user, runs the daemon, and serves the [Zooid web client](https://github.com/zooid-ai/clients).
+`zooid dev` starts a Tuwunel Matrix homeserver in a container, generates the Application Service registration, registers an `admin:admin` user, runs the daemon, and serves the [Zooid web client](https://github.com/zooid-ai/clients). The client's runtime settings come from a generated `/config.json`; its `workforce_space` field is the `matrix.space` alias localpart from `zooid.yaml` (default `dev`). A static deployment sets `workforce_space` in the `config.json` it serves beside the bundle — there is no build-time variable.
 
 Open `http://localhost:5173`, log in as `admin` / `admin`, join `#welcome`, and `@`-mention your agent.
 

package/dist/bin.js

@@ -5,6 +5,7 @@ import {
   MediaClient,
   SpawnRegistry,
   buildAcpRegistry,
+  buildMentionContent,
   contextEligibleAgents,
   createMatrixTransport,
   ensureDefaultChannel,
@@ -19,7 +20,7 @@ import {
   renderTemplate,
   startAgentSocketServers,
   startWorkforcePublisher
-} from "./chunk-R5S26T7B.js";
+} from "./chunk-HE7DVDJA.js";
 
 // src/bin.ts
 import { resolve as resolve8 } from "path";
@@ -697,9 +698,15 @@ function shouldBindHttpListener(mode) {
 import { Cron } from "croner";
 
 // src/daemon/trigger-runner.ts
+var warnedTargets = /* @__PURE__ */ new Set();
 async function fireTrigger(deps) {
-  const { name, as, message, agentUserId, resolveRoom, ensureBot, sendMessage } = deps;
+  const { name, as, message, agentUserIds, resolveRoom, ensureBot, sendMessage, getJoinedMembers } = deps;
   try {
+    const target = message.mention.startsWith("@") ? message.mention : agentUserIds[message.mention];
+    if (!target) {
+      console.warn(`[trigger:${name}] unknown agent "${message.mention}" \u2014 skipping`);
+      return;
+    }
     const roomId = await resolveRoom(message.room);
     if (!roomId) {
       console.warn(`[trigger:${name}] cannot resolve room ${message.room} \u2014 skipping`);
@@ -710,13 +717,24 @@ async function fireTrigger(deps) {
       roomId,
       asUserId: as,
       content: {
-        msgtype: "m.text",
-        body: message.text,
-        // Structural mention: routes deterministically AND disarms the raw-body
-        // fallback in extractMentions, which only fires when nothing matched.
-        "m.mentions": { user_ids: [agentUserId] }
+        ...buildMentionContent({ userId: target, text: message.text, msgtype: "m.text" }),
+        "dev.zooid.trigger": {
+          name,
+          fired_at: Date.now(),
+          ...message.ttlMs !== void 0 ? { ttl_ms: message.ttlMs } : {}
+        }
       }
     });
+    if (getJoinedMembers) {
+      const { joined } = await getJoinedMembers(roomId, as);
+      const key = `${name}|${target}`;
+      if (!(target in joined) && !warnedTargets.has(key)) {
+        warnedTargets.add(key);
+        console.warn(
+          `[trigger:${name}] ${target} is not in ${message.room} \u2014 nothing will handle this unless that agent joins before the message expires`
+        );
+      }
+    }
   } catch (err) {
     console.warn(`[trigger:${name}] failed:`, err.message);
   }
@@ -731,18 +749,22 @@ function validateCron(name, expr) {
   }
 }
 function startTriggerScheduler(deps) {
-  const { triggers, agentUserIds, resolveRoom, ensureBot, sendMessage } = deps;
+  const { triggers, agentUserIds, resolveRoom, ensureBot, sendMessage, getJoinedMembers } = deps;
   const jobs = [];
   for (const [name, trigger] of Object.entries(triggers)) {
     if (!trigger.schedule) continue;
     const job = new Cron(trigger.schedule, () => {
       for (const message of trigger.messages) {
-        const agentUserId = agentUserIds[message.mention];
-        if (!agentUserId) {
-          console.warn(`[trigger:${name}] unknown agent "${message.mention}" \u2014 skipping`);
-          continue;
-        }
-        void fireTrigger({ name, as: trigger.as, message, agentUserId, resolveRoom, ensureBot, sendMessage });
+        void fireTrigger({
+          name,
+          as: trigger.as,
+          message,
+          agentUserIds,
+          resolveRoom,
+          ensureBot,
+          sendMessage,
+          getJoinedMembers
+        });
       }
     });
     jobs.push(job);
@@ -955,19 +977,15 @@ async function handleDelivery(deps, name, trigger, raw, headers, cache, customDe
     };
     for (const message of trigger.messages) {
       if (message.match !== void 0 && !evaluateMatch(message.match, ctx)) continue;
-      const agentUserId = deps.agentUserIds[message.mention];
-      if (!agentUserId) {
-        console.warn(`[webhook:${name}] unknown agent "${message.mention}" \u2014 skipping`);
-        continue;
-      }
       await fireTrigger({
         name,
         as: trigger.as,
         message: { ...message, text: renderTemplate(message.text, ctx) },
-        agentUserId,
+        agentUserIds: deps.agentUserIds,
         resolveRoom: deps.resolveRoom,
         ensureBot: deps.ensureBot,
-        sendMessage: deps.sendMessage
+        sendMessage: deps.sendMessage,
+        getJoinedMembers: deps.getJoinedMembers
       });
     }
   } catch (err) {
@@ -1095,6 +1113,7 @@ async function startDaemon(opts = {}) {
   const registry = buildAcpRegistry(config, {
     approvals,
     onTap: opts.onTap,
+    onLifecycle: opts.onLifecycle,
     agentsDir: opts.agentsDir,
     contextSpawnRegistry,
     daemonSockPaths: contextSockets.paths,
@@ -1237,7 +1256,8 @@ async function startDaemon(opts = {}) {
           agentUserIds,
           resolveRoom,
           ensureBot,
-          sendMessage: (m) => client.sendMessage(m)
+          sendMessage: (m) => client.sendMessage(m),
+          getJoinedMembers: (roomId, asUserId2) => client.getJoinedMembers(roomId, asUserId2)
         });
         for (const [name] of webhookTriggers) {
           console.log(`[webhook] POST ${WEBHOOK_ROUTE_PREFIX}/${name}`);
@@ -1281,7 +1301,8 @@ async function startDaemon(opts = {}) {
         agentUserIds,
         resolveRoom,
         ensureBot,
-        sendMessage: (m) => client.sendMessage(m)
+        sendMessage: (m) => client.sendMessage(m),
+        getJoinedMembers: (roomId, asUserId2) => client.getJoinedMembers(roomId, asUserId2)
       });
       const scheduled = Object.values(config.triggers).filter((t) => t.schedule).length;
       if (scheduled > 0) console.log(`[trigger] scheduled ${scheduled} trigger(s)`);
@@ -1317,7 +1338,8 @@ async function startDaemon(opts = {}) {
           client,
           spaceRoomId,
           asUserId,
-          getAgents: () => bindings
+          getAgents: () => bindings,
+          stateKey: matrix.transport.workstation ?? ""
         });
         console.log(`[matrix] published dev.zooid.workforce (${bindings.length} agents)`);
         void publisher;
@@ -1637,6 +1659,7 @@ function webStatic(opts) {
     "/config.json",
     (c) => c.json({
       homeserver_url: opts.homeserverUrl,
+      ...opts.workforceSpace ? { workforce_space: opts.workforceSpace } : {},
       ...opts.pushGatewayUrl ? { push_gateway_url: opts.pushGatewayUrl } : {},
       ...opts.vapidPublicKey ? { vapid_public_key: opts.vapidPublicKey } : {}
     })
@@ -1873,6 +1896,12 @@ function wireAgentCapture(opts) {
   const sink = new JsonlSink(opts.paths.agentTap(opts.agent));
   const now = opts.now ?? (() => /* @__PURE__ */ new Date());
   const pending = [];
+  const counters = {
+    closeAttempts: 0,
+    closeSuccesses: 0,
+    sessionsReclaimed: 0,
+    recoveries: { cached: 0, resume: 0, load: 0, new: 0 }
+  };
   const onTap = (event) => {
     if (event.kind === "session_update") {
       const variant = event.update.sessionUpdate ?? "unknown";
@@ -1894,6 +1923,25 @@ function wireAgentCapture(opts) {
   };
   return {
     onTap,
+    onLifecycle: (event) => {
+      if (event.reason && event.outcome !== "unsupported") counters.closeAttempts++;
+      if (event.reason && event.outcome === "closed") {
+        counters.closeSuccesses++;
+        counters.sessionsReclaimed++;
+      }
+      if (event.outcome === "recovered" && event.recoveryMethod) counters.recoveries[event.recoveryMethod]++;
+      pending.push(sink.write({
+        ts: now().toISOString(),
+        agent: opts.agent,
+        kind: "session_lifecycle",
+        session_key: event.sessionKey,
+        session_id: event.sessionId,
+        reason: event.reason,
+        outcome: event.outcome,
+        recovery_method: event.recoveryMethod
+      }));
+    },
+    readLifecycleCounters: () => ({ ...counters, recoveries: { ...counters.recoveries } }),
     close: async () => {
       await Promise.all(pending);
       await sink.close();
@@ -2059,6 +2107,7 @@ async function runDev(flags) {
             // the web client without needing an invite.
             publicWorkforceSpace: true,
             onTap: (agentName, event) => captures[agentName]?.onTap(event),
+            onLifecycle: (agentName, event) => captures[agentName]?.onLifecycle(event),
             prepullLog: (line) => {
               t.output = line.replace(/^\[zooid\]\s+/, "").trim();
             }
@@ -2095,6 +2144,8 @@ Pass an explicit path: --watch-web=/path/to/zooid-clients/packages/web`
           const app = webStatic({
             webRoot,
             homeserverUrl: homeserver,
+            // Same default as the daemon's space provisioning (start-daemon.ts).
+            workforceSpace: matrix.transport.space ?? "dev",
             ...ctx.daemon?.vapidPublicKey ? {
               // Tuwunel runs in a container; `localhost` here would
               // resolve to the container, not the daemon. Same shorthand
@@ -2757,6 +2808,22 @@ async function dumpByTurn(dayDir, turnId, writer) {
 // src/commands/start.ts
 import { randomBytes as randomBytes2 } from "crypto";
 import { resolve as resolve6 } from "path";
+
+// src/observability/lifecycle-log.ts
+function formatLifecycleLine(agentName, event) {
+  if (event.outcome === "unsupported") return null;
+  if (event.recoveryMethod === "cached") return null;
+  const what = event.outcome === "recovered" ? `recovered (${event.recoveryMethod ?? "unknown"})` : `${event.reason ?? "close"} \u2192 ${event.outcome}`;
+  return `[lifecycle] ${agentName} key=${event.sessionKey} session=${event.sessionId} ${what}`;
+}
+function logLifecycle(agentName, event, out = console) {
+  const line = formatLifecycleLine(agentName, event);
+  if (!line) return;
+  if (event.outcome === "failed") out.error(line);
+  else out.log(line);
+}
+
+// src/commands/start.ts
 async function runStart(flags) {
   if (flags.printToken) {
     process.stdout.write(`${randomBytes2(32).toString("hex")}
@@ -2768,7 +2835,8 @@ async function runStart(flags) {
   const handle = await startDaemon({
     cliFlags: flags,
     installSignalHandlers: true,
-    agentsDir: layout.agentsDir
+    agentsDir: layout.agentsDir,
+    onLifecycle: (agentName, event) => logLifecycle(agentName, event)
   });
   console.log(`zooid listening on http://localhost:${handle.port}`);
   for (const name of handle.agentNames) console.log(`  agent: ${name}`);