sentinelayer-cli 0.39.0 → 0.39.2

package/package.json

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

package/src/commands/session.js

@@ -100,6 +100,7 @@ import {
   listSessionMessageActions,
   listSessionsFromApi,
   probeSessionAccess,
+  pollHumanMessages,
   pollSessionEvents,
   pollSessionEventsBefore,
   searchSessionEvents,
@@ -237,6 +238,8 @@ const SESSION_SAY_LOCAL_ONLY_REASONS = new Set([
   "remote_sync_disabled_env",
 ]);
 const SESSION_READ_AUTO_VIEW_TIMEOUT_MS = 500;
+const SESSION_RECAP_REMOTE_REQUEST_TIMEOUT_MS = 5_000;
+const SESSION_RECAP_REMOTE_HYDRATE_MAX_PAGES = 1;
 
 function isLocalOnlySessionSayReason(reason) {
   return SESSION_SAY_LOCAL_ONLY_REASONS.has(normalizeString(reason));
@@ -5565,11 +5568,24 @@ export function registerSessionCommand(program) {
         hydration = await hydrateSessionFromRemote({
           sessionId: normalizedSessionId,
           targetPath,
+          eventPageLimit: maxEvents,
+          maxEventPages: SESSION_RECAP_REMOTE_HYDRATE_MAX_PAGES,
+          _poll: (pollSessionId, pollOptions) =>
+            pollHumanMessages(pollSessionId, {
+              ...pollOptions,
+              limit: maxEvents,
+              timeoutMs: SESSION_RECAP_REMOTE_REQUEST_TIMEOUT_MS,
+            }),
+          _pollEvents: (pollSessionId, pollOptions) =>
+            pollSessionEvents(pollSessionId, {
+              ...pollOptions,
+              timeoutMs: SESSION_RECAP_REMOTE_REQUEST_TIMEOUT_MS,
+            }),
         });
         remoteTail = await pollSessionEventsBefore(normalizedSessionId, {
           targetPath,
           limit: maxEvents,
-          timeoutMs: 15_000,
+          timeoutMs: SESSION_RECAP_REMOTE_REQUEST_TIMEOUT_MS,
         });
         if (remoteTail?.ok && Array.isArray(remoteTail.events) && remoteTail.events.length > 0) {
           remoteAppend = await appendMissingRemoteEvents(normalizedSessionId, remoteTail.events, {

package/src/session/pricing-ledger.js

@@ -296,6 +296,7 @@ export function buildEstimatedMessageLedgerEntry(
     billingTier = "estimated",
     includeHumanMessages = false,
     action = "estimated_agent_message",
+    estimatedMessageTokenBackend = null,
   } = {},
 ) {
   const kind = n(event?.event || event?.type);
@@ -322,6 +323,7 @@ export function buildEstimatedMessageLedgerEntry(
   const outputTokens = estimateTokens(text, {
     model,
     provider: n(agent.provider || payload.provider),
+    backend: estimatedMessageTokenBackend,
   });
   if (outputTokens <= 0) return null;
 

package/src/session/recap.js

@@ -21,6 +21,7 @@ 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 RECAP_ESTIMATED_USAGE_CHARS_PER_TOKEN = 4;
 const MAX_WORK_PLAN_BYTES = 128_000;
 const WORK_PLAN_RELATIVE_PATH = "tasks/todo.md";
 const ACTIVE_WORK_PLAN_FILE_PATTERN = /^reconciled-fix-plan-\d{4}-\d{2}-\d{2}\.md$/;
@@ -1027,8 +1028,19 @@ function roundCurrency(value) {
   return Math.round(normalized * 1_000_000) / 1_000_000;
 }
 
+function estimateRecapMessageTokens(text) {
+  const normalized = normalizeString(text);
+  if (!normalized) {
+    return 0;
+  }
+  return Math.max(1, Math.ceil(normalized.length / RECAP_ESTIMATED_USAGE_CHARS_PER_TOKEN));
+}
+
 function normalizeUsageSummary(events = []) {
-  const aggregate = aggregateSessionUsage(events, { includeEstimatedMessages: true });
+  const aggregate = aggregateSessionUsage(events, {
+    includeEstimatedMessages: true,
+    estimatedMessageTokenBackend: estimateRecapMessageTokens,
+  });
   const totals = {
     totalTokens: Number(aggregate.totals.totalTokens || 0),
     inputTokens: Number(aggregate.totals.inputTokens || 0),