@maudecode/talaria-web 1.21.0 → 1.22.0

package/dist/sessions/service.js

@@ -1,3 +1,4 @@
+import { reasoningProjection } from './reasoning-display.js';
 import { MAX_SOURCE_REFERENCES, SourceReferenceSchema, unavailableContextDetail } from '@maudecode/talaria-web-contracts';
 import { filterAsync } from '../util.js';
 import { statSignature } from '../fs/stat.js';
@@ -16,9 +17,9 @@ import { isClaudeCodeSessionId } from './claude-code.js';
 import { auditSessionRecovery, repairSafeSessionRecovery } from './recovery.js';
 import { stateDbWebDiagnosticIdsAsync, agentSessionRowsExistingAsync, CANONICAL_READ_ONLY_REASON, OWNERSHIP_UNAVAILABLE_REASON, CONVERSATION_ROUND_THRESHOLD, emptyLineageReport, stateDbSessionReadAsync, stateDbSessionSourcesAsync, stateDbTimestampSeconds, withStateDbListingReads } from './state-db.js';
 import { completionIncomplete, fallbackHandoffSummary, HANDOFF_SYSTEM_PROMPT, handoffMarker, handoffPayload, handoffTranscript, messageHandoffPayload, sameHandoff } from './handoff.js';
-import { anchorMessageKey, anchorSummary, CompressionJobs, compressionReference, visibleMessagesForAnchor } from './compress.js';
+import { anchorMessageKey, anchorSummary, CompressionJobs, insertCompactionRow, visibleMessagesForAnchor } from './compress.js';
 import { chatReadiness, runtimeFailureDetails, SidecarError } from '../sidecar/client.js';
-import { agentSteerText, ApiMessageSummary, appendStateDbIdentityRows, attachedFilesPrompt, attachmentObjects, checkpointTurnStart, dedupeContext, isContextCompressionMarker, journalOutputRows, looksLikeCurrentUserTurn, stoppedTurnContext, mergeSessionMessagesAppendOnly, messageIdentity, pendingUserRow, reasoningFieldsText, sanitizeMessagesForApi, withDataUseRequirements, stateDbSeenId, stripWorkspacePrefix, withAttachmentObjects, newestSettledReply, withBodyExcerpts, withDisplayMedia, withMarkerKinds, withMirrorSources, withSceneRowMedia, withPendingUserTurn, withToolCallOutcomes, withoutRunningTurnOutput } from './merge.js';
+import { agentSteerText, ApiMessageSummary, appendStateDbIdentityRows, attachedFilesPrompt, attachmentObjects, checkpointTurnStart, dedupeContext, isCompactionRow, isContextCompressionMarker, journalOutputRows, looksLikeCurrentUserTurn, stoppedTurnContext, mergeSessionMessagesAppendOnly, messageIdentity, pendingUserRow, reasoningFieldsText, sanitizeMessagesForApi, withDataUseRequirements, stateDbSeenId, stripWorkspacePrefix, withAttachmentObjects, newestSettledReply, withBodyExcerpts, withDisplayMedia, withMarkerKinds, withMirrorSources, withSceneRowMedia, withPendingUserTurn, withToolCallOutcomes, withoutRunningTurnOutput } from './merge.js';
 import { withBackgroundUpdates } from './background-updates.js';
 import { markedStateDbGeneration, stateDbIdentityKeys, stampStateDbGeneration, stateDbMessageRepresented } from './state-db-identity.js';
 import { sourceKind } from './source-kind.js';
@@ -795,10 +796,9 @@ export class SessionService {
         const payload = (await this.wireRow(s));
         // Mutation replies replace a client's transcript, so they carry the same server-built scenes as the detail.
         if (withMessages) {
-            payload.messages = (await this.backgroundLinked(s, hydrateAnchorActivityScenes(withToolCallOutcomes((await this.backgroundUpdates(s, withMarkerKinds(withTurnIds(messages), s))), s.tool_calls, s.active_stream_id), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, runningScene: !(await this.journaledActiveTurn(s)) })));
-            payload.compression_reference = compressionReference(s, payload.messages);
+            payload.messages = (await this.backgroundLinked(s, hydrateAnchorActivityScenes(withToolCallOutcomes((await this.backgroundUpdates(s, withMarkerKinds(withTurnIds(messages), s))), s.tool_calls, s.active_stream_id), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, showReasoning: await this.deps.showReasoning?.(s.profile) ?? true, runningScene: !(await this.journaledActiveTurn(s)) })));
         }
-        return redactSessionData(payload, this.deps.redactEnabled());
+        return this.publicProjection(redactSessionData(payload, this.deps.redactEnabled()), s.profile);
     }
     /** Opaque read identity, including context changes that do not alter display message counts. */
     contextDetailKey(s) {
@@ -834,8 +834,13 @@ export class SessionService {
         return this.deps.assistantName(s.profile);
     }
     /** Python `public_session_projection(s.__dict__)`: every persisted field, redacted (session export). */
-    publicSessionDocument(s) {
-        return redactSessionData(s.toDocument(), this.deps.redactEnabled());
+    async publicSessionDocument(s) {
+        return this.publicProjection(redactSessionData(s.toDocument(), this.deps.redactEnabled()), s.profile);
+    }
+    /** One server decision for history, mutation replies, done frames and export documents. */
+    async publicProjection(payload, profile) {
+        const show = await this.deps.showReasoning?.(profile) ?? true;
+        return { ...reasoningProjection(payload, show), plan_gauge: payload.plan_gauge ?? null, show_reasoning: show };
     }
     // ── detail ──────────────────────────────────────────────────────────────
     async loadRevision(s) {
@@ -856,7 +861,7 @@ export class SessionService {
     }
     /** Existing projections, once per complete turn range, in absolute transcript coordinates. */
     async deriveRange(s, rows, baseIndex, initialTurn, journaled, refs, calls, reviewRows) {
-        return (await this.backgroundLinked(s, hydrateAnchorActivityScenes(withToolCallOutcomes((await this.backgroundUpdates(s, withMarkerKinds(withTurnIds(withAttachmentObjects(rows), baseIndex, initialTurn), s), reviewRows)), calls, s.active_stream_id, baseIndex), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, runningScene: !journaled, clipToolResults: true, baseIndex, refCounts: refs })));
+        return (await this.backgroundLinked(s, hydrateAnchorActivityScenes(withToolCallOutcomes((await this.backgroundUpdates(s, withMarkerKinds(withTurnIds(withAttachmentObjects(rows), baseIndex, initialTurn), s), reviewRows)), calls, s.active_stream_id, baseIndex), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, showReasoning: await this.deps.showReasoning?.(s.profile) ?? true, runningScene: !journaled, clipToolResults: true, baseIndex, refCounts: refs })));
     }
     async limitedDetail(s, index, limit, before, pending, journaled, retried = false) {
         let prefixEnd = s.messages.length;
@@ -867,7 +872,7 @@ export class SessionService {
         if (prompt !== undefined)
             prefixEnd = Math.min(prefixEnd, prompt);
         const dbPath = this.stateDbPath(s.profile);
-        const key = JSON.stringify([index.revision, index.length, statSignature(dbPath), statSignature(`${dbPath}-wal`), s.active_stream_id, pending, journaled, s.state_db_seen_id, s.state_db_seen_boundary, s.state_db_seen_stamp, s.updated_at, this.deps.activeProfile(), s.compression_anchor_summary, s.compression_anchor_message_key, s.compression_anchor_visible_idx, this.compactionWaiters.has(s.active_stream_id ?? '')]);
+        const key = JSON.stringify([index.revision, index.length, statSignature(dbPath), statSignature(`${dbPath}-wal`), s.active_stream_id, pending, journaled, s.state_db_seen_id, s.state_db_seen_boundary, s.state_db_seen_stamp, s.updated_at, this.deps.activeProfile(), this.compactionWaiters.has(s.active_stream_id ?? '')]);
         let cached = this.pageTails.get(index);
         if (cached?.key !== key || cached.contextRows !== s.context_messages || cached.contextLength !== s.context_messages.length) {
             const streaming = Boolean(s.active_stream_id && !this.compactionWaiters.has(s.active_stream_id));
@@ -946,7 +951,7 @@ export class SessionService {
                 return result;
             };
             cached = { key, tail, index: tailIndex, enoughContext, sources, contextRows: s.context_messages, contextLength: s.context_messages.length,
-                summary: { total: prefixEnd + tail.length, last: Math.max(index.summary(prefixEnd).maxTimestamp, tailIndex.summary().maxTimestamp), todo: tailIndex.summary().todo ?? index.summary(prefixEnd).todo, compression: index.compressionReference(s, prefixEnd, tailIndex) } };
+                summary: { total: prefixEnd + tail.length, last: Math.max(index.summary(prefixEnd).maxTimestamp, tailIndex.summary().maxTimestamp), todo: tailIndex.summary().todo ?? index.summary(prefixEnd).todo } };
             if (cacheable)
                 this.pageTails.set(index, cached);
         }
@@ -1078,7 +1083,7 @@ export class SessionService {
         if (journaled && !limited)
             transcript = withoutRunningTurnOutput(transcript, { ...journaled, localCount: s.messages.length });
         // Turn ids, tool outcomes and scenes are computed over the full transcript, so every window reports the same values.
-        const all = loadMessages && !limited ? (await this.backgroundLinked(s, hydrateAnchorActivityScenes(withToolCallOutcomes((await this.backgroundUpdates(s, withMarkerKinds(withTurnIds(withAttachmentObjects(transcript)), s))), s.tool_calls, s.active_stream_id), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, runningScene: !journaled, clipToolResults: msgLimit !== null }))) : [];
+        const all = loadMessages && !limited ? (await this.backgroundLinked(s, hydrateAnchorActivityScenes(withToolCallOutcomes((await this.backgroundUpdates(s, withMarkerKinds(withTurnIds(withAttachmentObjects(transcript)), s))), s.tool_calls, s.active_stream_id), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, showReasoning: await this.deps.showReasoning?.(s.profile) ?? true, runningScene: !journaled, clipToolResults: msgLimit !== null }))) : [];
         let truncated = limited?.messages ?? [];
         let offset = limited?.offset ?? 0;
         let summaryCount = limited?.total ?? null;
@@ -1134,8 +1139,6 @@ export class SessionService {
             attachTodoSnapshot(raw, limited.todo, s.extra[UNSETTLED_TODO_KEY]);
         else if (loadMessages)
             attachTodoState(raw, all, s.extra[UNSETTLED_TODO_KEY]);
-        if (loadMessages)
-            raw.compression_reference = limited ? limited.compression : compressionReference(s, all);
         if (mergedLast) {
             raw.last_message_at = Math.max(Number(raw.last_message_at ?? 0) || 0, mergedLast);
             raw.updated_at = Math.max(Number(raw.updated_at ?? 0) || 0, mergedLast);
@@ -1166,7 +1169,7 @@ export class SessionService {
         raw.notices = this.deps.runtime.sessionNotices?.(s.session_id) ?? [];
         raw.goal = this.deps.runtime.sessionGoal?.(s.session_id) ?? null;
         const publicRow = redactSessionData(raw, this.deps.redactEnabled());
-        return this.owner ? await this.owner.project(publicRow, msgLimit, msgBefore, loadMessages) : publicRow;
+        return this.publicProjection(this.owner ? await this.owner.project(publicRow, msgLimit, msgBefore, loadMessages) : publicRow, s.profile);
     }
     /**
      * TAL-454: the chat `/branch` copied, while it still loads (archived included). A compression continuation is also a
@@ -1237,13 +1240,13 @@ export class SessionService {
         return { synth, meta };
     }
     /** Python `_handle_session_get` without a sidecar: the state.db transcript as a (read-only or claimable) foreign stub. */
-    foreignMessages(messages, session) {
-        return hydrateAnchorActivityScenes(withToolCallOutcomes(withMarkerKinds(withTurnIds(messages), session), [], null), {});
+    foreignMessages(messages, session, showReasoning = true) {
+        return hydrateAnchorActivityScenes(withToolCallOutcomes(withMarkerKinds(withTurnIds(messages), session), [], null), {}, { showReasoning });
     }
     async foreignSessionDetail(sid, loadMessages, msgLimit, msgBefore) {
         const { synth, meta } = (await this.foreignSession(sid));
         // The same turn projection as a WebUI session: turn ids, tool outcomes, then each completed turn's scene.
-        const msgs = this.foreignMessages(synth.messages, synth);
+        const msgs = this.foreignMessages(synth.messages, synth, await this.deps.showReasoning?.(synth.profile) ?? true);
         const lastTs = Number(msgs[msgs.length - 1]?.timestamp ?? 0) || 0;
         const sess = {
             session_id: synth.session_id, title: synth.title, workspace: synth.workspace, model: synth.model, message_count: msgs.length,
@@ -1256,7 +1259,7 @@ export class SessionService {
         attachTodoState(sess, msgs);
         const merged = withSessionWireFlags((await this.ownerLocked([meta ? mergeCliSidebarMetadata(sess, meta) : sess]))[0], this.deps.runtime.activeStreamIds);
         const publicRow = redactSessionData(merged, this.deps.redactEnabled());
-        return this.owner ? await this.owner.project(publicRow, msgLimit, msgBefore, loadMessages) : publicRow;
+        return this.publicProjection(this.owner ? await this.owner.project(publicRow, msgLimit, msgBefore, loadMessages) : publicRow, synth.profile);
     }
     /** Clear persisted streaming flags when no live stream backs them (Python `_clear_stale_stream_state`). */
     async clearStaleStreamState(session) {
@@ -1511,7 +1514,8 @@ export class SessionService {
         const s = (await this.get404(sid));
         const inp = Math.trunc(s.input_tokens) || 0;
         const out = Math.trunc(s.output_tokens) || 0;
-        return { input_tokens: inp, output_tokens: out, total_tokens: inp + out, estimated_cost: s.estimated_cost, model: s.model };
+        const view = this.owner ? await this.owner.project(await this.wireRow(s), 0, null, false) : { plan_gauge: s.plan_gauge };
+        return { plan_gauge: view.plan_gauge ?? null, input_tokens: inp, output_tokens: out, total_tokens: inp + out, estimated_cost: s.estimated_cost, model: s.model };
     }
     // ── creation ─────────────────────────────────────────────────────────────
     /** Only retained, readable identities in the request profile can become search pointers. */
@@ -2493,6 +2497,9 @@ export class SessionService {
                 live.compression_anchor_message_key = anchorMessageKey(anchor);
                 live.compression_anchor_summary = anchorSummary(summary, compressed);
                 live.compression_anchor_mode = 'manual';
+                // TAL-1566: the compaction's own row follows the anchor (first without one), before a waiting turn's rows.
+                if (live.compression_anchor_summary)
+                    insertCompactionRow(live, anchor ? live.messages.indexOf(anchor) : -1, str(live.compression_anchor_summary), this.deps.now());
                 // #4836: an intentional-shrink boundary, so append-only state.db reconciliation does not replay compressed rows.
                 live.truncation_watermark = truncationWatermarkFor(compressed);
                 live.truncation_boundary = live.truncation_watermark;
@@ -2935,21 +2942,32 @@ export class SessionService {
     async cleanup(zeroOnly) {
         let cleaned = 0;
         const removed = new Set();
-        for (const s of (await this.store.scanAll())) {
-            const shouldDelete = zeroOnly ? s.messages.length === 0 : s.title === 'Untitled' && s.messages.length === 0;
-            if (!shouldDelete || (await this.isReadOnly(s)))
-                continue;
-            // A cleared session keeps its share; keep the session (and its revoke route) if the share cannot be revoked.
-            try {
-                (await this.deps.shares.revoke(s));
-            }
-            catch {
-                continue;
-            }
-            this.store.sessions.delete(s.session_id);
-            await this.store.delete(s.session_id, { tombstone: false });
-            cleaned += 1;
-            removed.add(s.session_id);
+        for (const candidate of (await this.store.scanAll())) {
+            await this.store.withLock(candidate.session_id, async () => {
+                let s;
+                try {
+                    s = await this.store.get(candidate.session_id);
+                }
+                catch (error) {
+                    if (error instanceof SessionNotFound)
+                        return;
+                    throw error;
+                }
+                const shouldDelete = zeroOnly ? s.messages.length === 0 : s.title === 'Untitled' && s.messages.length === 0;
+                if (!shouldDelete || (await this.isReadOnly(s)))
+                    return;
+                // Keep the session (and its revoke route) if its share cannot be revoked.
+                try {
+                    (await this.deps.shares.revoke(s));
+                }
+                catch {
+                    return;
+                }
+                if (!await this.store.delete(s.session_id, { tombstone: false }))
+                    return;
+                cleaned += 1;
+                removed.add(s.session_id);
+            });
         }
         let rewroteIndex = false;
         try {
@@ -3169,7 +3187,8 @@ export class SessionService {
         if (!sid || (!messageRef && messageIndex === null))
             throw new HttpFailure(400, 'session_id and message_ref or message_index are required');
         const { session, transcript, stored } = (await this.fullTranscript(sid));
-        const result = readAnchorSceneRows(session, { messageRef, messageIndex, before: anchorSceneIntOrNull(query.before), limit: anchorSceneIntOrNull(query.limit) }, withToolCallOutcomes(withTurnIds(transcript), session.tool_calls, session.active_stream_id));
+        const show = await this.deps.showReasoning?.(session.profile) ?? true;
+        const result = readAnchorSceneRows(session, { messageRef, messageIndex, before: anchorSceneIntOrNull(query.before), limit: anchorSceneIntOrNull(query.limit) }, withToolCallOutcomes(withTurnIds(transcript), session.tool_calls, session.active_stream_id), show);
         if (!result)
             throw new HttpFailure(404, 'Anchor activity scene not found');
         // Paged rows come from the raw transcript, so they take the same credential redaction as the detail's preview.
@@ -3247,41 +3266,55 @@ export class SessionService {
         });
     }
     // ── shares ───────────────────────────────────────────────────────────────
-    async createShare(sid) {
-        this.rejectClaudeCode(sid, 'shared');
-        let s = (await this.get404(sid));
-        if (!this.visibleToActiveProfile(s.profile))
-            throw new HttpFailure(404, 'Session not found');
-        s = (await this.store.ensureFull(sid, s));
-        let snapshot;
+    async withShareLock(sid, fn) {
+        sid = await this.resolveSessionId(sid);
+        return this.store.withLock(sid, async () => {
+            const session = await this.get404(sid);
+            if (!this.visibleToActiveProfile(session.profile))
+                throw new HttpFailure(404, 'Session not found');
+            return fn(await this.store.ensureFull(sid, session));
+        });
+    }
+    async saveShareOwnership(session, token, createdAt) {
+        const previous = { share_token: session.share_token, share_created_at: session.share_created_at };
+        session.share_token = token;
+        session.share_created_at = createdAt;
         try {
-            snapshot = buildShareSnapshot(s, s.messages, { hermesHome: this.deps.hermesHome, attachmentRoot: this.deps.attachmentDir('').replace(/\/[^/]*$/, ''), home: this.deps.home });
+            await this.store.save(session, { touchUpdatedAt: false });
         }
         catch (error) {
-            throw new HttpFailure(400, error.message);
+            Object.assign(session, previous);
+            // A failed acknowledgement may follow a commit; the next operation must read persisted ownership.
+            this.store.sessions.delete(session.session_id);
+            throw error;
         }
-        const meta = (await this.deps.shares.createOrRefresh(s, snapshot));
-        s.share_token = meta.share_token;
-        s.share_created_at = meta.share_created_at;
-        await this.store.save(s, { touchUpdatedAt: false });
-        this.publish('session_share_create', s.profile, sid);
-        return {
-            ok: true,
-            share: { token: meta.share_token, url: sharePath(meta.share_token) ?? '', title: meta.share_title, message_count: meta.share_message_count, created_at: meta.share_created_at, updated_at: meta.share_updated_at },
-            session: (await this.publicSession(s)),
-        };
+    }
+    async createShare(sid) {
+        this.rejectClaudeCode(sid, 'shared');
+        return this.withShareLock(sid, async (s) => {
+            let snapshot;
+            try {
+                snapshot = buildShareSnapshot(s, s.messages, { hermesHome: this.deps.hermesHome, attachmentRoot: this.deps.attachmentDir('').replace(/\/[^/]*$/, ''), home: this.deps.home });
+            }
+            catch (error) {
+                throw new HttpFailure(400, error.message);
+            }
+            const meta = await this.deps.shares.createOrRefresh(s, snapshot, (owner) => this.saveShareOwnership(s, owner.share_token, owner.share_created_at));
+            this.publish('session_share_create', s.profile, s.session_id);
+            return {
+                ok: true,
+                share: { token: meta.share_token, url: sharePath(meta.share_token) ?? '', title: meta.share_title, message_count: meta.share_message_count, created_at: meta.share_created_at, updated_at: meta.share_updated_at },
+                session: (await this.publicSession(s)),
+            };
+        });
     }
     async revokeShare(sid) {
-        let s = (await this.get404(sid));
-        if (!this.visibleToActiveProfile(s.profile))
-            throw new HttpFailure(404, 'Session not found');
-        s = (await this.store.ensureFull(sid, s));
-        await this.deps.shares.revoke(s);
-        s.share_token = null;
-        s.share_created_at = null;
-        await this.store.save(s, { touchUpdatedAt: false });
-        this.publish('session_share_revoke', s.profile, sid);
-        return { ok: true, session: (await this.publicSession(s)) };
+        return this.withShareLock(sid, async (s) => {
+            await this.deps.shares.revoke(s);
+            await this.saveShareOwnership(s, null, null);
+            this.publish('session_share_revoke', s.profile, s.session_id);
+            return { ok: true, session: (await this.publicSession(s)) };
+        });
     }
     async loadShare(token) {
         const share = (await this.deps.shares.load(token));
@@ -3404,6 +3437,13 @@ function truncationWatermarkFor(messages) {
     return Number.isFinite(ts) ? ts : 0.0;
 }
 function stampIntentionalShrink(session, oldCount, newCount) {
+    // TAL-1566: a cut that removed the newest compaction's row ends its anchor too, so no later load restores the row.
+    const summary = str(session.compression_anchor_summary).trim();
+    if (summary && !session.messages.some((m) => isCompactionRow(m) && str(m.content).trim() === summary)) {
+        session.compression_anchor_summary = null;
+        session.compression_anchor_message_key = null;
+        session.compression_anchor_visible_idx = null;
+    }
     if (newCount >= oldCount)
         return false;
     session.intentional_shrink_generation = randomUUID().replace(/-/g, '');