sentinelayer-cli 0.46.5 → 0.48.0

package/src/session/invitations.js

@@ -4,7 +4,7 @@ import path from "node:path";
 import process from "node:process";
 
 import { checkedTransport, credentialFor, credentialHmac, isAuthenticated, isCredential } from "../auth/credential-destinations.js";
-import { requestJsonMutation } from "../auth/http.js";
+import { requestJson, requestJsonMutation } from "../auth/http.js";
 import { resolveActiveAuthSession } from "../auth/service.js";
 import { renderCoordinationBulletList } from "./coordination-guidance.js";
 import { resolveSessionPaths } from "./paths.js";
@@ -12,8 +12,20 @@ import { urlPathSegment } from "../net/url-path.js";
 
 export const SESSION_INVITATION_ACCEPT_ROUTE_ID =
   "POST /api/v1/sessions/{session_id}/invitations/accept";
+export const PENDING_INVITATION_ACCEPT_ROUTE_ID =
+  "POST /api/v1/sessions/invitations/{invitation_id}/accept";
 export const SESSION_MUTATION_ORIGIN = "https://sentinelayer.com";
 
+export function throwIfPendingSessionInvitation(payload, status) {
+  if ((status !== 403 && status !== 404) || payload?.error?.code !== "INVITATION_PENDING") return;
+  const error = new Error(
+    "An invitation to this room is waiting. Run `sl session invitations list --json`, then `sl session invitations accept <invitationId>` using its invitationId.",
+  );
+  error.code = "INVITATION_PENDING";
+  error.status = status;
+  throw error;
+}
+
 function normalizeString(value) {
   return String(value || "").trim();
 }
@@ -85,6 +97,58 @@ export function createSessionMutationIdempotencyKey(operationName = "invitation-
   return `sl-cli-${operation}-${randomUUID()}`;
 }
 
+export async function listPendingSessionInvitations({
+  targetPath = process.cwd(),
+  resolveAuthSession = resolveActiveAuthSession,
+  request = requestJson,
+} = {}) {
+  const auth = await resolveAuthSession({ cwd: targetPath, env: process.env, autoRotate: false });
+  if (!isAuthenticated(auth) || !auth?.apiUrl) {
+    throw new Error("Not authenticated. Run `sl auth login` first.");
+  }
+  const apiUrl = normalizeString(auth.apiUrl).replace(/\/+$/, "");
+  return checkedTransport(request)(`${apiUrl}/api/v1/sessions/invitations/pending`, {
+    method: "GET",
+    credential: await credentialFor(auth),
+  });
+}
+
+export async function acceptPendingSessionInvitation(invitationId, {
+  targetPath = process.cwd(),
+  idempotencyKey = "",
+  origin = SESSION_MUTATION_ORIGIN,
+  resolveAuthSession = resolveActiveAuthSession,
+  requestMutation = requestJsonMutation,
+} = {}) {
+  const normalizedInvitationId = typeof invitationId === "string" ? invitationId.trim() : "";
+  if (!normalizedInvitationId) throw new Error("invitation id is required.");
+  const invitationPath = `/api/v1/sessions/invitations/${urlPathSegment(normalizedInvitationId, { label: "invitationId" })}/accept`;
+  const auth = await resolveAuthSession({ cwd: targetPath, env: process.env, autoRotate: false });
+  if (!isAuthenticated(auth) || !auth?.apiUrl) {
+    throw new Error("Not authenticated. Run `sl auth login` first.");
+  }
+  const credential = await credentialFor(auth);
+  const resolvedIdempotencyKey = normalizeString(idempotencyKey)
+    || createSessionMutationIdempotencyKey("session-invite-accept");
+  const apiUrl = normalizeString(auth.apiUrl).replace(/\/+$/, "");
+  return checkedTransport(requestMutation)(
+    `${apiUrl}${invitationPath}`,
+    {
+      method: "POST",
+      operationName: "session.invitation_accept_by_id",
+      idempotencyKey: resolvedIdempotencyKey,
+      credential,
+      headers: createSessionMutationHeaders({
+        credential,
+        routeId: PENDING_INVITATION_ACCEPT_ROUTE_ID,
+        idempotencyKey: resolvedIdempotencyKey,
+        origin,
+      }),
+      body: {},
+    },
+  );
+}
+
 export async function acceptSessionInvitation(
   sessionId,
   {

package/src/session/mentions.js

@@ -21,6 +21,8 @@
  *    punctuation + cap length)
  */
 
+import { sessionMessageEditText } from "./edit-summary.js";
+
 // `@handle` is one or more identifier characters. We allow letters,
 // digits, `._-` so `@codex-1`, `@human-mrrcarter`, `@claude.verifier`
 // all work. Word boundary on the front avoids matching `you@example.com`.
@@ -97,20 +99,26 @@ export function enrichEventWithMentions(event) {
     : null;
   if (!payload) return event;
 
+  // An edit's immutable snapshot retains the original explicit audience.
+  const routingPayload = event.event === "session_message_edited"
+    ? { ...payload.event?.payload, ...payload }
+    : payload;
   // Already routed by an explicit caller — don't second-guess.
   const hasExplicitTo =
-    Array.isArray(payload.to) ||
-    Array.isArray(payload.recipients) ||
-    typeof payload.recipient === "string" ||
-    typeof payload.targetAgent === "string" ||
-    typeof payload.targetAgentId === "string";
+    Array.isArray(routingPayload.to) ||
+    Array.isArray(routingPayload.recipients) ||
+    typeof routingPayload.recipient === "string" ||
+    typeof routingPayload.targetAgent === "string" ||
+    typeof routingPayload.targetAgentId === "string";
 
   // We pull text from the standard fields the renderer already uses,
   // matching the priority in `Session.tsx:payloadText`.
-  const text = normalizeString(payload.message)
-    || normalizeString(payload.text)
-    || normalizeString(payload.detail)
-    || normalizeString(payload.title);
+  const text = event.event === "session_message_edited"
+    ? sessionMessageEditText(event)
+    : normalizeString(payload.message)
+      || normalizeString(payload.text)
+      || normalizeString(payload.detail)
+      || normalizeString(payload.title);
   if (!text) return event;
 
   const parsed = parseMentions(text);

package/src/session/message-edits.js

@@ -1,6 +1,7 @@
 import { createAgentEvent } from "../events/schema.js";
 import { enrichEventWithMentions } from "./mentions.js";
 import { sessionEventIdentityKeys } from "./event-identity.js";
+import { sessionMessageEditText } from "./edit-summary.js";
 
 export function messageRevision(value = {}) {
   const revision = Number(value.messageRevision ?? value.message_revision ?? 1);
@@ -79,11 +80,11 @@ export function sessionMessageRoutingEvent(event = {}) {
   if (!snapshot) return event;
   const parentPayload = event.payload?.event?.payload || {};
   const payload = { ...parentPayload, ...snapshot.payload };
-  if (event.payload?.reply) payload.message = String(event.payload.reply.note ?? "");
+  payload.message = sessionMessageEditText(event);
   for (const key of ["to", "recipient", "recipients", "targetAgent", "targetAgentId", "broadcast", "mentions"]) {
     if (event.payload[key] !== undefined) payload[key] = event.payload[key];
   }
-  const routed = enrichEventWithMentions({ ...snapshot, agent: event.agent || snapshot.agent, payload });
-  if (routed.payload?.mentions?.broadcast?.length) routed.payload.broadcast = true;
-  return routed;
+  // Use the same recipient precedence as a new message. Broadcast mentions
+  // are metadata; only an explicit routing flag can widen the audience.
+  return enrichEventWithMentions({ ...snapshot, agent: event.agent || snapshot.agent, payload });
 }

package/src/session/preview.js

@@ -7,9 +7,12 @@
  */
 
 import { readStream } from "./stream.js";
+import { appendAttachmentSummary, formatAttachmentSummary } from "./attachment-summary.js";
+import { formatEditSummary } from "./edit-summary.js";
 
 const PREVIEW_EVENTS = new Set([
   "session_message",
+  "session_message_edited",
   "session_say",
   "agent_response",
   "session_observation",
@@ -45,14 +48,16 @@ export function pickLatestPreview(events = []) {
     const kind = String(event.event || event.type || "").trim();
     if (!kind || !PREVIEW_EVENTS.has(kind)) continue;
     const payload = event.payload && typeof event.payload === "object" ? event.payload : {};
+    const editSummary = formatEditSummary(event);
     const text =
+      editSummary ||
       payload.summary ||
       payload.message ||
       payload.response ||
       payload.alert ||
       payload.reason ||
       payload.text;
-    if (!text) continue;
+    if (!text && !formatAttachmentSummary(event)) continue;
     return {
       ts: event.ts || event.timestamp || null,
       agentId:
@@ -61,7 +66,10 @@ export function pickLatestPreview(events = []) {
         payload.agentId ||
         null,
       kind,
-      message: trim(text),
+      message: appendAttachmentSummary(trim(text), event),
+      ...(editSummary ? { editSummary, event } : {}),
+      ...(Array.isArray(payload.attachments) && payload.attachments.length
+        ? { attachments: payload.attachments } : {}),
     };
   }
   return { ts: null, agentId: null, kind: null, message: null };

package/src/session/recap.js

@@ -7,6 +7,7 @@ import { createAgentEvent } from "../events/schema.js";
 import { dedupeSessionEvents } from "./event-identity.js";
 import { resolveSessionPaths } from "./paths.js";
 import { readStream } from "./stream.js";
+import { appendAttachmentSummary, formatAttachmentSummary } from "./attachment-summary.js";
 import { getSession } from "./store.js";
 import { aggregateSessionUsage } from "./usage.js";
 
@@ -381,11 +382,11 @@ function summarizeRecentActivity(events = [], { forAgentId = "", limit = 2 } = {
     const message = normalizeString(
       payload.message || payload.response || payload.recap || payload.alert || payload.reason
     );
-    if (!message) {
+    if (!message && !formatAttachmentSummary(event)) {
       continue;
     }
     snippets.push(
-      `${agentId}${formatSequenceMarker(event)}: ${shortActivitySnippetText(message)}`,
+      `${agentId}${formatSequenceMarker(event)}: ${appendAttachmentSummary(shortActivitySnippetText(message), event)}`,
     );
     if (snippets.length >= Math.max(1, limit)) {
       break;