zooid 0.14.0 → 0.15.0

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-35IKQPC5.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);
@@ -871,9 +893,25 @@ var MAX_BODY2 = 1e6;
 var MAX_OUTPUT_CHARS = 6e4;
 var TRUNCATION_MARKER = "\n\n\u2026 (truncated)";
 var DELIVERY_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
-var EVENT_HEADER_BY_PROVIDER = {
-  github: "x-github-event"
+var EVENT_SOURCE_BY_PROVIDER = {
+  github: { header: "x-github-event" },
+  stripe: { path: ["type"] },
+  standard: { path: ["type"] },
+  slack: { path: ["event", "type"] }
 };
+function stringAt(body, path) {
+  let cursor = body;
+  for (const key of path) {
+    if (typeof cursor !== "object" || cursor === null) return void 0;
+    cursor = cursor[key];
+  }
+  return typeof cursor === "string" ? cursor : void 0;
+}
+function eventNameFor(provider, headers, body) {
+  const source = EVENT_SOURCE_BY_PROVIDER[provider];
+  if (!source) return void 0;
+  return "header" in source ? headers[source.header] : stringAt(body, source.path);
+}
 var DELIVERY_ID_HEADER_BY_PROVIDER = {
   github: "x-github-delivery",
   standard: "webhook-id"
@@ -924,14 +962,13 @@ async function handleDelivery(deps, name, trigger, raw, headers, cache, customDe
     const idHeader = DELIVERY_ID_HEADER_BY_PROVIDER[webhook.provider];
     const deliveryId = customDeliveryId ?? (idHeader ? headers[idHeader] : void 0);
     if (deliveryId !== void 0 && cache.seen(`${name}:${deliveryId}`)) return;
-    const eventHeader = EVENT_HEADER_BY_PROVIDER[webhook.provider];
-    const event = eventHeader ? headers[eventHeader] : void 0;
     let body;
     try {
       body = JSON.parse(raw);
     } catch {
       body = void 0;
     }
+    const event = eventNameFor(webhook.provider, headers, body);
     const ctx = {
       event,
       body,
@@ -940,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) {
@@ -1222,7 +1255,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}`);
@@ -1266,7 +1300,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)`);
@@ -1302,7 +1337,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;