@maudecode/talaria-web 1.11.0 → 1.13.0

package/dist/sessions/service.js

@@ -1,15 +1,15 @@
 import { str } from '../util.js';
 import { randomUUID } from 'node:crypto';
 import { rmSync } from 'node:fs';
-import { copyJson, redactSessionData, redactValue, stripPublicInternalFields } from '../redact.js';
+import { buildActiveTurnToken, copyJson, redactSessionData, redactValue, stripPublicInternalFields, withSceneToolDisplay } from '../redact.js';
 import { DraftVersionConflict, normalizeDraftVersion } from './drafts.js';
-import { allSessions, buildSessionListPayload, isMessagingSessionRecord, lineageRootId, mergeCliSidebarMetadata, sessionListResponse, sessionSearchMessageText, sessionSearchPreview } from './list.js';
+import { allSessions, buildSessionListPayload, isClaimableCliSource, isMessagingSessionRecord, withOwnerLocks, withSessionWireFlags, lineageRootId, mergeCliSidebarMetadata, sessionListResponse, sessionSearchMessageText, sessionSearchPreview } from './list.js';
 import { anchorSceneIntOrNull, hydrateAnchorActivityScenes, normalizeAnchorSceneMessageRef, readAnchorSceneRows, storeAnchorScene, withTurnIds } from './anchor.js';
 import { isSafeSessionId, lastMessageTimestamp, Session, titleFrom } from './session.js';
 import { SessionBusy, SessionNotFound, statSignature } from './store.js';
 import { attachTodoState } from './todo.js';
-import { stateDbSessionMessages, stateDbSessionRow } from './state-db.js';
-import { mergeSessionMessagesAppendOnly } from './merge.js';
+import { stateDbSessionMessages, stateDbSessionRow, stateDbSessionSources } from './state-db.js';
+import { mergeSessionMessagesAppendOnly, pendingUserRow, withPendingUserTurn, withToolCallOutcomes, withoutRunningTurnOutput } from './merge.js';
 import { messagesForLimitedPayload, messageWindowForDisplay, MAX_MSG_LIMIT, parseMsgLimit, toolCallsForMessageWindow } from './window.js';
 import { redactText } from '../redact.js';
 import { buildShareSnapshot } from './shares.js';
@@ -62,7 +62,7 @@ export class SessionService {
     isReadOnlyImport(sid) {
         try {
             const s = this.store.get(sid, { metadataOnly: true });
-            if (s.read_only)
+            if (this.isReadOnly(s))
                 return true;
         }
         catch {
@@ -85,11 +85,20 @@ export class SessionService {
         const meta = this.lookupCliMeta(sid);
         return meta !== null && str(meta.source_tag || meta.raw_source || meta.source).trim().toLowerCase() === 'subagent';
     }
+    /** TAL-358: batched `sessions.source` owners from the active profile's state.db. */
+    stateDbSources = (ids) => stateDbSessionSources(join(this.deps.profileHome(this.deps.activeProfile()), 'state.db'), ids);
+    /** The persisted flag folded with the state.db owner lock (TAL-358): the one read-only rule for mutation gates and the wire. */
+    isReadOnly(s) {
+        if (s.read_only)
+            return true;
+        const [row] = withOwnerLocks([{ session_id: s.session_id, source_tag: s.source_tag, raw_source: s.raw_source, session_source: s.session_source }], this.stateDbSources);
+        return Boolean(row?.read_only);
+    }
     /** Full session for mutation, refusing read-only imports (Python `_get_or_materialize_session`). */
     getForMutation(sid) {
         let s = this.get404(sid);
         s = this.store.ensureFull(sid, s);
-        if (s.read_only)
+        if (this.isReadOnly(s))
             throw new HttpFailure(403, 'Read-only imported sessions cannot be modified from WebUI');
         if (str(s.source_tag || s.raw_source).trim().toLowerCase() === 'subagent')
             throw new HttpFailure(403, 'Read-only subagent child session');
@@ -141,23 +150,6 @@ export class SessionService {
             return null;
         }
     }
-    /** Python `_is_claimable_cli_source`: a denylist of foreign families that own their sessions. */
-    claimableCliSource(meta, stateDbSource) {
-        if (meta.read_only)
-            return false;
-        const sessionSource = str(meta.session_source).trim().toLowerCase();
-        if (['messaging', 'external_agent'].includes(sessionSource))
-            return false;
-        const tag = str(meta.source_tag || meta.raw_source).trim().toLowerCase();
-        const refused = new Set(['claude_code', 'cron', 'external_agent', 'gateway', 'messaging', 'subagent', 'unknown']);
-        if (tag && refused.has(tag))
-            return false;
-        if (isMessagingSessionRecord(meta))
-            return false;
-        if (!tag && stateDbSource && refused.has(stateDbSource.trim().toLowerCase()))
-            return false;
-        return true;
-    }
     /** Python `_session_index_marks_was_webui`: an index row that once owned a WebUI sidecar (self-heal 404). */
     indexMarksWasWebui(sid) {
         let entries;
@@ -214,7 +206,7 @@ export class SessionService {
             if (!meta.updated_at && (row.ended_at || row.started_at))
                 meta.updated_at = row.ended_at || row.started_at;
         }
-        const claimable = this.claimableCliSource(meta, stateDbSource);
+        const claimable = isClaimableCliSource(meta, stateDbSource);
         const workspace = str(meta.workspace || meta.cwd).trim() || this.deps.workspaces.lastWorkspace(profile);
         const defaults = this.store.deps.defaults(profile);
         const session = new Session({
@@ -243,12 +235,16 @@ export class SessionService {
     }
     /** `compact()` plus messages, redacted for the wire (Python `_public_session_projection`). */
     publicSession(s, withMessages = true) {
-        const payload = s.compact();
+        const payload = 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 = hydrateAnchorActivityScenes(withTurnIds(s.messages), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id });
+            payload.messages = hydrateAnchorActivityScenes(withToolCallOutcomes(withTurnIds(s.messages), s.tool_calls, s.active_stream_id), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id });
         return redactSessionData(payload, this.deps.redactEnabled());
     }
+    /** `compact()` with the wire streaming/read-only flags (TAL-312), for replies that return the session row. */
+    wireRow(s) {
+        return withSessionWireFlags({ ...s.compact(), read_only: this.isReadOnly(s) }, this.deps.runtime.activeStreamIds);
+    }
     /** Python `public_session_projection(s.__dict__)`: every persisted field, redacted (session export). */
     publicSessionDocument(s) {
         return redactSessionData(s.toDocument(), this.deps.redactEnabled());
@@ -279,8 +275,15 @@ export class SessionService {
             throw new HttpFailure(404, 'Session not found');
         }
         this.clearStaleStreamState(s);
-        // Turn ids and scenes are computed over the full transcript, so every window reports the same values.
-        const all = loadMessages ? hydrateAnchorActivityScenes(withTurnIds(this.mergedTranscript(s)), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, clipToolResults: msgLimit !== null }) : [];
+        const journaled = loadMessages ? this.journaledActiveTurn(s) : null;
+        let transcript = loadMessages ? this.mergedTranscript(s) : [];
+        const pending = loadMessages ? this.pendingTurn(s) : null;
+        if (pending)
+            transcript = withPendingUserTurn(transcript, pending);
+        if (journaled)
+            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 ? hydrateAnchorActivityScenes(withToolCallOutcomes(withTurnIds(transcript), s.tool_calls, s.active_stream_id), s.anchor_activity_scenes, { activeTurnId: s.active_stream_id, clipToolResults: msgLimit !== null }) : [];
         let truncated = [];
         let offset = 0;
         let summaryCount = null;
@@ -288,6 +291,14 @@ export class SessionService {
         if (loadMessages) {
             ;
             [truncated, offset] = messageWindowForDisplay(all, msgLimit, msgBefore);
+            // TAL-368: a tail window starts no later than the running turn's prompt, so a turn whose output stays in the
+            // transcript (no journal to replay it) keeps its prompt; older pages end before it, so it is never sent twice.
+            // ponytail: the window grows with that turn's persisted rows; clip the turn instead if degraded runs get long.
+            const prompt = pending && msgBefore === null ? all.findIndex((m) => isDict(m) && m.role === 'user' && m._active_turn_token === pending.activeTurnToken) : -1;
+            if (prompt >= 0 && prompt < offset) {
+                truncated = all.slice(prompt, offset + truncated.length);
+                offset = prompt;
+            }
             if (msgLimit !== null)
                 truncated = messagesForLimitedPayload(truncated);
         }
@@ -310,7 +321,6 @@ export class SessionService {
             messages: truncated,
             message_count: mergedCount,
             tool_calls: toolCalls,
-            active_stream_id: s.active_stream_id,
             pending_user_message: s.pending_user_message,
             pending_attachments: loadMessages ? s.pending_attachments : [],
             pending_started_at: s.pending_started_at,
@@ -319,6 +329,8 @@ export class SessionService {
             threshold_tokens: Number(s.threshold_tokens ?? 0) || 0,
             last_prompt_tokens: Number(s.last_prompt_tokens ?? 0) || 0,
         };
+        if (loadMessages)
+            raw.transcript_seq = journaled ? { stream_id: journaled.turnId, seq: 0 } : null;
         if (loadMessages && all.length)
             attachTodoState(raw, all);
         if (mergedLast) {
@@ -331,12 +343,34 @@ export class SessionService {
         raw._msg_limit_max = MAX_MSG_LIMIT;
         const revisionAfter = this.loadRevision(s);
         raw._load_revision = revisionBefore !== null && revisionBefore === revisionAfter ? hashRevision(revisionBefore) : `unstable-${randomUUID().replace(/-/g, '')}`;
-        if (str(raw.source_tag || raw.raw_source || raw.session_source).trim().toLowerCase() === 'subagent') {
-            raw.is_cli_session = false;
-            raw.read_only = true;
-        }
+        raw.read_only = this.isReadOnly(s);
+        withSessionWireFlags(raw, activeStreamIds);
         return redactSessionData(raw, this.deps.redactEnabled());
     }
+    /**
+     * TAL-316: the active run whose journal can replay its output from the start. The detail then leaves that output to the
+     * replay; with no active run, no identifiable prompt, or no complete journal, it returns the persisted transcript unchanged.
+     */
+    journaledActiveTurn(s) {
+        const turnId = str(s.active_stream_id).trim();
+        const activeTurnToken = buildActiveTurnToken(turnId, s.pending_started_at);
+        if (!turnId || !activeTurnToken || this.deps.runtime.journalDegraded(turnId))
+            return null;
+        const summary = this.deps.journal?.findRunSummary(turnId);
+        if (summary?.session_id !== s.session_id || summary.journal_pruned)
+            return null;
+        return { turnId, startedAt: Number(s.pending_started_at), activeTurnToken };
+    }
+    /** TAL-368: the active run's prompt, which the detail shows until settlement persists it; null when idle or promptless. */
+    pendingTurn(s) {
+        const turnId = str(s.active_stream_id).trim();
+        const activeTurnToken = buildActiveTurnToken(turnId, s.pending_started_at);
+        const text = str(s.pending_user_message);
+        if (!turnId || !activeTurnToken || (!text && !s.pending_attachments.length))
+            return null;
+        const startedAt = Number(s.pending_started_at);
+        return { turnId, startedAt, activeTurnToken, localCount: s.messages.length, prompt: pendingUserRow(text, s.pending_attachments, startedAt, s.pending_user_source || 'webui', turnId) };
+    }
     /** A session without a sidecar, synthesized from state.db for this profile; 404/409 like the detail. */
     foreignSession(sid) {
         const meta = this.lookupCliMeta(sid);
@@ -355,18 +389,18 @@ export class SessionService {
     /** Python `_handle_session_get` without a sidecar: the state.db transcript as a (read-only or claimable) foreign stub. */
     foreignSessionDetail(sid) {
         const { synth, meta } = this.foreignSession(sid);
-        // The same turn projection as a WebUI session: turn ids, then each completed turn's scene.
-        const msgs = hydrateAnchorActivityScenes(withTurnIds(synth.messages), {});
+        // The same turn projection as a WebUI session: turn ids, tool outcomes, then each completed turn's scene.
+        const msgs = hydrateAnchorActivityScenes(withToolCallOutcomes(withTurnIds(synth.messages), [], null), {});
         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,
             created_at: synth.created_at, updated_at: synth.updated_at, last_message_at: meta?.last_message_at || meta?.updated_at || lastTs,
             pinned: synth.pinned, archived: synth.archived, project_id: synth.project_id ?? null, profile: synth.profile,
             is_cli_session: synth.is_cli_session, source_tag: synth.source_tag, raw_source: synth.raw_source, session_source: synth.session_source,
-            source_label: synth.source_label, read_only: synth.read_only, messages: msgs, tool_calls: [],
+            source_label: synth.source_label, read_only: synth.read_only, can_duplicate: false, messages: msgs, tool_calls: [], transcript_seq: null,
         };
         attachTodoState(sess, msgs);
-        const merged = meta ? mergeCliSidebarMetadata(sess, meta) : sess;
+        const merged = withSessionWireFlags(meta ? mergeCliSidebarMetadata(sess, meta) : sess, this.deps.runtime.activeStreamIds);
         return redactSessionData(merged, this.deps.redactEnabled());
     }
     /** Clear persisted streaming flags when no live stream backs them (Python `_clear_stale_stream_state`, no journal recovery). */
@@ -434,7 +468,7 @@ export class SessionService {
         // Python reads every profile's state.db under all_profiles; this port projects the active profile only.
         const cliRows = wantState ? this.deps.cliSessions(activeProfile, { sourceFilter: params.sourceFilter ?? null }) : undefined;
         const gatewayIdentity = loadGatewaySessionIdentityMap(join(this.deps.profileHome(activeProfile), 'sessions', 'sessions.json'));
-        const payload = buildSessionListPayload(this.store, { ...params, ...(cliRows ? { cliRows } : {}), gatewayIdentity, activeProfile, isolatedProfileMode: this.deps.isolatedProfileMode(), profilesMatch: this.deps.profilesMatch });
+        const payload = buildSessionListPayload(this.store, { ...params, ...(cliRows ? { cliRows } : {}), gatewayIdentity, stateDbSources: this.stateDbSources, activeProfile, isolatedProfileMode: this.deps.isolatedProfileMode(), profilesMatch: this.deps.profilesMatch });
         return sessionListResponse(payload, this.deps.runtime, this.deps.redactEnabled(), this.deps.now());
     }
     search(q, opts) {
@@ -442,8 +476,10 @@ export class SessionService {
         let sessions = allSessions(this.store);
         if (!opts.allProfiles)
             sessions = sessions.filter((r) => this.deps.profilesMatch(str(r.profile) || null, activeProfile));
+        sessions = withOwnerLocks(sessions, this.stateDbSources);
         const redact = this.deps.redactEnabled();
         const redactRow = (item) => {
+            withSessionWireFlags(item, this.deps.runtime.activeStreamIds);
             if (typeof item.title === 'string')
                 item.title = redactText(item.title, redact);
             for (const f of ['display_title', '_state_db_title', 'parent_title'])
@@ -499,10 +535,10 @@ export class SessionService {
         catch {
             hermesHome = '';
         }
-        const live = full.active_stream_id && this.deps.runtime.activeStreamIds.has(full.active_stream_id) ? full.active_stream_id : null;
+        const { is_streaming: streaming, active_stream_id: live, read_only: readOnly } = this.wireRow(full);
         return {
             session_id: full.session_id, title: full.title, model: full.model, profile, hermes_home: hermesHome, workspace: full.workspace, personality: full.personality,
-            message_count: full.messages.length, created_at: full.created_at, updated_at: full.updated_at, agent_running: Boolean(full.active_stream_id), active_stream_id: live,
+            message_count: full.messages.length, created_at: full.created_at, updated_at: full.updated_at, agent_running: streaming, is_streaming: streaming, active_stream_id: live, read_only: readOnly,
             input_tokens: inp, output_tokens: out, total_tokens: inp + out, estimated_cost: full.estimated_cost,
         };
     }
@@ -574,7 +610,7 @@ export class SessionService {
         catch {
             throw new HttpFailure(404, 'Session not found');
         }
-        if (current.read_only)
+        if (this.isReadOnly(current))
             throw new HttpFailure(403, `Session ${sid} is read-only`);
         await this.store.withLock(sid, () => {
             current.title = title;
@@ -593,7 +629,7 @@ export class SessionService {
         });
         await this.deps.syncTitle(s);
         this.publish('session_rename', s.profile, s.session_id);
-        return { session: s.compact() };
+        return { session: this.wireRow(s) };
     }
     // The pin quota is counted across sessions, so the count-and-save transaction runs on one process-wide chain;
     // per-session locks alone would let two pins of different sessions both see the last free slot.
@@ -623,7 +659,7 @@ export class SessionService {
             this.store.save(s);
         });
         this.publish('session_pin', s.profile, s.session_id);
-        return { ok: true, session: s.compact() };
+        return { ok: true, session: this.wireRow(s) };
     }
     async archive(sid, archived) {
         this.rejectSubagent(sid, 'archived');
@@ -636,7 +672,7 @@ export class SessionService {
             this.store.save(s, { touchUpdatedAt: false });
         });
         this.publish('session_archive', s.profile, s.session_id);
-        return { ok: true, session: s.compact(), ...worktreeRetainedPayload(s) };
+        return { ok: true, session: this.wireRow(s), ...worktreeRetainedPayload(s) };
     }
     async move(sid, targetProjectId) {
         const s = this.mutationTarget(sid, 'moved');
@@ -658,7 +694,7 @@ export class SessionService {
             throw error;
         }
         this.publish('session_move', s.profile, s.session_id);
-        return { ok: true, session: s.compact() };
+        return { ok: true, session: this.wireRow(s) };
     }
     async update(sid, body) {
         const s = this.mutationTarget(sid, 'updated');
@@ -696,7 +732,7 @@ export class SessionService {
     async setToolsets(sid, toolsets) {
         this.rejectSubagent(sid, 'modified');
         const cleaned = this.validateToolsetsShape(toolsets);
-        const s = this.get404(sid);
+        const s = this.mutationTarget(sid, 'modified');
         await this.store.withLock(sid, () => {
             s.enabled_toolsets = cleaned;
             this.store.save(s);
@@ -718,7 +754,7 @@ export class SessionService {
         this.rejectSubagent(sid, 'modified');
         if (keepRaw === null || keepRaw === undefined)
             throw new HttpFailure(400, 'Missing required field(s): keep_count');
-        const s = this.get404(sid);
+        const s = this.mutationTarget(sid, 'modified');
         // Python `int(body["keep_count"])`: a float truncates, a non-integer string is rejected.
         let keep;
         if (typeof keepRaw === 'number')
@@ -740,7 +776,7 @@ export class SessionService {
     }
     async clear(sid) {
         this.rejectSubagent(sid, 'modified');
-        const s = this.get404(sid);
+        const s = this.mutationTarget(sid, 'modified');
         await this.store.withLock(sid, () => {
             const hadMessages = s.messages.length > 0;
             truncateSessionAtKeep(s, 0);
@@ -775,12 +811,12 @@ export class SessionService {
             }
         });
         this.deps.runtime.evictAgent(sid);
-        return { ok: true, session: s.compact() };
+        return { ok: true, session: this.wireRow(s) };
     }
     async retry(sid) {
         this.rejectSubagent(sid, 'modified');
         return this.store.withLock(sid, () => {
-            const s = this.get404(sid);
+            const s = this.mutationTarget(sid, 'modified');
             const history = s.messages;
             const lastUser = findLastUserIndex(history);
             if (lastUser === null)
@@ -795,7 +831,7 @@ export class SessionService {
     async undo(sid) {
         this.rejectSubagent(sid, 'modified');
         return this.store.withLock(sid, () => {
-            const s = this.get404(sid);
+            const s = this.mutationTarget(sid, 'modified');
             const history = s.messages;
             const lastUser = findLastUserIndex(history);
             if (lastUser === null)
@@ -833,7 +869,7 @@ export class SessionService {
         if (this.isSubagentViewOnly(sid))
             throw new HttpFailure(400, 'Subagent sessions are view-only and cannot be branched from WebUI');
         const source = this.get404(sid);
-        if (source.read_only) {
+        if (this.isReadOnly(source)) {
             if (str(source.source_tag || source.raw_source).trim().toLowerCase() !== 'cron')
                 throw new HttpFailure(403, 'Read-only sessions cannot be branched from WebUI');
             source.branchSourceReadonly = true;
@@ -1189,11 +1225,13 @@ export class SessionService {
             session = this.foreignSession(sid).synth;
             transcript = session.messages;
         }
-        const result = readAnchorSceneRows(session, { messageRef, messageIndex, before: anchorSceneIntOrNull(query.before), limit: anchorSceneIntOrNull(query.limit) }, withTurnIds(transcript));
+        const result = readAnchorSceneRows(session, { messageRef, messageIndex, before: anchorSceneIntOrNull(query.before), limit: anchorSceneIntOrNull(query.limit) }, withToolCallOutcomes(withTurnIds(transcript), session.tool_calls, session.active_stream_id));
         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.
-        return redactValue(result, this.deps.redactEnabled());
+        const enabled = this.deps.redactEnabled();
+        const redacted = redactValue(result, enabled);
+        return { ...redacted, rows: withSceneToolDisplay(result.rows, redacted.rows, enabled) };
     }
     // ── shares ───────────────────────────────────────────────────────────────
     createShare(sid) {