@maudecode/talaria-web 1.20.0 → 1.21.0

package/dist/sessions/turn.js

@@ -396,6 +396,7 @@ export class TurnRunner {
             timing.finish('noop');
             return { stream_id: str(accepted[opts.completionKeys[0]]), session_id: s.session_id };
         }
+        opts.admissionCheck?.(s);
         closeChecks();
         const streamId = randomUUID().replace(/-/g, '');
         timing.identify(s.session_id, streamId);
@@ -443,7 +444,7 @@ export class TurnRunner {
         const previousUpdates = s.extra.background_updates;
         if (opts.backgroundUpdate)
             recordBackgroundUpdate(s, streamId, opts.backgroundUpdate);
-        const admission = { stream_id: streamId, session_id: s.session_id, started_at: this.deps.now(), phase: 'starting', workspace: opts.workspace, model: opts.model, provider: opts.modelProvider, ephemeral: Boolean(opts.ephemeral), origin: turnOrigin(source), admitting: true };
+        const admission = { stream_id: streamId, session_id: s.session_id, started_at: this.deps.now(), phase: 'starting', workspace: opts.workspace, model: opts.model, provider: opts.modelProvider, ephemeral: Boolean(opts.ephemeral), ...(opts.activityParentSessionId ? { activity_parent_session_id: opts.activityParentSessionId } : {}), origin: turnOrigin(source), admitting: true };
         this.registry.registerActiveRun(admission);
         try {
             await timing.measure('admission_persistence', () => this.deps.store.save(s));
@@ -718,7 +719,7 @@ export class TurnRunner {
             // start an Agent turn (the client also refuses an already-aborted signal outright).
             if (this.registry.cancelled.has(streamId)) {
                 await this.finalizeCancelled(s, streamId, opts.ephemeral);
-                await put('cancel', (await this.cancelFrame(sessionId)));
+                await put('cancel', (await this.cancelFrame(sessionId, streamId)));
                 return;
             }
             const turnContext = {
@@ -992,7 +993,7 @@ export class TurnRunner {
                 applyAgentUsage(liveUsage, result.usage);
                 this.liveUsage.set(streamId, liveUsage);
                 await this.finalizeCancelled(s, streamId, opts.ephemeral, interrupted?.checkpoint ? withImages(interrupted.checkpoint) : result.messages);
-                await put('cancel', (await this.cancelFrame(sessionId)));
+                await put('cancel', (await this.cancelFrame(sessionId, streamId)));
                 return;
             }
             // Writeback only while this stream still owns the session (Python `_stream_writeback_is_current`).
@@ -1037,7 +1038,7 @@ export class TurnRunner {
                 await this.persistError(s, settlement, streamId, classification.label, payload, activeTurnToken, resultMessages, result.provider);
                 // TAL-512: a btw error carries no session: its journaled frame must not keep a copy of the parent conversation.
                 if (!opts.ephemeral)
-                    payload.session = (await this.publicTerminalSession(s));
+                    payload.session = (await this.publicTerminalSession(s, streamId));
                 payload.session_id = s.session_id;
                 payload.old_session_id = sessionId;
                 for (const [event, data] of steerEvents)
@@ -1200,7 +1201,7 @@ export class TurnRunner {
                 cache_hit_percent: cacheHit(cacheReadTokens, inputTokens), turn_cache_hit_percent: cacheHit(turnCacheRead, turnInput), duration_seconds: Math.round(duration * 1000) / 1000,
                 context_length: s.context_length ?? 0, threshold_tokens: s.threshold_tokens ?? 0, last_prompt_tokens: s.last_prompt_tokens ?? 0,
             };
-            const doneSession = (await this.publicTerminalSession(s));
+            const doneSession = (await this.publicTerminalSession(s, streamId));
             // TAL-299: the ring's figures match the terminal session's (and a detail reload's).
             for (const key of CONTEXT_USAGE_FIELDS)
                 doneUsage[key] = doneSession[key];
@@ -1258,7 +1259,7 @@ export class TurnRunner {
                         s.extra.completion_acceptances = Object.fromEntries(Object.entries(s.extra.completion_acceptances).filter(([, value]) => value !== streamId));
                     await deps.store.save(s, { touchUpdatedAt: false });
                 }
-                await put('apperror', { type: 'error', terminal_state: 'error', message: readOnly, session_id: sessionId, session: (await this.publicTerminalSession(s)) });
+                await put('apperror', { type: 'error', terminal_state: 'error', message: readOnly, session_id: sessionId, session: (await this.publicTerminalSession(s, streamId)) });
                 return;
             }
             if (settledAt.value && !(error instanceof SidecarError)) {
@@ -1268,7 +1269,7 @@ export class TurnRunner {
             const settlement = await deps.service().settlementRead(s);
             if (this.registry.cancelled.has(streamId)) {
                 await this.finalizeCancelled(s, streamId, opts.ephemeral);
-                await put('cancel', (await this.cancelFrame(sessionId)));
+                await put('cancel', (await this.cancelFrame(sessionId, streamId)));
                 return;
             }
             const message = error instanceof Error ? error.message : String(error);
@@ -1292,7 +1293,7 @@ export class TurnRunner {
                         (await put(event, data));
                     await this.persistError(current, settlement, streamId, classification.label, payload, activeTurnToken);
                     if (!opts.ephemeral)
-                        payload.session = (await this.publicTerminalSession(current));
+                        payload.session = (await this.publicTerminalSession(current, streamId));
                 }
             }
             catch (persistError) {
@@ -1394,8 +1395,14 @@ export class TurnRunner {
         return images ? [{ type: 'text', text: withFiles() }, ...parts] : withFiles();
     }
     /** The settled session as a terminal frame carries it: the display window, redacted. */
-    async publicTerminalSession(s) {
-        return this.deps.service().windowedDetail(s, TRANSCRIPT_WINDOW);
+    async publicTerminalSession(s, streamId) {
+        const terminal = streamId ? this.deps.service().activitySummary(s, streamId)?.terminalState : null;
+        const payload = await this.deps.service().windowedDetail(s, TRANSCRIPT_WINDOW);
+        if (!streamId)
+            return payload;
+        const terminalPhase = terminal === 'completed' || terminal === 'tool_limit_reached' ? 'completed' : terminal === 'cancelled' ? 'cancelled' : 'failed';
+        payload.activity_phase = await this.deps.service().activityPhase(s, { excludeStreamId: streamId, terminalPhase });
+        return payload;
     }
     /** TAL-540, Python `_live_usage_snapshot`: a finished compression's frame, with the counters and the ring's post-compression figures, so clients update before `done`. */
     compressedFrame(s) {
@@ -1547,11 +1554,11 @@ export class TurnRunner {
      * Python `_emit_cancel_event`: the terminal frame carries the settled session so tabs can render the partial without a
      * reload. TAL-364: no copy — clients show their one localized status for the `cancelled` outcome.
      */
-    async cancelFrame(sessionId) {
+    async cancelFrame(sessionId, streamId) {
         let snapshot = null;
         if (sessionId)
             try {
-                snapshot = (await this.publicTerminalSession((await this.deps.store.get(sessionId))));
+                snapshot = (await this.publicTerminalSession((await this.deps.store.get(sessionId)), streamId));
             }
             catch {
                 snapshot = null;
@@ -2069,7 +2076,7 @@ export class TurnRunner {
                 (await emit(event, data));
             this.runStatuses.delete(streamId);
             await emit('run_status', { session_id: sessionId, status: null });
-            await emit('cancel', (await this.cancelFrame(sessionId)));
+            await emit('cancel', (await this.cancelFrame(sessionId, streamId)));
             this.registry.streams.delete(streamId);
             this.registry.liveIds.delete(streamId);
         }