@roackb2/heddle 1.2.0 → 1.4.0

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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"}

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

@@ -1,4 +1,5 @@
 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 { createTuiRememberedApprovalPolicies, createTuiToolApprovalPort } from './tui-tool-approval.js';
@@ -14,6 +15,8 @@ export declare function executeTuiOrdinaryTurn(args: {
     sessionId: string;
     runtime: ChatRuntimeConfig;
     state: ActionState;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
     updateSessionById: SessionUpdater;
     parsePlanState: ParsePlanState;
     maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"tui-ordinary-turn.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAInE,OAAO,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAExH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,WAAW,CAAC;IACnB,iBAAiB,EAAE,cAAc,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,UAAU,CAAC,OAAO,mCAAmC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;IAClG,uBAAuB,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACpG,aAAa,EAAE,2BAA2B,GAAG,SAAS,CAAC;IACvD,eAAe,EAAE,WAAW,CAAC;IAC7B,UAAU,EAAE;QAAE,SAAS,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAoGjC"}
+{"version":3,"file":"tui-ordinary-turn.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAInE,OAAO,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAExH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,WAAW,CAAC;IACnB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,EAAE,cAAc,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACxF,iBAAiB,EAAE,UAAU,CAAC,OAAO,mCAAmC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;IAClG,uBAAuB,EAAE,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACpG,aAAa,EAAE,2BAA2B,GAAG,SAAS,CAAC;IACvD,eAAe,EAAE,WAAW,CAAC;IAC7B,UAAU,EAAE;QAAE,SAAS,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;CACxE,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA4GjC"}

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

@@ -1,25 +1,25 @@
-import { runConversationTurn } from '../../../../../core/chat/engine/turns/run-conversation-turn.js';
+import { createConversationEngine } from '../../../../../core/chat/engine/index.js';
 import { createTuiCompactionStatusPort } from './tui-compaction-status.js';
 import { finalizeSuccessfulTuiOrdinaryTurn } from './tui-agent-turn-result.js';
 import { createTuiRunLoopEventAdapter } from './tui-run-loop-events.js';
 import { createTuiRememberedApprovalPolicies, createTuiToolApprovalPort } from './tui-tool-approval.js';
 export async function executeTuiOrdinaryTurn(args) {
-    const { prompt, displayText, sessionId, runtime, state, updateSessionById, parsePlanState, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, driftObserver, turnAbortSignal, leaseOwner, } = args;
+    const { prompt, displayText, sessionId, runtime, state, sessionService, refreshSessions, updateSessionById, parsePlanState, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, driftObserver, turnAbortSignal, leaseOwner, } = args;
     const compactionPort = createTuiCompactionStatusPort({
         state,
         sessionId,
-        updateSessionById,
+        sessionService,
+        refreshSessions,
     });
     if (displayText) {
-        updateSessionById(sessionId, (session) => ({
-            ...session,
-            messages: [...session.messages, { id: state.nextLocalId(), role: 'user', text: displayText }],
-        }));
+        sessionService.appendMessage(sessionId, { id: state.nextLocalId(), role: 'user', text: displayText });
+        refreshSessions();
     }
     const runLoopEvents = createTuiRunLoopEventAdapter({
         state,
         sessionId,
-        updateSessionById,
+        sessionService,
+        refreshSessions,
         parsePlanState,
     });
     const approvalPort = createTuiToolApprovalPort({
@@ -27,18 +27,23 @@ export async function executeTuiOrdinaryTurn(args) {
         rememberProjectApproval,
     });
     const approvalPolicies = createTuiRememberedApprovalPolicies({ isProjectApproved });
-    const result = await runConversationTurn({
+    const engine = createConversationEngine({
         workspaceRoot: runtime.workspaceRoot,
         stateRoot: runtime.stateRoot,
-        traceDir: runtime.traceDir,
         sessionStoragePath: runtime.sessionCatalogFile,
-        sessionId,
-        prompt,
+        model: runtime.model,
         apiKey: runtime.apiKey,
         preferApiKey: runtime.preferApiKey,
         credentialStorePath: runtime.credentialStorePath,
         systemContext: runtime.systemContext,
         memoryMaintenanceMode: 'background',
+        apiKeyPresent: runtime.providerCredentialPresent,
+    });
+    const result = await engine.turns.submit({
+        sessionId,
+        prompt,
+        maxSteps: runtime.maxSteps,
+        searchIgnoreDirs: runtime.searchIgnoreDirs,
         host: {
             events: {
                 onAgentLoopEvent: (event) => {
@@ -48,10 +53,14 @@ export async function executeTuiOrdinaryTurn(args) {
             },
             compaction: compactionPort,
             approvals: approvalPort,
+            assistant: {
+                onStream: runLoopEvents.onAssistantStream,
+            },
+            trace: {
+                onEvent: runLoopEvents.onTraceEvent,
+            },
         },
         approvalPolicies,
-        onAssistantStream: runLoopEvents.onAssistantStream,
-        onTraceEvent: runLoopEvents.onTraceEvent,
         shouldStop: () => state.interruptRequestedRef.current,
         abortSignal: turnAbortSignal,
         leaseOwner,
@@ -59,11 +68,7 @@ export async function executeTuiOrdinaryTurn(args) {
     if (!result) {
         return undefined;
     }
-    const { readChatSession } = await import('../../../../../core/chat/engine/sessions/repository/file-chat-session-repository.js');
-    const persistedSession = readChatSession(runtime.sessionCatalogFile, sessionId, true);
-    if (!persistedSession) {
-        return undefined;
-    }
+    const persistedSession = sessionService.require(sessionId);
     const { latestHistory } = finalizeSuccessfulTuiOrdinaryTurn({
         persistedSession,
         displayText,

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

@@ -1 +1 @@
-{"version":3,"file":"tui-ordinary-turn.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tui-ordinary-turn.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-ordinary-turn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAIpF,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,mCAAmC,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAQxG,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAgB5C;IACC,MAAM,EACJ,MAAM,EACN,WAAW,EACX,SAAS,EACT,OAAO,EACP,KAAK,EACL,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,aAAa,EACb,eAAe,EACf,UAAU,GACX,GAAG,IAAI,CAAC;IAET,MAAM,cAAc,GAAG,6BAA6B,CAAC;QACnD,KAAK;QACL,SAAS;QACT,cAAc;QACd,eAAe;KAChB,CAAC,CAAC;IAEH,IAAI,WAAW,EAAE,CAAC;QAChB,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACtG,eAAe,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,aAAa,GAAG,4BAA4B,CAAC;QACjD,KAAK;QACL,SAAS;QACT,cAAc;QACd,eAAe;QACf,cAAc;KACf,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,yBAAyB,CAAC;QAC7C,KAAK;QACL,uBAAuB;KACxB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,mCAAmC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAEpF,MAAM,MAAM,GAAG,wBAAwB,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,qBAAqB,EAAE,YAAY;QACnC,aAAa,EAAE,OAAO,CAAC,yBAAyB;KACjD,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QACvC,SAAS;QACT,MAAM;QACN,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC1B,aAAa,EAAE,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;oBAC3C,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBACxC,CAAC;aACF;YACD,UAAU,EAAE,cAAc;YAC1B,SAAS,EAAE,YAAY;YACvB,SAAS,EAAE;gBACT,QAAQ,EAAE,aAAa,CAAC,iBAAiB;aAC1C;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,aAAa,CAAC,YAAY;aACpC;SACF;QACD,gBAAgB;QAChB,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO;QACrD,WAAW,EAAE,eAAe;QAC5B,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAE3D,MAAM,EAAE,aAAa,EAAE,GAAG,iCAAiC,CAAC;QAC1D,gBAAgB;QAChB,WAAW;QACX,OAAO,EAAE,MAAM,CAAC,OAA+B;QAC/C,MAAM;QACN,SAAS;QACT,KAAK;QACL,oBAAoB;QACpB,iBAAiB;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAA+B;QAC/C,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,aAAa;QACzB,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,EAAE;KACH,CAAC;AACjB,CAAC"}

package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.d.ts

@@ -1,20 +1,20 @@
 import type { TraceEvent } from '../../../../../index.js';
+import type { ConversationSessionService } from '../../../../../core/chat/engine/types.js';
 import type { AgentLoopEvent } from '../../../../../core/runtime/events.js';
-import type { ChatSession } from '../../../state/types.js';
 import type { ActionState } from '../useAgentRunController.js';
 export type TuiAssistantStreamUpdate = {
     step: number;
     text: string;
     done: boolean;
 };
-type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
 type PlanStateParser = (output: unknown) => ActionState extends {
     setCurrentPlan: (value: infer T) => void;
 } ? T : never;
 export declare function createTuiRunLoopEventAdapter(args: {
     state: ActionState;
     sessionId: string;
-    updateSessionById: SessionUpdater;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
     parsePlanState: PlanStateParser;
 }): {
     onAssistantStream(update: TuiAssistantStreamUpdate): void;

package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-run-loop-events.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,wBAAwB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAErF,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,KAAK,IAAI,CAAC;AAElG,KAAK,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAEzH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,cAAc,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC;8BAO6B,wBAAwB;4BAQ1B,cAAc;wBAalB,UAAU;EAuDjC"}
+{"version":3,"file":"tui-run-loop-events.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,wBAAwB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAErF,KAAK,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,WAAW,SAAS;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAEzH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE;IACjD,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,0BAA0B,CAAC;IAC3C,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,cAAc,EAAE,eAAe,CAAC;CACjC;8BAO6B,wBAAwB;4BAQ1B,cAAc;wBAalB,UAAU;EA+CjC"}

package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.js

@@ -3,7 +3,7 @@ import { previewEditFileInput } from '../../../../../core/tools/toolkits/coding-
 import { formatConversationActivityForTui } from '../../../adapters/conversation-activity-adapter.js';
 import { formatEditPreviewHistoryMessage, formatPlanHistoryMessage } from '../../../utils/format.js';
 export function createTuiRunLoopEventAdapter(args) {
-    const { state, sessionId, updateSessionById, parsePlanState } = args;
+    const { state, sessionId, sessionService, refreshSessions, parsePlanState } = args;
     const appendedEditPreviewIds = new Set();
     const appendedPlanSteps = new Set();
     const streamingBuffers = new Map();
@@ -34,17 +34,13 @@ export function createTuiRunLoopEventAdapter(args) {
                         return;
                     }
                     appendedEditPreviewIds.add(event.call.id);
-                    updateSessionById(sessionId, (session) => ({
-                        ...session,
-                        messages: [
-                            ...session.messages,
-                            {
-                                id: state.nextLocalId(),
-                                role: 'assistant',
-                                text: formatEditPreviewHistoryMessage(preview),
-                            },
-                        ],
-                    }));
+                    appendAssistantMessage({
+                        sessionService,
+                        refreshSessions,
+                        sessionId,
+                        id: state.nextLocalId(),
+                        text: formatEditPreviewHistoryMessage(preview),
+                    });
                 });
             }
             if (event.type === 'tool.result' && event.tool === 'update_plan') {
@@ -53,17 +49,13 @@ export function createTuiRunLoopEventAdapter(args) {
                     const renderedPlan = formatPlanHistoryMessage(event.result.output);
                     if (renderedPlan) {
                         appendedPlanSteps.add(event.step);
-                        updateSessionById(sessionId, (session) => ({
-                            ...session,
-                            messages: [
-                                ...session.messages,
-                                {
-                                    id: state.nextLocalId(),
-                                    role: 'assistant',
-                                    text: renderedPlan,
-                                },
-                            ],
-                        }));
+                        appendAssistantMessage({
+                            sessionService,
+                            refreshSessions,
+                            sessionId,
+                            id: state.nextLocalId(),
+                            text: renderedPlan,
+                        });
                     }
                 }
             }
@@ -74,6 +66,14 @@ export function createTuiRunLoopEventAdapter(args) {
         },
     };
 }
+function appendAssistantMessage(args) {
+    args.sessionService.appendMessage(args.sessionId, {
+        id: args.id,
+        role: 'assistant',
+        text: args.text,
+    });
+    args.refreshSessions();
+}
 function appendLiveEvents(state, nextEvents) {
     if (nextEvents.length === 0) {
         return;

package/dist/src/cli/chat/hooks/controllers/run/tui-run-loop-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-run-loop-events.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,6CAA6C,EAC7C,yCAAyC,GAC1C,MAAM,4DAA4D,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;AACpG,OAAO,EAAE,gCAAgC,EAAE,MAAM,oDAAoD,CAAC;AACtG,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAUrG,MAAM,UAAU,4BAA4B,CAAC,IAK5C;IACC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACrE,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IACjD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEnD,OAAO;QACL,iBAAiB,CAAC,MAAgC;YAChD,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC;YACxD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAED,gBAAgB,CAAC,KAAqB;YACpC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC3B,OAAO;YACT,CAAC;YAED,gBAAgB,CACd,KAAK,EACL,6CAA6C,CAAC,KAAK,CAAC;iBACjD,GAAG,CAAC,gCAAgC,CAAC;iBACrC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACnD,CAAC;QACJ,CAAC;QAED,YAAY,CAAC,KAAiB;YAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5D,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACpC,KAAK,CAAC,uBAAuB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC/C,CAAC;YAED,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAClE,KAAK,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC3D,IAAI,CAAC,OAAO,IAAI,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC1D,OAAO;oBACT,CAAC;oBAED,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC1C,iBAAiB,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBACzC,GAAG,OAAO;wBACV,QAAQ,EAAE;4BACR,GAAG,OAAO,CAAC,QAAQ;4BACnB;gCACE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE;gCACvB,IAAI,EAAE,WAAW;gCACjB,IAAI,EAAE,+BAA+B,CAAC,OAAO,CAAC;6BAC/C;yBACF;qBACF,CAAC,CAAC,CAAC;gBACN,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACjE,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBAE1D,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvC,MAAM,YAAY,GAAG,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBACnE,IAAI,YAAY,EAAE,CAAC;wBACjB,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAClC,iBAAiB,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;4BACzC,GAAG,OAAO;4BACV,QAAQ,EAAE;gCACR,GAAG,OAAO,CAAC,QAAQ;gCACnB;oCACE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE;oCACvB,IAAI,EAAE,WAAW;oCACjB,IAAI,EAAE,YAAY;iCACnB;6BACF;yBACF,CAAC,CAAC,CAAC;oBACN,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,UAAU,GAAG,yCAAyC,CAAC,KAAK,CAAC;iBAChE,GAAG,CAAC,gCAAgC,CAAC;iBACrC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACnD,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACtC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAkB,EAAE,UAAoB;IAChE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC;QAElG,OAAO;YACL,GAAG,OAAO;YACV,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;SACxE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"tui-run-loop-events.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-run-loop-events.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/chat/hooks/controllers/run/tui-tool-approval.d.ts

@@ -1,11 +1,12 @@
-import type { ToolApprovalPolicy } from '../../../../../core/approvals/types.js';
-import type { ChatTurnApprovalPort } from '../../../../../core/chat/engine/turns/host-bridge.js';
+import type { ToolApprovalPolicy, ToolApprovalSurface } from '../../../../../core/approvals/types.js';
 import type { ActionState } from '../useAgentRunController.js';
-type TuiApprovalCall = Parameters<NonNullable<ChatTurnApprovalPort['requestToolApproval']>>[0]['call'];
+type TuiApprovalCall = Parameters<ToolApprovalSurface>[0]['call'];
 export declare function createTuiToolApprovalPort(args: {
     state: ActionState;
     rememberProjectApproval: (call: TuiApprovalCall) => void;
-}): ChatTurnApprovalPort;
+}): {
+    requestToolApproval: ToolApprovalSurface;
+};
 export declare function createTuiRememberedApprovalPolicies(args: {
     isProjectApproved: (call: TuiApprovalCall) => boolean;
 }): ToolApprovalPolicy[];

package/dist/src/cli/chat/hooks/controllers/run/tui-tool-approval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui-tool-approval.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-tool-approval.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAGjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,KAAK,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvG,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,KAAK,EAAE,WAAW,CAAC;IACnB,uBAAuB,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;CAC1D,GAAG,oBAAoB,CAkCvB;AAED,wBAAgB,mCAAmC,CAAC,IAAI,EAAE;IACxD,iBAAiB,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC;CACvD,GAAG,kBAAkB,EAAE,CAMvB"}
+{"version":3,"file":"tui-tool-approval.d.ts","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-tool-approval.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAGtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE/D,KAAK,eAAe,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,KAAK,EAAE,WAAW,CAAC;IACnB,uBAAuB,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;CAC1D,GAAG;IAAE,mBAAmB,EAAE,mBAAmB,CAAA;CAAE,CAkC/C;AAED,wBAAgB,mCAAmC,CAAC,IAAI,EAAE;IACxD,iBAAiB,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC;CACvD,GAAG,kBAAkB,EAAE,CAMvB"}

package/dist/src/cli/chat/hooks/controllers/run/tui-tool-approval.js.map

@@ -1 +1 @@
-{"version":3,"file":"tui-tool-approval.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-tool-approval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAGpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;AACpG,OAAO,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAKjH,MAAM,UAAU,yBAAyB,CAAC,IAGzC;IACC,MAAM,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC;IAEhD,OAAO;QACL,KAAK,CAAC,mBAAmB,CAAC,OAAgF;YACxG,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC;YAClE,CAAC;YACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,KAAK,IAAI,EAAE;gBACpD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAEnG,OAAO,MAAM,mBAAmB,CAAC;oBAC/B,IAAI;oBACJ,IAAI;oBACJ,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;wBAC5B,MAAM,cAAc,GAAG,gCAAgC,CAAC,IAAI,CAAC,CAAC;wBAC9D,KAAK,CAAC,kBAAkB,CAAC;4BACvB,IAAI;4BACJ,IAAI;4BACJ,WAAW;4BACX,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;4BACpF,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;4BACvF,OAAO;yBACR,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACnB,OAAO;gBACL,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAK,OAAO;gBACpC,MAAM,EAAE,QAAQ,EAAE,MAAM;aACzB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mCAAmC,CAAC,IAEnD;IACC,OAAO;QACL,wBAAwB,CAAC;YACvB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;SACvD,CAAC;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"tui-tool-approval.js","sourceRoot":"","sources":["../../../../../../../src/cli/chat/hooks/controllers/run/tui-tool-approval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;AACpG,OAAO,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAKjH,MAAM,UAAU,yBAAyB,CAAC,IAGzC;IACC,MAAM,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC;IAEhD,OAAO;QACL,KAAK,CAAC,mBAAmB,CAAC,OAA2C;YACnE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC;YAClE,CAAC;YACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,KAAK,IAAI,EAAE;gBACpD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAEnG,OAAO,MAAM,mBAAmB,CAAC;oBAC/B,IAAI;oBACJ,IAAI;oBACJ,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;wBAC5B,MAAM,cAAc,GAAG,gCAAgC,CAAC,IAAI,CAAC,CAAC;wBAC9D,KAAK,CAAC,kBAAkB,CAAC;4BACvB,IAAI;4BACJ,IAAI;4BACJ,WAAW;4BACX,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;4BACpF,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS;4BACvF,OAAO;yBACR,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACnB,OAAO;gBACL,QAAQ,EAAE,QAAQ,EAAE,IAAI,KAAK,OAAO;gBACpC,MAAM,EAAE,QAAQ,EAAE,MAAM;aACzB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mCAAmC,CAAC,IAEnD;IACC,OAAO;QACL,wBAAwB,CAAC;YACvB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;SACvD,CAAC;KACH,CAAC;AACJ,CAAC"}

package/dist/src/cli/chat/hooks/controllers/useAgentRunController.d.ts

@@ -5,11 +5,11 @@ import type { ReasoningEffort } from '../../../../core/llm/types.js';
 import type { CyberLoopObserverAnnotation } from '../../../../index.js';
 import type { EditFilePreview } from '../../../../core/tools/toolkits/coding-files/edit-file.js';
 import type { PlanItem } from '../../../../core/tools/toolkits/internal/update-plan.js';
+import type { ConversationSessionService } from '../../../../core/chat/engine/types.js';
 import type { ApprovalChoice, ChatSession, LiveEvent, PendingApproval } from '../../state/types.js';
 import type { ChatRuntimeConfig } from '../../utils/runtime.js';
 type StateSetter<T> = (value: T | ((current: T) => T)) => void;
 type SessionUpdater = (sessionId: string, updater: (session: ChatSession) => ChatSession) => void;
-type ActiveSessionUpdater = (updater: (session: ChatSession) => ChatSession) => void;
 export type ActionState = {
     isRunning: boolean;
     nextLocalId: () => string;
@@ -40,6 +40,8 @@ type ExecuteTurnArgs = {
     tools: ToolDefinition[];
     logger: Logger;
     state: ActionState;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
     updateSessionById: SessionUpdater;
     referenceAssistantText?: string;
     maybeAutoNameSession: (sessionId: string, prompt: string, responseText: string) => void;
@@ -55,8 +57,9 @@ type UseAgentRunArgs = {
     activeSessionId: string;
     sessions: ChatSession[];
     state: ActionState;
+    sessionService: ConversationSessionService;
+    refreshSessions: () => void;
     updateSessionById: SessionUpdater;
-    updateActiveSession: ActiveSessionUpdater;
     drift?: ChatDriftObserverOptions;
 };
 export type ChatDriftObserverOptions = {

package/dist/src/cli/chat/hooks/controllers/useAgentRunController.d.ts.map

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

package/dist/src/cli/chat/hooks/controllers/useAgentRunController.js

@@ -1,9 +1,7 @@
 import { useMemo } from 'react';
 import { createLogger, createLlmAdapter, createDefaultAgentTools, } from '../../../../index.js';
 import { formatMissingProviderCredentialMessage, hasProviderCredentialForModel, resolveApiKeyForModel, resolveProviderCredentialSourceForModel, } from '../../../../core/runtime/api-keys.js';
-import { releaseSessionLease } from '../../../../core/chat/engine/sessions/lease.js';
-import { generateSessionTitle } from '../../../../core/chat/engine/sessions/title.js';
-import { isGenericSessionName } from '../../../../core/chat/engine/sessions/session-record.js';
+import { ChatSessionRecords, ChatSessionTitles } from '../../../../core/chat/engine/sessions/records/index.js';
 import { normalizeSessionTitle } from '../../utils/format.js';
 import { useProjectApprovals } from '../useProjectApprovals.js';
 import { beginTuiAgentTurn, finishTuiAgentTurn, } from './run/tui-agent-turn-lifecycle.js';
@@ -13,7 +11,7 @@ import { applyTuiAgentTurnFailure } from './run/tui-agent-turn-result.js';
 import { executeTuiOrdinaryTurn } from './run/tui-ordinary-turn.js';
 const PLAN_ITEM_STATUSES = new Set(['pending', 'in_progress', 'completed']);
 export function useAgentRunController(args) {
-    const { runtime, activeModel, activeReasoningEffort, sessionTitleModel, activeSessionId, sessions, state, updateSessionById, updateActiveSession } = args;
+    const { runtime, activeModel, activeReasoningEffort, sessionTitleModel, activeSessionId, sessions, state, sessionService, refreshSessions, updateSessionById } = args;
     const projectApprovals = useProjectApprovals(runtime.approvalsFile);
     const activeApiKey = resolveApiKeyForModel(activeModel, runtime);
     const titleApiKey = resolveApiKeyForModel(sessionTitleModel, runtime);
@@ -54,12 +52,12 @@ export function useAgentRunController(args) {
     }), [runtime.logFile]);
     const maybeAutoNameSession = (sessionId, prompt, responseText) => {
         const session = sessions.find((candidate) => candidate.id === sessionId);
-        if (!session || !isGenericSessionName(session.name) || titleCredentialSource.type === 'missing') {
+        if (!session || !ChatSessionRecords.isGenericName(session.name) || titleCredentialSource.type === 'missing') {
             return;
         }
         void (async () => {
             try {
-                const title = await generateSessionTitle({
+                const title = await ChatSessionTitles.generate({
                     llm: titleLlm,
                     prompt,
                     responseText,
@@ -68,7 +66,10 @@ export function useAgentRunController(args) {
                 if (!title) {
                     return;
                 }
-                updateSessionById(sessionId, (candidate) => isGenericSessionName(candidate.name) ? { ...candidate, name: title } : candidate);
+                if (ChatSessionRecords.isGenericName(sessionService.require(sessionId).name)) {
+                    sessionService.rename(sessionId, title);
+                    refreshSessions();
+                }
             }
             catch (titleError) {
                 logger.debug({ error: titleError instanceof Error ? titleError.message : String(titleError), sessionId }, 'Session auto-title failed');
@@ -88,6 +89,8 @@ export function useAgentRunController(args) {
             tools,
             logger,
             state,
+            sessionService,
+            refreshSessions,
             updateSessionById,
             maybeAutoNameSession,
             isProjectApproved: projectApprovals.isApproved,
@@ -104,7 +107,8 @@ export function useAgentRunController(args) {
             runtime,
             tools,
             state,
-            updateActiveSession,
+            sessionService,
+            refreshSessions,
             maybeAutoNameSession,
             isProjectApproved: projectApprovals.isApproved,
             rememberProjectApproval: projectApprovals.rememberApproval,
@@ -116,7 +120,7 @@ export function useAgentRunController(args) {
     };
 }
 export async function executeAgentTurn(args) {
-    const { prompt, displayText, sessionId, sessionHistory, runtime, llm, logger, state, updateSessionById, referenceAssistantText, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, drift, } = args;
+    const { prompt, displayText, sessionId, sessionHistory, runtime, llm, logger, state, sessionService, refreshSessions, updateSessionById, referenceAssistantText, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, drift, } = args;
     if (!prompt || state.isRunning) {
         return undefined;
     }
@@ -126,7 +130,8 @@ export async function executeAgentTurn(args) {
         return undefined;
     }
     const turnAbortController = beginTuiAgentTurn(state);
-    updateSessionById(sessionId, (session) => ({ ...session, lastContinuePrompt: prompt }));
+    sessionService.setLastContinuePrompt(sessionId, prompt);
+    refreshSessions();
     drift?.onRunStart?.();
     const leaseOwner = {
         ownerKind: 'tui',
@@ -149,6 +154,8 @@ export async function executeAgentTurn(args) {
             sessionId,
             runtime,
             state,
+            sessionService,
+            refreshSessions,
             updateSessionById,
             parsePlanState: parsePlanStateFromToolResult,
             maybeAutoNameSession,
@@ -169,12 +176,14 @@ export async function executeAgentTurn(args) {
             model: llm.info?.model ?? runtime.model,
             state,
             sessionId,
-            updateSessionById,
+            sessionService,
+            refreshSessions,
         });
         return undefined;
     }
     finally {
-        updateSessionById(sessionId, (sessionToUpdate) => releaseSessionLease(sessionToUpdate, leaseOwner));
+        sessionService.releaseLease(sessionId, leaseOwner);
+        refreshSessions();
         finishTuiAgentTurn(state);
     }
 }
@@ -231,7 +240,7 @@ function parsePlanStateFromToolResult(output) {
     };
 }
 async function runDirectShellAction(args) {
-    const { rawCommand, model, activeSessionId, activeSession, runtime, tools, state, updateActiveSession, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, } = args;
+    const { rawCommand, model, activeSessionId, activeSession, runtime, tools, state, sessionService, refreshSessions, maybeAutoNameSession, isProjectApproved, rememberProjectApproval, } = args;
     const command = rawCommand.trim();
     if (!command || state.isRunning || !activeSession) {
         return;
@@ -245,7 +254,8 @@ async function runDirectShellAction(args) {
         runtime,
         tools,
         state,
-        updateActiveSession,
+        sessionService,
+        refreshSessions,
         maybeAutoNameSession,
         isProjectApproved,
         rememberProjectApproval,