sentinelayer-cli 0.41.0 → 0.42.0

package/src/session/usage-report.js

@@ -64,6 +64,45 @@ function optionalUsdCell(value, hasValue) {
   return hasValue ? usdCell(value) : "-";
 }
 
+function booleanFlag(value) {
+  if (typeof value === "boolean") return value;
+  if (typeof value === "number" && Number.isFinite(value)) return value !== 0;
+  const text = normalize(value).toLowerCase();
+  if (!text) return null;
+  if (["1", "true", "t", "yes", "y"].includes(text)) return true;
+  if (["0", "false", "f", "no", "n"].includes(text)) return false;
+  return null;
+}
+
+function hasHostedCustomerCost(bag) {
+  const camelFlag = booleanFlag(bag.hasCustomerCost);
+  if (camelFlag != null) return camelFlag;
+  const snakeFlag = booleanFlag(bag.has_customer_cost);
+  if (snakeFlag != null) return snakeFlag;
+  return [
+    bag.customerCostUsd,
+    bag.customer_cost_usd,
+    bag.billableCostUsd,
+    bag.billable_cost_usd,
+  ].some((value) => value != null && value !== "");
+}
+
+function rollupCostSummary(rollup = {}) {
+  const parts = [`provider ${usdCell(rollup.providerCostUsd)}`];
+  if (rollup.customerCostUsd != null) {
+    parts.push(`customer ${usdCell(rollup.customerCostUsd)}`);
+  }
+  const unpriced = nonNegativeInt(rollup.unpriced);
+  if (unpriced > 0) {
+    parts.push(`unpriced ${intCell(unpriced)}`);
+  }
+  const estimatedEntries = nonNegativeInt(rollup.estimatedEntries);
+  if (estimatedEntries > 0) {
+    parts.push(`estimated ${intCell(estimatedEntries)}`);
+  }
+  return parts.join(", ");
+}
+
 function timestampOnly(iso) {
   if (!iso) return "";
   const date = new Date(iso);
@@ -122,7 +161,7 @@ function rollupToJson(rollup) {
 
 function hostedRollupToJson(rollup, fallbackLabel = "") {
   const bag = object(rollup);
-  const hasCustomerCost = Boolean(bag.hasCustomerCost ?? bag.has_customer_cost ?? bag.customerCostUsd != null ?? bag.customer_cost_usd != null);
+  const hasCustomerCost = hasHostedCustomerCost(bag);
   return {
     label: normalize(bag.label ?? bag.agentId ?? bag.agent_id ?? bag.action ?? fallbackLabel) || "unknown",
     entries: nonNegativeInt(bag.entries ?? bag.entryCount ?? bag.entry_count ?? bag.count ?? bag.interactions),
@@ -412,7 +451,7 @@ export function renderSessionUsageSummary(report = {}) {
     lines.push("Per agent:");
     for (const agent of agents) {
       lines.push(
-        `- ${agent.label}: ${intCell(agent.totalTokens)} tokens, ${intCell(agent.entries)} entries, provider ${usdCell(agent.providerCostUsd)}`,
+        `- ${agent.label}: ${intCell(agent.totalTokens)} tokens, ${intCell(agent.entries)} entries, ${rollupCostSummary(agent)}`,
       );
     }
   }

package/src/session/wake/resolve-target.js

@@ -16,8 +16,10 @@
 // transitive graph (auth/sync/`open`/...) into the wake daemon. The matcher
 // here is small enough to own.
 
+import { messageRevision, sessionMessageEditSnapshot, sessionMessageRoutingEvent } from "../message-edits.js";
+
 const BROADCAST_RECIPIENTS = new Set(["*", "all", "broadcast", "everyone", "anyone", "agents", "all-agents"]);
-const DEFAULT_WAKE_EVENT_TYPES = new Set(["session_message", "help_request"]);
+const DEFAULT_WAKE_EVENT_TYPES = new Set(["session_message", "help_request", "session_message_edited"]);
 const MAX_WAKE_MESSAGE_CHARS = 16_000;
 
 function requireNonEmptyString(value, label) {
@@ -98,7 +100,7 @@ function defaultFormatMessage(event, agentId) {
   const author = agentIdOf(event) || "unknown";
   const text = event?.payload?.message ?? event?.message ?? "";
   const body = typeof text === "string" ? text : "";
-  const head = `Senti wake for ${agentId}: new message from ${author}.`;
+  const head = `Senti wake for ${agentId}: ${event.event === "session_message_edited" ? "edited message" : "new message"} from ${author}.`;
   const combined = body ? `${head}\n\n${body}` : head;
   return combined.length > MAX_WAKE_MESSAGE_CHARS ? combined.slice(0, MAX_WAKE_MESSAGE_CHARS) : combined;
 }
@@ -128,18 +130,21 @@ export function createResolveTarget({
     // Only wake on real message events; acks/reactions/views/system are skips.
     const type = eventTypeOf(event);
     if (!type || !wakeEventTypes.has(type)) return null;
+    if (type === "session_message" && messageRevision(event) > 1) return null;
+    if (type === "session_message_edited" && !sessionMessageEditSnapshot(event)) return null;
+    const routed = sessionMessageRoutingEvent(event);
 
     // No self-wake: never wake the agent on its own message. Normalize both
     // sides (handles @-prefix / casing / punctuation) so the loop-guard can't
     // be slipped by a non-canonical author id.
-    const author = agentIdOf(event);
+    const author = agentIdOf(routed);
     if (author && normalizeComparableId(author) === selfLower) return null;
 
     // Routing: directed-to-me / broadcast / untargeted-room wakes us; a message
     // aimed at a different specific agent is intentionally unroutable.
-    if (!matchesAgent(event, selfLower)) return null;
+    if (!matchesAgent(routed, selfLower)) return null;
 
-    return { host: hostName, sessionId: resumeId, message: formatMessage(event, selfId) };
+    return { host: hostName, sessionId: resumeId, message: formatMessage({ ...routed, event: type }, selfId) };
   };
 }