sentinelayer-cli 0.36.0 → 0.36.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentinelayer-cli",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "Scaffold Sentinelayer spec/prompt/guide artifacts with secure browser auth and token bootstrap.",
   "type": "module",
   "scripts": {

package/src/commands/session.js

@@ -64,7 +64,7 @@ import {
   refreshSessionCacheForRemoteActivity,
   updateSessionTitle,
 } from "../session/store.js";
-import { fetchSessionListeners, formatListenerLine } from "../session/listeners.js";
+import { fetchSessionListeners, formatListenerLine, summarizeListeners } from "../session/listeners.js";
 import {
   getListenerProcessStatus,
   removeListenerPidRecord,
@@ -1082,6 +1082,25 @@ function compareIsoDesc(left = "", right = "") {
   return normalizeString(right).localeCompare(normalizeString(left));
 }
 
+function latestIsoTimestamp(...values) {
+  let selected = "";
+  let selectedEpoch = Number.NEGATIVE_INFINITY;
+  for (const value of values) {
+    const normalized = normalizeString(value);
+    if (!normalized) continue;
+    const epoch = Date.parse(normalized);
+    if (!Number.isFinite(epoch)) {
+      if (!selected) selected = normalized;
+      continue;
+    }
+    if (epoch >= selectedEpoch) {
+      selected = new Date(epoch).toISOString();
+      selectedEpoch = epoch;
+    }
+  }
+  return selected;
+}
+
 function buildSessionParticipants({ statsAgents = [], registeredAgents = [] } = {}) {
   const byAgentId = new Map();
   for (const agent of Array.isArray(statsAgents) ? statsAgents : []) {
@@ -1100,6 +1119,12 @@ function buildSessionParticipants({ statsAgents = [], registeredAgents = [] } =
     if (!agentId) continue;
     const existing = byAgentId.get(agentId);
     if (existing) {
+      const lastActivityAt = latestIsoTimestamp(
+        existing.lastActivityAt,
+        existing.lastSeen,
+        agent.lastActivityAt,
+        agent.joinedAt,
+      );
       byAgentId.set(agentId, {
         ...existing,
         model: existing.model || normalizeString(agent.model),
@@ -1108,7 +1133,8 @@ function buildSessionParticipants({ statsAgents = [], registeredAgents = [] } =
         registered: true,
         source: "events+registry",
         joinedAt: normalizeString(agent.joinedAt) || existing.joinedAt,
-        lastActivityAt: normalizeString(agent.lastActivityAt) || existing.lastActivityAt,
+        lastSeen: latestIsoTimestamp(existing.lastSeen, lastActivityAt) || existing.lastSeen,
+        lastActivityAt: lastActivityAt || null,
         active: agent.active,
       });
       continue;
@@ -6285,13 +6311,51 @@ export function registerSessionCommand(program) {
       ]);
 
       const staleAgents = detectStaleAgents(agents, {});
+      const staleAgentIds = new Set(staleAgents.map((agent) => normalizeString(agent.agentId)));
+      const activeAgents = agents.filter((agent) => !staleAgentIds.has(normalizeString(agent.agentId)));
+      let listenerRows = summarizeListeners(recentEvents);
+      let listenerPresence = {
+        source: "local_recent_events",
+        ok: true,
+        count: listenerRows.length,
+        liveCount: listenerRows.filter((row) => row.status === "active" || row.status === "idle").length,
+        listeners: listenerRows,
+      };
+      try {
+        const remoteListeners = await fetchSessionListeners(normalizedSessionId, {
+          targetPath,
+          limit: 200,
+          maxPages: 5,
+        });
+        if (remoteListeners?.ok && Array.isArray(remoteListeners.listeners) && remoteListeners.listeners.length > 0) {
+          listenerRows = remoteListeners.listeners;
+          listenerPresence = {
+            source: "remote_events",
+            ok: true,
+            count: listenerRows.length,
+            liveCount: listenerRows.filter((row) => row.status === "active" || row.status === "idle").length,
+            pageCount: Number(remoteListeners.pageCount || 0),
+            scannedEventCount: Number(remoteListeners.scannedEventCount || 0),
+            listenerEventCount: Number(remoteListeners.listenerEventCount || 0),
+            partial: Boolean(remoteListeners.partial),
+            listeners: listenerRows,
+          };
+        } else if (remoteListeners && remoteListeners.ok === false) {
+          listenerPresence.remoteReason = normalizeString(remoteListeners.reason) || "remote_unavailable";
+        }
+      } catch (error) {
+        listenerPresence.remoteReason = normalizeString(error?.message) || "remote_unavailable";
+      }
+      const liveListenerCount = listenerPresence.liveCount;
       const payload = {
         command: "session status",
         targetPath,
         sessionId: normalizedSessionId,
         session: sessionPayload,
-        activeAgents: agents,
+        registeredAgents: agents,
+        activeAgents,
         staleAgents,
+        listenerPresence,
         runtimeRuns,
         activeLeases: leases.assignments,
         activeFileLocks: fileLocks,
@@ -6306,7 +6370,7 @@ export function registerSessionCommand(program) {
       console.log(pc.bold(`Session ${normalizedSessionId}`));
       console.log(
         pc.gray(
-          `status=${sessionPayload.status} agents=${agents.length} stale=${staleAgents.length} runs=${runtimeRuns.length} leases=${leases.assignments.length} locks=${fileLocks.length} tasks=${activeTasks.tasks.length}`
+          `status=${sessionPayload.status} active=${activeAgents.length} registered=${agents.length} stale=${staleAgents.length} listeners=${liveListenerCount}/${listenerRows.length} runs=${runtimeRuns.length} leases=${leases.assignments.length} locks=${fileLocks.length} tasks=${activeTasks.tasks.length}`
         )
       );
       for (const event of recentEvents) {

package/src/legacy-cli.js

@@ -2517,20 +2517,20 @@ jobs:
           fi
       - name: Run Omar Gate
         id: omar
-        uses: mrrCarter/sentinelayer-v1-action@03d7369cba7de2e9f15b959275c982111f0ee493
+        uses: mrrCarter/sentinelayer-v1-action@5c4d8c175eb117ea5256452e50e01249ab126998
         with:
           github_token: \${{ github.token }}
           openai_api_key: \${{ secrets.OPENAI_API_KEY }}
-          google_api_key: \${{ secrets.GOOGLE_API_KEY }}
-          llm_provider: \${{ secrets.GOOGLE_API_KEY != '' && 'google' || 'openai' }}
+          google_api_key: \${{ secrets.GOOGLE_GEMINI_API_KEY != '' && secrets.GOOGLE_GEMINI_API_KEY || secrets.GOOGLE_API_KEY }}
+          llm_provider: \${{ secrets.OPENAI_API_KEY != '' && 'openai' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'google' || 'openai') }}
           sentinelayer_token: \${{ secrets.${normalizedSecret} }}${specIdBindingLine}
-          sentinelayer_managed_llm: \${{ secrets.GOOGLE_API_KEY == '' && secrets.OPENAI_API_KEY == '' && secrets.${normalizedSecret} != '' }}
+          sentinelayer_managed_llm: \${{ secrets.${normalizedSecret} != '' }}
           scan_mode: \${{ github.event_name == 'workflow_dispatch' && inputs.scan_mode || 'deep' }}
           severity_gate: \${{ github.event_name == 'workflow_dispatch' && inputs.severity_gate || 'P1' }}
-          model: \${{ secrets.GOOGLE_API_KEY != '' && 'gemini-2.5-pro' || 'gpt-5.3-codex' }}
+          model: \${{ secrets.OPENAI_API_KEY != '' && 'gpt-5.3-codex' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-5.3-codex') }}
           codex_model: gpt-5.3-codex
-          model_fallback: \${{ secrets.GOOGLE_API_KEY != '' && 'gemini-2.5-flash' || 'gpt-4.1-mini' }}
-          use_codex: \${{ secrets.GOOGLE_API_KEY == '' }}
+          model_fallback: \${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-4.1-mini' }}
+          use_codex: \${{ secrets.OPENAI_API_KEY != '' || (secrets.GOOGLE_GEMINI_API_KEY == '' && secrets.GOOGLE_API_KEY == '') }}
           codex_only: "false"
           llm_failure_policy: block
           max_daily_scans: \${{ vars.OMAR_MAX_DAILY_SCANS || '200' }}
@@ -2582,11 +2582,11 @@ jobs:
           OMAR_SEVERITY_GATE: \${{ github.event_name == 'workflow_dispatch' && inputs.severity_gate || 'P1' }}
           OMAR_P2_MAX_ALLOWED: \${{ github.event_name == 'workflow_dispatch' && inputs.p2_max_allowed || '5' }}
           OMAR_OPENAI_KEY_PRESENT: \${{ secrets.OPENAI_API_KEY != '' }}
-          OMAR_GOOGLE_KEY_PRESENT: \${{ secrets.GOOGLE_API_KEY != '' }}
-          OMAR_MANAGED_LLM: \${{ secrets.GOOGLE_API_KEY == '' && secrets.OPENAI_API_KEY == '' && secrets.${normalizedSecret} != '' }}
-          OMAR_LLM_PROVIDER: \${{ secrets.GOOGLE_API_KEY != '' && 'google' || 'openai' }}
-          OMAR_MODEL: \${{ secrets.GOOGLE_API_KEY != '' && 'gemini-2.5-pro' || 'gpt-5.3-codex' }}
-          OMAR_MODEL_FALLBACK: \${{ secrets.GOOGLE_API_KEY != '' && 'gemini-2.5-flash' || 'gpt-4.1-mini' }}
+          OMAR_GOOGLE_KEY_PRESENT: \${{ secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '' }}
+          OMAR_MANAGED_LLM: \${{ secrets.${normalizedSecret} != '' }}
+          OMAR_LLM_PROVIDER: \${{ secrets.OPENAI_API_KEY != '' && 'openai' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'google' || 'openai') }}
+          OMAR_MODEL: \${{ secrets.OPENAI_API_KEY != '' && 'gpt-5.3-codex' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-5.3-codex') }}
+          OMAR_MODEL_FALLBACK: \${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-4.1-mini' }}
         run: |
           set -euo pipefail
           mkdir -p omar-artifacts
@@ -2626,11 +2626,11 @@ jobs:
               },
               "scan": {
                   "mode": env("OMAR_SCAN_MODE", "deep"),
-                  "action_ref": "mrrCarter/sentinelayer-v1-action@03d7369cba7de2e9f15b959275c982111f0ee493",
+                  "action_ref": "mrrCarter/sentinelayer-v1-action@5c4d8c175eb117ea5256452e50e01249ab126998",
                   "llm_provider": env("OMAR_LLM_PROVIDER", "openai"),
                   "model": env("OMAR_MODEL", "gpt-5.3-codex"),
                   "model_fallback": env("OMAR_MODEL_FALLBACK", "gpt-4.1-mini"),
-                  "llm_route": "google_api_key" if bool_env("OMAR_GOOGLE_KEY_PRESENT") else ("openai_api_key" if bool_env("OMAR_OPENAI_KEY_PRESENT") else "sentinelayer_managed"),
+                  "llm_route": "openai_api_key" if bool_env("OMAR_OPENAI_KEY_PRESENT") else ("google_api_key" if bool_env("OMAR_GOOGLE_KEY_PRESENT") else "sentinelayer_managed"),
                   "google_key_present": bool_env("OMAR_GOOGLE_KEY_PRESENT"),
                   "openai_key_present": bool_env("OMAR_OPENAI_KEY_PRESENT"),
                   "managed_llm": bool_env("OMAR_MANAGED_LLM"),

package/src/scan/generator.js

@@ -2,7 +2,7 @@ import YAML from "yaml";
 
 export const DEFAULT_SCAN_WORKFLOW_PATH = ".github/workflows/omar-gate.yml";
 export const DEFAULT_SCAN_SECRET_NAME = "SENTINELAYER_TOKEN";
-export const SENTINELAYER_ACTION_REF = "mrrCarter/sentinelayer-v1-action@03d7369cba7de2e9f15b959275c982111f0ee493";
+export const SENTINELAYER_ACTION_REF = "mrrCarter/sentinelayer-v1-action@5c4d8c175eb117ea5256452e50e01249ab126998";
 export const SUPPORTED_E2E_HINTS = Object.freeze(["auto", "yes", "no"]);
 export const SUPPORTED_PLAYWRIGHT_MODES = Object.freeze(["auto", "off", "baseline", "audit"]);
 
@@ -230,17 +230,18 @@ export function buildSecurityReviewWorkflow({ secretName = DEFAULT_SCAN_SECRET_N
               google_api_key:
                 "${{ secrets.GOOGLE_GEMINI_API_KEY != '' && secrets.GOOGLE_GEMINI_API_KEY || secrets.GOOGLE_API_KEY }}",
               llm_provider:
-                "${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'google' || 'openai' }}",
+                "${{ secrets.OPENAI_API_KEY != '' && 'openai' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'google' || 'openai') }}",
               sentinelayer_token: `\${{ secrets.${normalizedSecret} }}`,
-              sentinelayer_managed_llm: `\${{ secrets.GOOGLE_GEMINI_API_KEY == '' && secrets.GOOGLE_API_KEY == '' && secrets.OPENAI_API_KEY == '' && secrets.${normalizedSecret} != '' }}`,
+              sentinelayer_managed_llm: `\${{ secrets.${normalizedSecret} != '' }}`,
               scan_mode: profile.scanMode || "deep",
               severity_gate: profile.severityGate || "P1",
               model:
-                "${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-5.3-codex' }}",
+                "${{ secrets.OPENAI_API_KEY != '' && 'gpt-5.3-codex' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-5.3-codex') }}",
               codex_model: "gpt-5.3-codex",
               model_fallback:
                 "${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-4.1-mini' }}",
-              use_codex: "${{ secrets.GOOGLE_GEMINI_API_KEY == '' && secrets.GOOGLE_API_KEY == '' }}",
+              use_codex:
+                "${{ secrets.OPENAI_API_KEY != '' || (secrets.GOOGLE_GEMINI_API_KEY == '' && secrets.GOOGLE_API_KEY == '') }}",
               codex_only: "false",
               llm_failure_policy: "block",
               max_daily_scans: "${{ vars.OMAR_MAX_DAILY_SCANS || '200' }}",
@@ -301,11 +302,11 @@ export function buildSecurityReviewWorkflow({ secretName = DEFAULT_SCAN_SECRET_N
               OMAR_OPENAI_KEY_PRESENT: "${{ secrets.OPENAI_API_KEY != '' }}",
               OMAR_GOOGLE_KEY_PRESENT:
                 "${{ secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '' }}",
-              OMAR_MANAGED_LLM: `\${{ secrets.GOOGLE_GEMINI_API_KEY == '' && secrets.GOOGLE_API_KEY == '' && secrets.OPENAI_API_KEY == '' && secrets.${normalizedSecret} != '' }}`,
+              OMAR_MANAGED_LLM: `\${{ secrets.${normalizedSecret} != '' }}`,
               OMAR_LLM_PROVIDER:
-                "${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'google' || 'openai' }}",
+                "${{ secrets.OPENAI_API_KEY != '' && 'openai' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'google' || 'openai') }}",
               OMAR_MODEL:
-                "${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-5.3-codex' }}",
+                "${{ secrets.OPENAI_API_KEY != '' && 'gpt-5.3-codex' || ((secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-5.3-codex') }}",
               OMAR_MODEL_FALLBACK:
                 "${{ (secrets.GOOGLE_GEMINI_API_KEY != '' || secrets.GOOGLE_API_KEY != '') && 'gemini-3.1-flash-lite' || 'gpt-4.1-mini' }}",
             },
@@ -352,7 +353,7 @@ export function buildSecurityReviewWorkflow({ secretName = DEFAULT_SCAN_SECRET_N
               "        'llm_provider': env('OMAR_LLM_PROVIDER', 'openai'),",
               "        'model': env('OMAR_MODEL', 'gpt-5.3-codex'),",
               "        'model_fallback': env('OMAR_MODEL_FALLBACK', 'gpt-4.1-mini'),",
-              "        'llm_route': 'google_api_key' if bool_env('OMAR_GOOGLE_KEY_PRESENT') else ('openai_api_key' if bool_env('OMAR_OPENAI_KEY_PRESENT') else 'sentinelayer_managed'),",
+              "        'llm_route': 'openai_api_key' if bool_env('OMAR_OPENAI_KEY_PRESENT') else ('google_api_key' if bool_env('OMAR_GOOGLE_KEY_PRESENT') else 'sentinelayer_managed'),",
               "        'google_key_present': bool_env('OMAR_GOOGLE_KEY_PRESENT'),",
               "        'openai_key_present': bool_env('OMAR_OPENAI_KEY_PRESENT'),",
               "        'managed_llm': bool_env('OMAR_MANAGED_LLM'),",

package/src/session/listener.js

@@ -507,7 +507,7 @@ export async function listenSessionEvents({
       if (signal?.aborted || streamHeartbeatInFlight) return;
       streamHeartbeatInFlight = true;
       try {
-        await notifyHeartbeat({ nextPollMs: null });
+        await notifyHeartbeat({ nextPollMs: streamHeartbeatMs });
       } finally {
         streamHeartbeatInFlight = false;
       }
@@ -543,7 +543,7 @@ export async function listenSessionEvents({
           });
         },
         onHeartbeat: async () => {
-          await notifyHeartbeat({ nextPollMs: null });
+          await notifyHeartbeat({ nextPollMs: streamHeartbeatMs });
         },
       }).finally(() => {
         stopStreamHeartbeatTimer();

package/src/session/recap.js

@@ -20,6 +20,7 @@ const DEFAULT_RECAP_INACTIVITY_MS = 600_000;
 const DEFAULT_RECAP_ACTIVITY_THRESHOLD = 5;
 const DEFAULT_TASK_SUMMARY_LIMIT = 3;
 const DEFAULT_WORK_PLAN_SUMMARY_LIMIT = 5;
+const DEFAULT_ACTIVITY_SNIPPET_MAX_CHARS = 120;
 const MAX_WORK_PLAN_BYTES = 128_000;
 const WORK_PLAN_RELATIVE_PATH = "tasks/todo.md";
 const HISTORICAL_WORK_PLAN_MIN_COMPLETED = 25;
@@ -130,6 +131,11 @@ function eventSequenceId(event = {}) {
   return Math.floor(parsed);
 }
 
+function formatSequenceMarker(event = {}) {
+  const sequence = eventSequenceId(event);
+  return sequence === null ? "" : ` #${sequence}`;
+}
+
 function eventCursor(event = {}) {
   return normalizeString(event.cursor || event.eventId || event.idempotencyToken || event.ts);
 }
@@ -373,7 +379,9 @@ function summarizeRecentActivity(events = [], { forAgentId = "", limit = 2 } = {
     if (!message) {
       continue;
     }
-    snippets.push(`${agentId}: ${message.replace(/\s+/g, " ").slice(0, 120)}`);
+    snippets.push(
+      `${agentId}${formatSequenceMarker(event)}: ${shortActivitySnippetText(message)}`,
+    );
     if (snippets.length >= Math.max(1, limit)) {
       break;
     }
@@ -381,6 +389,22 @@ function summarizeRecentActivity(events = [], { forAgentId = "", limit = 2 } = {
   return snippets.reverse();
 }
 
+function shortActivitySnippetText(value, maxLength = DEFAULT_ACTIVITY_SNIPPET_MAX_CHARS) {
+  const text = normalizeString(value).replace(/\s+/g, " ");
+  const normalizedMaxLength = normalizePositiveInteger(maxLength, DEFAULT_ACTIVITY_SNIPPET_MAX_CHARS);
+  if (text.length <= normalizedMaxLength) {
+    return text;
+  }
+  const suffix = "...";
+  const cutLimit = Math.max(1, normalizedMaxLength - suffix.length);
+  const preferredBoundary = text.lastIndexOf(" ", cutLimit);
+  const minimumBoundary = Math.floor(normalizedMaxLength * 0.6);
+  const cutIndex =
+    preferredBoundary >= minimumBoundary ? preferredBoundary : cutLimit;
+  const prefix = text.slice(0, cutIndex).replace(/[\s,;:.-]+$/g, "");
+  return `${prefix || text.slice(0, cutLimit)}${suffix}`;
+}
+
 async function readPendingTasks(sessionId, { forAgentId = "", targetPath = process.cwd() } = {}) {
   const normalizedAgentId = normalizeString(forAgentId).toLowerCase();
   if (!normalizedAgentId) {