commonswarm 0.1.32 → 0.1.33

package/cswarm.cjs

@@ -29586,6 +29586,7 @@ var DeliveryReceiptReadError = class extends Error {
 var ACK_OUTCOMES = /* @__PURE__ */ new Set([
   "replied",
   "observed",
+  "queued",
   "expired",
   "failed_terminal"
 ]);
@@ -29795,6 +29796,7 @@ function signalReceiptCliState(receipt, nowMs) {
   if (state === "enqueued") return "not_delivered";
   if (state === "leased") return "working";
   if (state === "delivered") return "delivered";
+  if (state === "queued") return "queued";
   return "finished";
 }
 function receiptCheckCommand(report) {
@@ -29834,6 +29836,13 @@ function renderSignalReceiptReport(report, nowMs = Date.now()) {
         `Check for the outcome with: ${receiptCheckCommand(report)}`
       ].join("\n");
     }
+    if (state === "queued") {
+      return [
+        `Queued for agent ${receipt.recipient_agent_principal_id}'s interactive session ${relativeAge(receipt.acked_at, nowMs)}. The agent has not seen it yet.`,
+        "It will appear at the agent's next prompt.",
+        `Check again with: ${receiptCheckCommand(report)}`
+      ].join("\n");
+    }
     const finished = `Agent ${receipt.recipient_agent_principal_id} finished with outcome ${state} ${relativeAge(receipt.acked_at, nowMs)}.`;
     if (state === "replied") {
       return [
@@ -29844,7 +29853,7 @@ function renderSignalReceiptReport(report, nowMs = Date.now()) {
     if (state === "observed") {
       return [
         finished,
-        "The agent acknowledged the signal without sending a reply.",
+        "The agent saw the signal without sending a reply.",
         `If you need an answer, send a new ask with: ${newAskCommand(report, receipt)}`
       ].join("\n");
     }
@@ -34330,6 +34339,7 @@ var SENDER_OWNER_RELATIONS2 = /* @__PURE__ */ new Set([
 var DELIVERY_ACK_OUTCOMES = /* @__PURE__ */ new Set([
   "replied",
   "observed",
+  "queued",
   "expired",
   "failed_terminal"
 ]);
@@ -34376,6 +34386,10 @@ var DELIVERY_SERVER_ERROR_CODES = Object.freeze([
   "internal_error"
 ]);
 var DELIVERY_UNKNOWN_ERROR_CODE = "unknown_error";
+function observationCommandId(signalId) {
+  checkedUuidRequest(signalId, "signalId");
+  return `observe_${signalId.toLowerCase().replaceAll("-", "")}`;
+}
 var DeliveryTransportError = class extends Error {
   constructor(message) {
     super(message);
@@ -34672,7 +34686,7 @@ function assertAckRequest(request) {
   checkedUuidRequest(request.listenerInstanceId, "listenerInstanceId");
   if (!DELIVERY_ACK_OUTCOMES.has(request.outcome)) {
     throw new Error(
-      "a delivery outcome must be replied, observed, expired, or failed_terminal"
+      "a delivery outcome must be replied, observed, queued, expired, or failed_terminal"
     );
   }
   if (request.outcome === "failed_terminal") {
@@ -34864,6 +34878,34 @@ var DeliveryCommandClient = class {
       outcome: request.outcome
     };
   }
+  /** Mark a queued delivery observed only after the interactive hook surfaced it. */
+  async observeQueuedAgentDelivery(request) {
+    checkedCommandId(request.commandId);
+    assertAgentToken(request.credential);
+    checkedUuidRequest(request.workspaceId, "workspaceId");
+    checkedUuidRequest(request.signalId, "signalId");
+    const { response, text } = await this.post(request, {
+      kind: "ack_agent_delivery",
+      signal_id: request.signalId.toLowerCase(),
+      lease_id: null,
+      listener_instance_id: null,
+      outcome: "observed",
+      last_error_code: null
+    }, "delivery observation");
+    if (!response.ok) throw refusal(response, text);
+    parseAckSuccess(
+      successBody(response, text, "delivery observation"),
+      {
+        signalId: request.signalId.toLowerCase(),
+        outcome: "observed"
+      }
+    );
+    return {
+      httpStatus: response.status,
+      signalId: request.signalId.toLowerCase(),
+      outcome: "observed"
+    };
+  }
 };
 
 // src/listener/main-routing.ts
@@ -34917,12 +34959,13 @@ function parseEntry(value) {
     "senderName",
     "body",
     "createdAt",
-    "queuedAt"
+    "queuedAt",
+    "observationPending"
   ]);
   if (Object.keys(row).some((key2) => !allowed.has(key2))) {
     throw new Error("stored pending-for-main entry is malformed");
   }
-  if (typeof row.signalId !== "string" || !UUID_RE12.test(row.signalId) || typeof row.workspaceId !== "string" || !UUID_RE12.test(row.workspaceId) || typeof row.principalId !== "string" || !UUID_RE12.test(row.principalId) || typeof row.fromId !== "string" || !UUID_RE12.test(row.fromId) || row.fromKind !== "user" && row.fromKind !== "agent" || !(row.kind === void 0 || row.kind === "ask" || row.kind === "note") || !(row.senderName === null || typeof row.senderName === "string" && row.senderName.length <= 200) || typeof row.body !== "string" || row.body.length < 1 || !checkedTimestamp2(row.createdAt) || !checkedTimestamp2(row.queuedAt)) {
+  if (typeof row.signalId !== "string" || !UUID_RE12.test(row.signalId) || typeof row.workspaceId !== "string" || !UUID_RE12.test(row.workspaceId) || typeof row.principalId !== "string" || !UUID_RE12.test(row.principalId) || typeof row.fromId !== "string" || !UUID_RE12.test(row.fromId) || row.fromKind !== "user" && row.fromKind !== "agent" || !(row.kind === void 0 || row.kind === "ask" || row.kind === "note") || !(row.senderName === null || typeof row.senderName === "string" && row.senderName.length <= 200) || typeof row.body !== "string" || row.body.length < 1 || !checkedTimestamp2(row.createdAt) || !checkedTimestamp2(row.queuedAt) || !(row.observationPending === void 0 || row.observationPending === true)) {
     throw new Error("stored pending-for-main entry is malformed");
   }
   return {
@@ -34935,7 +34978,8 @@ function parseEntry(value) {
     senderName: row.senderName,
     body: row.body,
     createdAt: row.createdAt,
-    queuedAt: row.queuedAt
+    queuedAt: row.queuedAt,
+    ...row.observationPending === true ? { observationPending: true } : {}
   };
 }
 function parseFile(raw) {
@@ -35031,7 +35075,7 @@ var FilePendingMainQueue = class {
     }, lockTimeoutMs === void 0 ? {} : { timeoutMs: lockTimeoutMs });
   }
 };
-function pendingMainEntry(signal, principalId, provenance, now) {
+function pendingMainEntry(signal, principalId, provenance, now, options = {}) {
   if (signal.kind !== "ask") {
     throw new Error("only directed asks can enter the pending-for-main queue");
   }
@@ -35044,7 +35088,8 @@ function pendingMainEntry(signal, principalId, provenance, now) {
     senderName: provenance.senderName,
     body: signal.body,
     createdAt: signal.created_at,
-    queuedAt: new Date(now).toISOString()
+    queuedAt: new Date(now).toISOString(),
+    ...options.observationPending ? { observationPending: true } : {}
   });
 }
 
@@ -35138,7 +35183,7 @@ function ackForTerminalEffect(record, now) {
     return { outcome: "observed", lastErrorCode: null };
   }
   if (record.state === "routed_main" && record.signalKind === "ask") {
-    return { outcome: "observed", lastErrorCode: null };
+    return { outcome: "queued", lastErrorCode: null };
   }
   if (record.state === "expired" && record.signalKind === "ask" && Date.parse(record.askUntil) <= now()) {
     return { outcome: "expired", lastErrorCode: null };
@@ -35421,7 +35466,9 @@ async function runListenerRuntime(options) {
       }
     }
     const queued = await options.pendingMainQueue.enqueue(
-      pendingMainEntry(signal, options.principalId, provenance, now())
+      pendingMainEntry(signal, options.principalId, provenance, now(), {
+        observationPending: deliveryMode === "durable_claim"
+      })
     );
     options.onEvent?.({
       type: "main_queue",
@@ -36341,6 +36388,7 @@ async function appendListenerEvent(paths, event) {
   const deliveryOutcomes = /* @__PURE__ */ new Set([
     "replied",
     "observed",
+    "queued",
     "expired",
     "failed_terminal"
   ]);
@@ -37185,6 +37233,7 @@ var ALLOWED_PHASES = /* @__PURE__ */ new Set(["claim_pending", "leased", "ack_pe
 var ALLOWED_OUTCOMES = /* @__PURE__ */ new Set([
   "replied",
   "observed",
+  "queued",
   "expired",
   "failed_terminal"
 ]);
@@ -38310,6 +38359,32 @@ function renderDroppedAsks(count2) {
 }
 var CREDENTIAL_READ_WARNING = "CommonSwarm could not read the configured listener credential safely. The hook is not checking routed asks. Restart the listener with a fresh credential; any credential state file must be mode 0600. Then run cswarm listen status.";
 var CREDENTIAL_401_WARNING = "CommonSwarm could not authenticate a listener credential (HTTP 401). The hook is not checking routed asks. Restart the listener with a fresh credential, then run cswarm listen status.";
+async function recordQueuedObservations(check, signalIds, options, now) {
+  const stored = check.context.credential;
+  const remainingMs = options.deadlineMs - now();
+  if (signalIds.length === 0 || stored === null || options.signal.aborted || remainingMs <= 0) {
+    return /* @__PURE__ */ new Set();
+  }
+  const client = new DeliveryCommandClient(
+    cloudTarget(stored.targetUrl, stored.anonKey),
+    options.fetcher ?? fetch,
+    { deadlineMs: remainingMs, now }
+  );
+  const results = await Promise.all(signalIds.map(async (signalId) => {
+    try {
+      await client.observeQueuedAgentDelivery({
+        workspaceId: stored.workspaceId,
+        credential: stored.credential,
+        commandId: observationCommandId(signalId),
+        signalId
+      });
+      return signalId;
+    } catch {
+      return null;
+    }
+  }));
+  return new Set(results.filter((signalId) => signalId !== null));
+}
 async function checkListenerHooks(options) {
   try {
     const stateDirectory2 = options.stateDirectory ?? defaultListenerStateDirectory();
@@ -38388,10 +38463,8 @@ async function checkListenerHooks(options) {
         check,
         store: store2,
         signalIds: staged.unseen.map((item) => item.signalId),
-        // Every staged queue entry is either written by this run or was committed
-        // after an earlier successful write. Removing both keeps the queue bounded
-        // without re-printing entries below the exactly-once high-water.
-        settledPendingSignalIds: check.pending.map((item) => item.signalId),
+        plainPendingSignalIds: check.pending.filter((item) => item.observationPending !== true).map((item) => item.signalId),
+        observationPendingSignalIds: check.pending.filter((item) => item.observationPending === true).map((item) => item.signalId),
         reportDrops,
         reportCredentialFailure
       });
@@ -38404,8 +38477,17 @@ async function checkListenerHooks(options) {
         ...commit.reportDrops ? { droppedCount: commit.check.droppedCount } : {},
         ...commit.reportCredentialFailure ? { credentialFailureReported: true } : commit.check.credentialHealthy ? { credentialFailureReported: false } : {}
       });
+      const observedSignalIds = await recordQueuedObservations(
+        commit.check,
+        commit.observationPendingSignalIds,
+        options,
+        now
+      );
       const remainingCount = await commit.check.queue.remove(
-        new Set(commit.settledPendingSignalIds),
+        /* @__PURE__ */ new Set([
+          ...commit.plainPendingSignalIds,
+          ...observedSignalIds
+        ]),
         HOOK_LOCK_TIMEOUT_MS
       );
       if (commit.check.context.paths !== null && commit.check.context.status !== null) {
@@ -38538,8 +38620,8 @@ var ACCEPTED_AGENT_CREDENTIAL_MESSAGES = [
   AGENT_CREDENTIAL_MESSAGE_D088
 ];
 function packageVersion() {
-  if ("0.1.32".length > 0) {
-    return "0.1.32";
+  if ("0.1.33".length > 0) {
+    return "0.1.33";
   }
   try {
     const value = JSON.parse(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commonswarm",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "CommonSwarm CLI — coordination for teams where people and AI agents work side by side.",
   "bin": {
     "cswarm": "cswarm.cjs"