@roackb2/heddle 1.2.0 → 1.3.0

package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.d.ts

@@ -1,27 +1,13 @@
-import type { ChatMessage, LlmAdapter, RunResult } from '../../../../../index.js';
+import type { RunResult } from '../../../../../index.js';
+import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
 import type { ChatSession } from '../../../state/types.js';
-import type { ChatRuntimeConfig } from '../../../utils/runtime.js';
 import type { ActionState } from '../useAgentRunController.js';
-import type { TuiCompactionStatusEvent } from './tui-compaction-status.js';
 type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
 export declare function adaptPersistedTuiOrdinaryTurn(args: {
     session: ChatSession;
     displayText?: string;
     outcome: RunResult['outcome'];
 }): ChatSession;
-export declare function applyTuiAgentTurnResult(args: {
-    result: RunResult;
-    prompt: string;
-    sessionId: string;
-    historyForRun: ChatMessage[];
-    toolNames: string[];
-    runtime: ChatRuntimeConfig;
-    llm: LlmAdapter;
-    state: ActionState;
-    updateSessionById: SessionUpdater;
-    maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;
-    emitCompactionStatus: (event: TuiCompactionStatusEvent, sourceHistory: RunResult['transcript']) => void;
-}): Promise<void>;
 export declare function finalizeSuccessfulTuiOrdinaryTurn(args: {
     persistedSession: ChatSession;
     displayText?: string;
@@ -34,7 +20,7 @@ export declare function finalizeSuccessfulTuiOrdinaryTurn(args: {
 }): {
     session: ChatSession;
     summaryText: string;
-    latestHistory: ChatMessage[];
+    latestHistory: import("../../../../../index.js").ChatMessage[];
 };
 export declare function applyTuiAgentTurnFailure(args: {
     error: unknown;
@@ -42,7 +28,8 @@ export declare function applyTuiAgentTurnFailure(args: {
     model: string;
     state: ActionState;
     sessionId: string;
-    updateSessionById: SessionUpdater;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
 }): Promise<void>;
 export {};
 //# sourceMappingURL=tui-agent-turn-result.d.ts.map

package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-agent-turn-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-agent-turn-result.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAKlF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAE3E,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC/B,GAAG,WAAW,CAiBd;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,GAAG,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,WAAW,CAAC;IACnB,iBAAiB,EAAE,cAAc,CAAC;IAClC,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,oBAAoB,EAAE,CAAC,KAAK,EAAE,wBAAwB,EAAE,aAAa,EAAE,SAAS,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;CACzG,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEhB;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,gBAAgB,EAAE,WAAW,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,cAAc,CAAC;CACnC;;;;EAoCA;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,cAAc,CAAC;CACnC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhB"}
+{"version":3,"file":"tui-agent-turn-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-agent-turn-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAE3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,WAAW,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC/B,GAAG,WAAW,CAiBd;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE;IACtD,gBAAgB,EAAE,WAAW,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,WAAW,CAAC;IACnB,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,cAAc,CAAC;CACnC;;;;EAuCA;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;CAC7B,GAAG,OAAO,CAAC,IAAI,CAAC,CAehB"}

package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.js

@@ -1,10 +1,5 @@
-import { readFileSync, writeFileSync } from 'node:fs';
-import { runMaintenanceForRecordedCandidates } from '../../../../../core/memory/maintenance-integration.js';
-import { createChatTurnPersistenceArtifacts } from '../../../../../core/chat/engine/turns/result.js';
 import { estimateChatHistoryTokens } from '../../../state/compaction.js';
-import { touchSession } from '../../../../../core/chat/engine/sessions/session-record.js';
-import { toLiveEvent } from '../../../adapters/conversation-activity-adapter.js';
-import { formatChatFailureMessage, summarizeTrace } from '../../../utils/format.js';
+import { formatChatFailureMessage } from '../../../utils/format.js';
 export function adaptPersistedTuiOrdinaryTurn(args) {
     const { session, displayText, outcome } = args;
     return {
@@ -20,60 +15,6 @@ export function adaptPersistedTuiOrdinaryTurn(args) {
         }),
     };
 }
-export async function applyTuiAgentTurnResult(args) {
-    const { result, prompt, sessionId, historyForRun, toolNames, runtime, llm, state, updateSessionById, maybeAutoNameSession, emitCompactionStatus, } = args;
-    const model = llm.info?.model ?? runtime.model;
-    const artifacts = await createChatTurnPersistenceArtifacts({
-        result,
-        prompt,
-        session: { id: sessionId, name: sessionId, history: [], messages: [], turns: [], createdAt: '', updatedAt: '' },
-        model,
-        stateRoot: runtime.stateRoot,
-        traceDir: runtime.traceDir,
-        systemContext: runtime.systemContext,
-        toolNames,
-        historyForTokenEstimate: historyForRun,
-        summarizer: { credentialSource: runtime.providerCredentialSource },
-        createTurnId: state.nextLocalId,
-        onCompactionStatus: (event) => emitCompactionStatus(event, result.transcript),
-    });
-    updateSessionById(sessionId, (sessionToUpdate) => ({
-        ...sessionToUpdate,
-        history: artifacts.compacted.history,
-        context: artifacts.compacted.context,
-        archives: artifacts.compacted.archives,
-        turns: [...sessionToUpdate.turns, artifacts.turn].slice(-8),
-    }));
-    const formattedSummary = artifacts.summary;
-    state.setCurrentAssistantText(undefined);
-    updateSessionById(sessionId, (sessionToUpdate) => ({
-        ...sessionToUpdate,
-        messages: [
-            ...sessionToUpdate.messages,
-            {
-                id: state.nextLocalId(),
-                role: 'assistant',
-                text: result.outcome === 'done' ? formattedSummary : `Run stopped: ${formattedSummary}`,
-            },
-        ],
-    }));
-    maybeAutoNameSession(sessionId, prompt, formattedSummary);
-    if (result.outcome === 'error') {
-        state.setError(formattedSummary);
-    }
-    state.setStatus(result.outcome === 'done' ? 'Idle' : `Stopped: ${result.outcome}`);
-    scheduleBackgroundMemoryMaintenance({
-        runtime,
-        llm,
-        sessionId,
-        trace: result.trace,
-        traceFile: artifacts.traceFile,
-        updateSessionById,
-        nextLocalId: state.nextLocalId,
-        setLiveEvents: state.setLiveEvents,
-        setIsMemoryUpdating: state.setIsMemoryUpdating,
-    });
-}
 export function finalizeSuccessfulTuiOrdinaryTurn(args) {
     const { persistedSession, displayText, outcome, prompt, sessionId, state, maybeAutoNameSession, updateSessionById, } = args;
     const sessionAfter = adaptPersistedTuiOrdinaryTurn({
@@ -90,6 +31,9 @@ export function finalizeSuccessfulTuiOrdinaryTurn(args) {
     if (outcome === 'error') {
         state.setError(summaryText);
     }
+    // Desired shape: ConversationTurnService should return the display-adapted
+    // session, or own this final TUI display patch, so the host does not replace
+    // a persisted turn result through a generic session updater.
     updateSessionById(sessionId, () => sessionAfter);
     return {
         session: sessionAfter,
@@ -98,7 +42,7 @@ export function finalizeSuccessfulTuiOrdinaryTurn(args) {
     };
 }
 export async function applyTuiAgentTurnFailure(args) {
-    const { error, promptHistory, model, state, sessionId, updateSessionById } = args;
+    const { error, promptHistory, model, state, sessionId, sessionService, refreshSessions } = args;
     const message = error instanceof Error ? error.message : String(error);
     const formattedMessage = formatChatFailureMessage(message, {
         model,
@@ -106,67 +50,11 @@ export async function applyTuiAgentTurnFailure(args) {
     });
     state.setError(formattedMessage);
     state.setStatus('Error');
-    updateSessionById(sessionId, (sessionToUpdate) => ({
-        ...sessionToUpdate,
-        messages: [
-            ...sessionToUpdate.messages,
-            { id: state.nextLocalId(), role: 'assistant', text: `Run failed before a final answer: ${formattedMessage}` },
-        ],
-    }));
-}
-function scheduleBackgroundMemoryMaintenance(args) {
-    void (async () => {
-        const maintenance = await runMaintenanceForRecordedCandidates({
-            memoryRoot: args.runtime.memoryDir,
-            llm: args.llm,
-            source: `terminal chat session ${args.sessionId}`,
-            trace: args.trace,
-            maxSteps: 20,
-            onTraceEvent: (event) => {
-                if (event.type === 'memory.maintenance_started') {
-                    args.setIsMemoryUpdating(true);
-                }
-                const next = toLiveEvent(event);
-                if (!next) {
-                    return;
-                }
-                args.setLiveEvents((current) => [...current, { id: args.nextLocalId(), text: next }].slice(-8));
-            },
-        });
-        if (maintenance.events.length === 0) {
-            return;
-        }
-        const currentTrace = readTraceEvents(args.traceFile);
-        const nextTrace = [...currentTrace, ...maintenance.events];
-        writeFileSync(args.traceFile, `${JSON.stringify(nextTrace, null, 2)}\n`, 'utf8');
-        args.updateSessionById(args.sessionId, (session) => touchSession({
-            ...session,
-            turns: session.turns.map((turn, index) => (index === session.turns.length - 1 ?
-                {
-                    ...turn,
-                    events: summarizeTrace(nextTrace),
-                }
-                : turn)),
-        }));
-        args.setIsMemoryUpdating(false);
-    })().catch((error) => {
-        args.setIsMemoryUpdating(false);
-        args.setLiveEvents((current) => [
-            ...current,
-            {
-                id: args.nextLocalId(),
-                text: `Memory maintenance failed: ${error instanceof Error ? error.message : String(error)}`,
-            },
-        ].slice(-8));
+    sessionService.appendMessage(sessionId, {
+        id: state.nextLocalId(),
+        role: 'assistant',
+        text: `Run failed before a final answer: ${formattedMessage}`,
     });
-}
-function readTraceEvents(path) {
-    try {
-        const parsed = JSON.parse(readFileSync(path, 'utf8'));
-        return Array.isArray(parsed) ? parsed : [];
-    }
-    catch {
-        return [];
-    }
+    refreshSessions();
 }
 //# sourceMappingURL=tui-agent-turn-result.js.map

package/dist/src/cli/chat/hooks/controllers/run/tui-agent-turn-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-agent-turn-result.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-agent-turn-result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tui-agent-turn-result.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-agent-turn-result.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.d.ts

@@ -1,9 +1,7 @@
 import type { ChatTurnCompactionPort } from '../../../../../core/chat/engine/turns/host-bridge.js';
+import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
 import type { ChatMessage } from '../../../../../index.js';
-import type { ChatSession } from '../../../state/types.js';
 import type { ActionState } from '../useAgentRunController.js';
-type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
-type ActiveSessionUpdater = (updater: (session: ChatSession) => ChatSession) => void;
 export type TuiCompactionStatusEvent = {
     status: 'running' | 'finished' | 'failed';
     archivePath?: string;
@@ -12,13 +10,15 @@ export type TuiCompactionStatusEvent = {
 export declare function createTuiCompactionStatusPort(args: {
     state: ActionState;
     sessionId: string;
-    updateSessionById: SessionUpdater;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
 }): ChatTurnCompactionPort & {
     handleWithSourceHistory: (event: TuiCompactionStatusEvent, sourceHistory: ChatMessage[]) => void;
 };
 export declare function createTuiDirectShellCompactionStatusHandler(args: {
     state: ActionState;
-    updateActiveSession: ActiveSessionUpdater;
+    sessionId: string;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
 }): (event: TuiCompactionStatusEvent, sourceHistory: ChatMessage[]) => void;
-export {};
 //# sourceMappingURL=tui-compaction-status.d.ts.map

package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-compaction-status.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-compaction-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAEnG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAClG,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAErF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,cAAc,CAAC;CACnC,GAAG,sBAAsB,GAAG;IAC3B,uBAAuB,EAAE,CAAC,KAAK,EAAE,wBAAwB,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAClG,CA6BA;AAED,wBAAgB,2CAA2C,CAAC,IAAI,EAAE;IAChE,KAAK,EAAE,WAAW,CAAC;IACnB,mBAAmB,EAAE,oBAAoB,CAAC;CAC3C,IAGS,OAAO,wBAAwB,EAAE,eAAe,WAAW,EAAE,UAmBtE"}
+{"version":3,"file":"tui-compaction-status.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-compaction-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;CAC7B,GAAG,sBAAsB,GAAG;IAC3B,uBAAuB,EAAE,CAAC,KAAK,EAAE,wBAAwB,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAClG,CAuBA;AAED,wBAAgB,2CAA2C,CAAC,IAAI,EAAE;IAChE,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;CAC7B,IAGS,OAAO,wBAAwB,EAAE,eAAe,WAAW,EAAE,UActE"}

package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.js

@@ -1,23 +1,16 @@
-import { buildCompactionRunningContext } from '../../../state/compaction.js';
 export function createTuiCompactionStatusPort(args) {
-    const { state, sessionId, updateSessionById } = args;
+    const { state, sessionId, sessionService, refreshSessions } = args;
     const handleWithSourceHistory = (event, sourceHistory) => {
         appendCompactionLiveEvent(state, event);
         if (event.status !== 'running') {
             return;
         }
         state.setStatus('Compacting');
-        updateSessionById(sessionId, (sessionToUpdate) => ({
-            ...sessionToUpdate,
-            history: sourceHistory,
-            context: buildCompactionRunningContext({
-                history: sourceHistory,
-                previous: sessionToUpdate.context,
-                archiveCount: sessionToUpdate.archives?.length,
-                currentSummaryPath: sessionToUpdate.context?.currentSummaryPath,
-                lastArchivePath: event.archivePath,
-            }),
-        }));
+        sessionService.markCompactionRunning(sessionId, {
+            sourceHistory,
+            archivePath: event.archivePath,
+        });
+        refreshSessions();
     };
     return {
         onPreflightCompactionStatus: (event) => handleWithSourceHistory(event, []),
@@ -26,23 +19,18 @@ export function createTuiCompactionStatusPort(args) {
     };
 }
 export function createTuiDirectShellCompactionStatusHandler(args) {
-    const { state, updateActiveSession } = args;
+    const { state, sessionId, sessionService, refreshSessions } = args;
     return (event, sourceHistory) => {
         appendCompactionLiveEvent(state, event);
         if (event.status !== 'running') {
             return;
         }
         state.setStatus('Compacting');
-        updateActiveSession((session) => ({
-            ...session,
-            context: buildCompactionRunningContext({
-                history: sourceHistory,
-                previous: session.context,
-                archiveCount: session.archives?.length,
-                currentSummaryPath: session.context?.currentSummaryPath,
-                lastArchivePath: event.archivePath,
-            }),
-        }));
+        sessionService.markCompactionRunning(sessionId, {
+            sourceHistory,
+            archivePath: event.archivePath,
+        });
+        refreshSessions();
     };
 }
 function appendCompactionLiveEvent(state, event) {

package/dist/src/cli/chat/hooks/controllers/run/tui-compaction-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-compaction-status.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-compaction-status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tui-compaction-status.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-compaction-status.ts"],"names":[],"mappings":"AAWA,MAAM,UAAU,6BAA6B,CAAC,IAK7C;IAGC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAEnE,MAAM,uBAAuB,GAAG,CAAC,KAA+B,EAAE,aAA4B,EAAE,EAAE;QAChG,yBAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAExC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC9B,cAAc,CAAC,qBAAqB,CAAC,SAAS,EAAE;YAC9C,aAAa;YACb,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC,CAAC;QACH,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF,OAAO;QACL,2BAA2B,EAAE,CAAC,KAA+B,EAAE,EAAE,CAAC,uBAAuB,CAAC,KAAK,EAAE,EAAE,CAAC;QACpG,uBAAuB,EAAE,CAAC,KAA+B,EAAE,EAAE,CAAC,uBAAuB,CAAC,KAAK,EAAE,EAAE,CAAC;QAChG,uBAAuB;KACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2CAA2C,CAAC,IAK3D;IACC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAEnE,OAAO,CAAC,KAA+B,EAAE,aAA4B,EAAE,EAAE;QACvE,yBAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAExC,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC9B,cAAc,CAAC,qBAAqB,CAAC,SAAS,EAAE;YAC9C,aAAa;YACb,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC,CAAC;QACH,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAkB,EAAE,KAA+B;IACpF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO;IACT,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,uBAAuB,CAAC,KAA+B;IAC9D,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,SAAS;YACZ,OAAO,0CAA0C,CAAC;QACpD,KAAK,QAAQ;YACX,OAAO,sBAAsB,KAAK,CAAC,KAAK,IAAI,eAAe,EAAE,CAAC;QAChE,KAAK,UAAU;YACb,OAAO,sBAAsB,CAAC;IAClC,CAAC;AACH,CAAC"}

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.d.ts

@@ -1,7 +1,7 @@
+import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
 import type { ChatSession } from '../../../state/types.js';
 import type { ChatRuntimeConfig } from '../../../utils/runtime.js';
 import type { ActionState } from '../useAgentRunController.js';
-type ActiveSessionUpdater = (updater: (session: ChatSession) => ChatSession) => void;
 export declare function finalizeTuiDirectShellSuccess(args: {
     chosenCall: {
         tool: string;
@@ -21,8 +21,8 @@ export declare function finalizeTuiDirectShellSuccess(args: {
         name: string;
     }>;
     state: ActionState;
-    updateActiveSession: ActiveSessionUpdater;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
     maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;
 }): Promise<void>;
-export {};
 //# sourceMappingURL=tui-direct-shell-result.d.ts.map

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-direct-shell-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell-result.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG/D,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAErF,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACxD,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7C,YAAY,EAAE;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,WAAW,CAAC;IAC3B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/B,KAAK,EAAE,WAAW,CAAC;IACnB,mBAAmB,EAAE,oBAAoB,CAAC;IAC1C,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;CACzF,iBAmDA"}
+{"version":3,"file":"tui-direct-shell-result.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell-result.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAG3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG/D,wBAAsB,6BAA6B,CAAC,IAAI,EAAE;IACxD,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7C,YAAY,EAAE;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,WAAW,CAAC;IAC3B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/B,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;CACzF,iBAoDA"}

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.js

@@ -1,12 +1,17 @@
 import { summarizeToolCall } from '../../../../../core/observability/conversation-activity.js';
-import { appendDirectShellHistory, buildConversationMessages, formatDirectShellResponse } from '../../../utils/format.js';
+import { appendDirectShellHistory, formatDirectShellResponse } from '../../../utils/format.js';
 import { compactChatHistoryWithArchive } from '../../../state/compaction.js';
 import { createTuiDirectShellCompactionStatusHandler } from './tui-compaction-status.js';
 export async function finalizeTuiDirectShellSuccess(args) {
-    const { chosenCall, chosenResult, command, shellDisplay, model, activeSessionId, activeSession, runtime, tools, state, updateActiveSession, maybeAutoNameSession, } = args;
+    const { chosenCall, chosenResult, command, shellDisplay, model, activeSessionId, activeSession, runtime, tools, state, sessionService, refreshSessions, maybeAutoNameSession, } = args;
     const responseText = formatDirectShellResponse(chosenCall.tool, command, chosenResult);
     const directShellHistory = appendDirectShellHistory(activeSession.history, shellDisplay, chosenCall.tool, chosenResult);
-    const emitCompactionStatus = createTuiDirectShellCompactionStatusHandler({ state, updateActiveSession });
+    const emitCompactionStatus = createTuiDirectShellCompactionStatusHandler({
+        state,
+        sessionId: activeSessionId,
+        sessionService,
+        refreshSessions,
+    });
     const compacted = await compactChatHistoryWithArchive({
         history: directShellHistory,
         model,
@@ -18,13 +23,8 @@ export async function finalizeTuiDirectShellSuccess(args) {
         summarizer: { credentialSource: runtime.providerCredentialSource },
         onStatusChange: (event) => emitCompactionStatus(event, directShellHistory),
     });
-    updateActiveSession((session) => ({
-        ...session,
-        history: compacted.history,
-        context: compacted.context,
-        archives: compacted.archives,
-        messages: buildConversationMessages(compacted.history),
-    }));
+    sessionService.applyCompactionResult(activeSessionId, compacted);
+    refreshSessions();
     state.setLiveEvents([
         {
             id: state.nextLocalId(),

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-direct-shell-result.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC1H,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,2CAA2C,EAAE,MAAM,4BAA4B,CAAC;AAIzF,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAanD;IACC,MAAM,EACJ,UAAU,EACV,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,KAAK,EACL,eAAe,EACf,aAAa,EACb,OAAO,EACP,KAAK,EACL,KAAK,EACL,mBAAmB,EACnB,oBAAoB,GACrB,GAAG,IAAI,CAAC;IAET,MAAM,YAAY,GAAG,yBAAyB,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACvF,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACxH,MAAM,oBAAoB,GAAG,2CAA2C,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACzG,MAAM,SAAS,GAAG,MAAM,6BAA6B,CAAC;QACpD,OAAO,EAAE,kBAAkB;QAC3B,KAAK;QACL,SAAS,EAAE,eAAe;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QACzC,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,EAAE,gBAAgB,EAAE,OAAO,CAAC,wBAAwB,EAAE;QAClE,cAAc,EAAE,CAAC,KAA0F,EAAE,EAAE,CAAC,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,CAAC;KAChK,CAAC,CAAC;IACH,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChC,GAAG,OAAO;QACV,OAAO,EAAE,SAAS,CAAC,OAAO;QAC1B,OAAO,EAAE,SAAS,CAAC,OAAO;QAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,QAAQ,EAAE,yBAAyB,CAAC,SAAS,CAAC,OAAO,CAAC;KACvD,CAAC,CAAC,CAAC;IACJ,KAAK,CAAC,aAAa,CAAC;QAClB;YACE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE;YACvB,IAAI,EACF,YAAY,CAAC,EAAE,CAAC,CAAC;gBACf,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,YAAY;gBACrE,CAAC,CAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS;SACrE;KACF,CAAC,CAAC;IACH,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;QAC3C,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IACD,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"tui-direct-shell-result.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell-result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAE/F,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAC/F,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,2CAA2C,EAAE,MAAM,4BAA4B,CAAC;AAEzF,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAcnD;IACC,MAAM,EACJ,UAAU,EACV,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,KAAK,EACL,eAAe,EACf,aAAa,EACb,OAAO,EACP,KAAK,EACL,KAAK,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,GACrB,GAAG,IAAI,CAAC;IAET,MAAM,YAAY,GAAG,yBAAyB,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IACvF,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACxH,MAAM,oBAAoB,GAAG,2CAA2C,CAAC;QACvE,KAAK;QACL,SAAS,EAAE,eAAe;QAC1B,cAAc;QACd,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAM,6BAA6B,CAAC;QACpD,OAAO,EAAE,kBAAkB;QAC3B,KAAK;QACL,SAAS,EAAE,eAAe;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QACzC,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,EAAE,gBAAgB,EAAE,OAAO,CAAC,wBAAwB,EAAE;QAClE,cAAc,EAAE,CAAC,KAA0F,EAAE,EAAE,CAAC,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,CAAC;KAChK,CAAC,CAAC;IACH,cAAc,CAAC,qBAAqB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IACjE,eAAe,EAAE,CAAC;IAClB,KAAK,CAAC,aAAa,CAAC;QAClB;YACE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE;YACvB,IAAI,EACF,YAAY,CAAC,EAAE,CAAC,CAAC;gBACf,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,YAAY;gBACrE,CAAC,CAAC,GAAG,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS;SACrE;KACF,CAAC,CAAC;IACH,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,CAAC,YAAY,CAAC,EAAE,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;QAC3C,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IACD,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACpE,CAAC"}

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.d.ts

@@ -1,9 +1,9 @@
 import type { ToolCall } from '../../../../../index.js';
-import type { ChatSession } from '../../../state/types.js';
+import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
 import type { ChatRuntimeConfig } from '../../../utils/runtime.js';
 import type { ActionState } from '../useAgentRunController.js';
 import type { ToolDefinition } from '../../../../../index.js';
-type ActiveSessionUpdater = (updater: (session: ChatSession) => ChatSession) => void;
+import type { ChatSession } from '../../../state/types.js';
 export declare function executeTuiDirectShell(args: {
     command: string;
     shellDisplay: string;
@@ -13,10 +13,10 @@ export declare function executeTuiDirectShell(args: {
     runtime: ChatRuntimeConfig;
     tools: ToolDefinition[];
     state: ActionState;
-    updateActiveSession: ActiveSessionUpdater;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
     maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;
     isProjectApproved: (call: ToolCall) => boolean;
     rememberProjectApproval: (call: ToolCall) => void;
 }): Promise<void>;
-export {};
 //# sourceMappingURL=tui-direct-shell.d.ts.map

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-direct-shell.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,yBAAyB,CAAC;AAIpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,KAAK,oBAAoB,GAAG,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAErF,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,WAAW,CAAC;IACnB,mBAAmB,EAAE,oBAAoB,CAAC;IAC1C,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC/C,uBAAuB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;CACnD,iBA6JA"}
+{"version":3,"file":"tui-direct-shell.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,yBAAyB,CAAC;AAEpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAE3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;IAC/C,uBAAuB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;CACnD,iBAoKA"}

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.js

@@ -1,42 +1,43 @@
-import { acquireSessionLease, getSessionLeaseConflict, releaseSessionLease } from '../../../../../core/chat/engine/sessions/lease.js';
 import { rememberedApprovalPolicy } from '../../../../../core/approvals/default-policies.js';
 import { resolveToolApproval } from '../../../../../core/approvals/policy-chain.js';
 import { summarizeToolCall } from '../../../../../core/observability/conversation-activity.js';
 import { DEFAULT_INSPECT_RULES, DEFAULT_MUTATE_RULES, runShellCommand } from '../../../../../core/tools/toolkits/shell-process/run-shell.js';
 import { createProjectApprovalRuleForCall, describeProjectApprovalRule } from '../../../state/approval-rules.js';
-import { touchSession } from '../../../../../core/chat/engine/sessions/session-record.js';
-import { readChatSession } from '../../../../../core/chat/engine/sessions/repository/file-chat-session-repository.js';
 import { shouldFallbackToMutate } from '../../../utils/format.js';
 import { beginTuiDirectShellAction, finishTuiDirectShellAction } from './tui-agent-turn-lifecycle.js';
 import { finalizeTuiDirectShellSuccess } from './tui-direct-shell-result.js';
 export async function executeTuiDirectShell(args) {
-    const { command, shellDisplay, model, activeSessionId, activeSession, runtime, tools, state, updateActiveSession, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, } = args;
+    const { command, shellDisplay, model, activeSessionId, activeSession, runtime, tools, state, sessionService, refreshSessions, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, } = args;
     const leaseOwner = {
         ownerKind: 'tui',
         ownerId: `tui-${process.pid}`,
         clientLabel: 'terminal chat',
     };
-    const persistedSession = readChatSession(runtime.sessionCatalogFile, activeSessionId, true);
-    if (!persistedSession) {
+    let persistedSession;
+    try {
+        persistedSession = sessionService.require(activeSessionId);
+    }
+    catch {
         return;
     }
-    const conflict = getSessionLeaseConflict(persistedSession, leaseOwner);
+    const conflict = sessionService.getLeaseConflict(activeSessionId, leaseOwner);
     if (conflict) {
         state.setError(conflict);
         state.setStatus('Blocked');
-        updateActiveSession((session) => ({
-            ...session,
-            messages: [...session.messages, { id: state.nextLocalId(), role: 'assistant', text: conflict }],
-        }));
+        sessionService.appendMessage(activeSessionId, {
+            id: state.nextLocalId(),
+            role: 'assistant',
+            text: conflict,
+        });
+        refreshSessions();
         return;
     }
-    updateActiveSession(() => touchSession(acquireSessionLease(persistedSession, leaseOwner)));
+    persistedSession = sessionService.acquireLease(activeSessionId, leaseOwner);
+    refreshSessions();
     const directShellAbortController = beginTuiDirectShellAction(state, command);
-    updateActiveSession((session) => ({
-        ...session,
-        messages: [...session.messages, { id: state.nextLocalId(), role: 'user', text: shellDisplay }],
-        lastContinuePrompt: undefined,
-    }));
+    sessionService.appendMessage(activeSessionId, { id: state.nextLocalId(), role: 'user', text: shellDisplay });
+    sessionService.setLastContinuePrompt(activeSessionId, undefined);
+    refreshSessions();
     try {
         const inspectCall = {
             id: `direct-shell-${Date.now()}-inspect`,
@@ -86,10 +87,12 @@ export async function executeTuiDirectShell(args) {
                 });
                 if (!approval.approved) {
                     const denialMessage = approval.reason ? `Command denied.\n${approval.reason}` : 'Command denied.';
-                    updateActiveSession((session) => ({
-                        ...session,
-                        messages: [...session.messages, { id: state.nextLocalId(), role: 'assistant', text: denialMessage }],
-                    }));
+                    sessionService.appendMessage(activeSessionId, {
+                        id: state.nextLocalId(),
+                        role: 'assistant',
+                        text: denialMessage,
+                    });
+                    refreshSessions();
                     state.setLiveEvents([
                         {
                             id: state.nextLocalId(),
@@ -118,7 +121,8 @@ export async function executeTuiDirectShell(args) {
             runtime,
             tools,
             state,
-            updateActiveSession,
+            sessionService,
+            refreshSessions,
             maybeAutoNameSession,
         });
     }
@@ -126,16 +130,16 @@ export async function executeTuiDirectShell(args) {
         const message = shellError instanceof Error ? shellError.message : String(shellError);
         state.setError(message);
         state.setStatus('Error');
-        updateActiveSession((session) => ({
-            ...session,
-            messages: [
-                ...session.messages,
-                { id: state.nextLocalId(), role: 'assistant', text: `Direct shell execution failed:\n${message}` },
-            ],
-        }));
+        sessionService.appendMessage(activeSessionId, {
+            id: state.nextLocalId(),
+            role: 'assistant',
+            text: `Direct shell execution failed:\n${message}`,
+        });
+        refreshSessions();
     }
     finally {
-        updateActiveSession((session) => releaseSessionLease(session, leaseOwner));
+        sessionService.releaseLease(activeSessionId, leaseOwner);
+        refreshSessions();
         finishTuiDirectShellAction(state);
     }
 }

package/dist/src/cli/chat/hooks/controllers/run/tui-direct-shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-direct-shell.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tui-direct-shell.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-direct-shell.ts"],"names":[],"mappings":"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"}