@roackb2/heddle 0.0.36 → 0.0.37

package/dist/src/core/chat/ordinary-turn.js

@@ -0,0 +1,274 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { appendMemoryCatalogSystemContext, createDefaultAgentTools, createLlmAdapter, DEFAULT_OPENAI_MODEL, inferProviderFromModel, runAgentLoop, } from '../../index.js';
+import { runMaintenanceForRecordedCandidates } from '../memory/maintenance-integration.js';
+import { buildCompactionRunningContext } from './compaction.js';
+import { buildConversationMessages } from './conversation-lines.js';
+import { releaseSessionLease } from './session-lease.js';
+import { prepareChatSessionTurn } from './session-turn-preflight.js';
+import { persistChatTurnResult } from './session-turn-result.js';
+import { loadChatSessions, saveChatSessions, touchSession } from './storage.js';
+import { summarizeTrace } from './trace-summary.js';
+import { formatMissingProviderCredentialMessage, hasProviderCredentialForModel, resolveApiKeyForModel, resolveProviderCredentialSourceForModel, } from '../../core/runtime/api-keys.js';
+export async function executeOrdinaryChatTurn(args) {
+    const sessions = loadChatSessions(args.sessionStoragePath, true);
+    const session = sessions.find((candidate) => candidate.id === args.sessionId);
+    if (!session) {
+        throw new Error(`Chat session not found: ${args.sessionId}`);
+    }
+    const model = session.model ?? process.env.OPENAI_MODEL ?? process.env.ANTHROPIC_MODEL ?? DEFAULT_OPENAI_MODEL;
+    const provider = inferProviderFromModel(model);
+    const apiKey = args.apiKey ?? resolveApiKeyForModel(model, { preferApiKey: args.preferApiKey });
+    const providerCredentialSource = resolveProviderCredentialSourceForModel(model, {
+        apiKey,
+        apiKeyProvider: args.apiKey ? 'explicit' : apiKey ? provider : undefined,
+        credentialStorePath: args.credentialStorePath,
+        preferApiKey: args.preferApiKey,
+    });
+    if (!hasProviderCredentialForModel(model, {
+        apiKey: args.apiKey,
+        apiKeyProvider: args.apiKey ? 'explicit' : undefined,
+        credentialStorePath: args.credentialStorePath,
+        preferApiKey: args.preferApiKey,
+    })) {
+        throw new Error(formatMissingProviderCredentialMessage(model));
+    }
+    const leaseOwner = args.leaseOwner ?? {
+        ownerKind: 'ask',
+        ownerId: `submit-${process.pid}`,
+        clientLabel: 'another Heddle client',
+    };
+    const llm = createLlmAdapter({ model, apiKey, credentialStorePath: args.credentialStorePath });
+    const memoryDir = join(args.stateRoot, 'memory');
+    const systemContext = appendMemoryCatalogSystemContext({
+        systemContext: args.systemContext,
+        memoryRoot: memoryDir,
+    });
+    const tools = createDefaultAgentTools({
+        model,
+        apiKey,
+        providerCredentialSource,
+        credentialStorePath: args.credentialStorePath,
+        workspaceRoot: args.workspaceRoot,
+        memoryDir,
+        searchIgnoreDirs: [],
+        includePlanTool: true,
+    });
+    try {
+        const preflight = await prepareChatSessionTurn({
+            sessionStoragePath: args.sessionStoragePath,
+            sessionId: session.id,
+            fallbackHistory: session.history,
+            prompt: args.prompt,
+            model,
+            stateRoot: args.stateRoot,
+            systemContext,
+            toolNames: tools.map((tool) => tool.name),
+            summarizer: { credentialSource: providerCredentialSource },
+            leaseOwner,
+            onCompactionStatus: (event, _sourceHistory, leasedSession) => {
+                args.onCompactionStatus?.(event);
+                args.host?.compaction?.onPreflightCompactionStatus?.(event);
+                if (event.status === 'running' && leasedSession) {
+                    const compactionSeed = touchSession({
+                        ...leasedSession,
+                        context: buildCompactionRunningContext({
+                            history: leasedSession.history,
+                            previous: leasedSession.context,
+                            archiveCount: leasedSession.archives?.length,
+                            currentSummaryPath: leasedSession.context?.currentSummaryPath,
+                            lastArchivePath: event.archivePath,
+                        }),
+                    });
+                    saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? compactionSeed : candidate));
+                }
+            },
+        });
+        if (!preflight.ok) {
+            throw new Error(preflight.message);
+        }
+        const preflightSession = preflight.session ?? touchSession({
+            ...session,
+            history: preflight.preflightHistory,
+            context: preflight.context,
+            archives: preflight.archives,
+            messages: buildConversationMessages(preflight.preflightHistory),
+        });
+        saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? preflightSession : candidate));
+        const result = await runAgentLoop({
+            goal: args.prompt,
+            model,
+            apiKey,
+            workspaceRoot: args.workspaceRoot,
+            stateDir: args.stateRoot,
+            memoryDir,
+            llm,
+            tools,
+            includeDefaultTools: false,
+            history: preflightSession.history,
+            systemContext,
+            onAssistantStream: args.onAssistantStream,
+            onTraceEvent: args.onTraceEvent,
+            onEvent: args.host?.events?.onAgentLoopEvent,
+            approveToolCall: args.host?.approvals?.requestToolApproval ?
+                ((call, tool) => args.host?.approvals?.requestToolApproval?.({ call, tool }) ?? Promise.resolve({ approved: false, reason: 'Missing approval port.' }))
+                : undefined,
+            shouldStop: args.shouldStop,
+            abortSignal: args.abortSignal,
+        });
+        const maintenanceMode = args.memoryMaintenanceMode ?? 'background';
+        const inlineMaintenance = maintenanceMode === 'inline' ?
+            await runMaintenanceForRecordedCandidates({
+                memoryRoot: memoryDir,
+                llm,
+                source: `chat session ${session.id}`,
+                trace: result.trace,
+                maxSteps: 20,
+                onTraceEvent: (event) => args.host?.events?.onAgentLoopEvent?.({
+                    type: 'trace',
+                    runId: result.state.runId,
+                    event,
+                    timestamp: new Date().toISOString(),
+                }),
+            })
+            : undefined;
+        const resultTrace = inlineMaintenance && inlineMaintenance.events.length > 0 ?
+            [...result.trace, ...inlineMaintenance.events]
+            : result.trace;
+        const resultForPersistence = {
+            ...result,
+            trace: resultTrace,
+            state: {
+                ...result.state,
+                trace: resultTrace,
+            },
+        };
+        const persisted = await persistChatTurnResult({
+            result: resultForPersistence,
+            prompt: args.prompt,
+            session: preflightSession,
+            model,
+            stateRoot: args.stateRoot,
+            traceDir: join(args.stateRoot, 'traces'),
+            systemContext,
+            toolNames: tools.map((tool) => tool.name),
+            historyForTokenEstimate: session.history,
+            summarizer: { credentialSource: providerCredentialSource },
+            createTurnId: () => `server-turn-${Date.now()}`,
+            onCompactionStatus: (event) => {
+                args.onCompactionStatus?.(event);
+                args.host?.compaction?.onFinalCompactionStatus?.(event);
+                if (event.status === 'running') {
+                    const compactionSeed = touchSession({
+                        ...preflightSession,
+                        history: result.transcript,
+                        context: buildCompactionRunningContext({
+                            history: resultForPersistence.transcript,
+                            previous: preflightSession.context,
+                            archiveCount: preflightSession.archives?.length,
+                            currentSummaryPath: preflightSession.context?.currentSummaryPath,
+                            lastArchivePath: event.archivePath,
+                        }),
+                    });
+                    saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? compactionSeed : candidate));
+                }
+            },
+        });
+        const nextSessions = sessions.map((candidate) => candidate.id === session.id ? persisted.session : candidate);
+        saveChatSessions(args.sessionStoragePath, nextSessions);
+        if (maintenanceMode === 'background') {
+            scheduleBackgroundMemoryMaintenance({
+                memoryRoot: memoryDir,
+                llm,
+                source: `chat session ${session.id}`,
+                trace: result.trace,
+                traceFile: persisted.traceFile,
+                sessionStoragePath: args.sessionStoragePath,
+                sessionId: session.id,
+                runId: result.state?.runId ?? `session-${session.id}`,
+                onEvent: args.host?.events?.onAgentLoopEvent,
+            });
+        }
+        return {
+            outcome: resultForPersistence.outcome,
+            summary: persisted.summary,
+            session: persisted.session,
+        };
+    }
+    finally {
+        clearOrdinaryChatTurnLease(args.sessionStoragePath, session.id, leaseOwner);
+    }
+}
+function scheduleBackgroundMemoryMaintenance(args) {
+    void (async () => {
+        const maintenance = await runMaintenanceForRecordedCandidates({
+            memoryRoot: args.memoryRoot,
+            llm: args.llm,
+            source: args.source,
+            trace: args.trace,
+            maxSteps: 20,
+            onTraceEvent: (event) => args.onEvent?.({ type: 'trace', runId: args.runId, event, timestamp: new Date().toISOString() }),
+        });
+        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');
+        const sessions = loadChatSessions(args.sessionStoragePath, true);
+        const nextSessions = sessions.map((session) => {
+            if (session.id !== args.sessionId) {
+                return session;
+            }
+            return touchSession({
+                ...session,
+                turns: session.turns.map((turn, index) => (index === session.turns.length - 1 ?
+                    {
+                        ...turn,
+                        events: summarizeTrace(nextTrace),
+                    }
+                    : turn)),
+            });
+        });
+        saveChatSessions(args.sessionStoragePath, nextSessions);
+    })().catch((error) => {
+        args.onEvent?.({
+            type: 'trace',
+            runId: args.runId,
+            event: {
+                type: 'memory.maintenance_failed',
+                runId: `memory-run-${Date.now()}`,
+                error: error instanceof Error ? error.message : String(error),
+                candidateIds: [],
+                step: nextTraceStep(args.trace),
+                timestamp: new Date().toISOString(),
+            },
+            timestamp: new Date().toISOString(),
+        });
+    });
+}
+function readTraceEvents(path) {
+    try {
+        const parsed = JSON.parse(readFileSync(path, 'utf8'));
+        return Array.isArray(parsed) ? parsed : [];
+    }
+    catch {
+        return [];
+    }
+}
+function nextTraceStep(trace) {
+    return trace.reduce((max, event) => 'step' in event ? Math.max(max, event.step) : max, 0) + 1;
+}
+export function clearOrdinaryChatTurnLease(sessionStoragePath, sessionId, owner) {
+    const sessions = loadChatSessions(sessionStoragePath, true);
+    const session = sessions.find((candidate) => candidate.id === sessionId);
+    if (!session?.lease) {
+        return;
+    }
+    const released = releaseSessionLease(session, owner);
+    if (released === session) {
+        return;
+    }
+    saveChatSessions(sessionStoragePath, sessions.map((candidate) => candidate.id === sessionId ? touchSession(released) : candidate));
+}
+//# sourceMappingURL=ordinary-turn.js.map

package/dist/src/core/chat/ordinary-turn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ordinary-turn.js","sourceRoot":"","sources":["../../../../src/core/chat/ordinary-turn.ts"],"names":[],"mappings":"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"}

package/dist/src/core/chat/session-submit.d.ts

@@ -1,6 +1,6 @@
 import type { ToolCall, ToolDefinition } from '../../index.js';
-import { type ChatSessionLeaseOwner } from './session-lease.js';
-import type { ChatSession } from './types.js';
+import { clearOrdinaryChatTurnLease } from './ordinary-turn.js';
+import type { ChatSessionLeaseOwner } from './session-lease.js';
 import type { AgentLoopEvent } from '../../index.js';
 export type SubmitChatSessionPromptArgs = {
     workspaceRoot: string;
@@ -29,7 +29,7 @@ export type SubmitChatSessionPromptArgs = {
 export declare function submitChatSessionPrompt(args: SubmitChatSessionPromptArgs): Promise<{
     outcome: import("../types.js").StopReason;
     summary: string;
-    session: ChatSession;
+    session: import("./types.js").ChatSession;
 }>;
-export declare function clearChatSessionLease(sessionStoragePath: string, sessionId: string, owner: ChatSessionLeaseOwner): void;
+export declare const clearChatSessionLease: typeof clearOrdinaryChatTurnLease;
 //# sourceMappingURL=session-submit.d.ts.map

package/dist/src/core/chat/session-submit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAmB,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhF,OAAO,EAAqE,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEnI,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAU9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC;IACzD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAChJ,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5G,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B;;;;GAmO9E;AA+ED,wBAAgB,qBAAqB,CAAC,kBAAkB,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,QAgBhH"}
+{"version":3,"file":"session-submit.d.ts","sourceRoot":"","sources":["../../../../src/core/chat/session-submit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAA2B,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,MAAM,MAAM,2BAA2B,GAAG;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC;IACzD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAC1C,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IAChJ,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5G,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC;AAEF,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,2BAA2B;;;;GA2B9E;AAED,eAAO,MAAM,qBAAqB,mCAA6B,CAAC"}

package/dist/src/core/chat/session-submit.js

@@ -1,289 +1,30 @@
-import { join } from 'node:path';
-import { readFileSync, writeFileSync } from 'node:fs';
-import { appendMemoryCatalogSystemContext, createDefaultAgentTools, createLlmAdapter, DEFAULT_OPENAI_MODEL, inferProviderFromModel, runAgentLoop, } from '../../index.js';
-import { runMaintenanceForRecordedCandidates } from '../memory/maintenance-integration.js';
-import { buildCompactionRunningContext, compactChatHistoryWithArchive, estimateChatHistoryTokens } from './compaction.js';
-import { buildConversationMessages } from './conversation-lines.js';
-import { formatChatFailureMessage } from './failure-messages.js';
-import { acquireSessionLease, getSessionLeaseConflict, releaseSessionLease } from './session-lease.js';
-import { loadChatSessions, saveChatSessions, touchSession } from './storage.js';
-import { saveTrace } from './trace.js';
-import { countAssistantSteps, summarizeTrace } from './trace-summary.js';
-import { formatMissingProviderCredentialMessage, hasProviderCredentialForModel, resolveApiKeyForModel, resolveProviderCredentialSourceForModel, } from '../../core/runtime/api-keys.js';
+import { executeOrdinaryChatTurn, clearOrdinaryChatTurnLease } from './ordinary-turn.js';
 export async function submitChatSessionPrompt(args) {
-    const sessions = loadChatSessions(args.sessionStoragePath, true);
-    const session = sessions.find((candidate) => candidate.id === args.sessionId);
-    if (!session) {
-        throw new Error(`Chat session not found: ${args.sessionId}`);
-    }
-    const model = session.model ?? process.env.OPENAI_MODEL ?? process.env.ANTHROPIC_MODEL ?? DEFAULT_OPENAI_MODEL;
-    const provider = inferProviderFromModel(model);
-    const apiKey = args.apiKey ?? resolveApiKeyForModel(model, { preferApiKey: args.preferApiKey });
-    const providerCredentialSource = resolveProviderCredentialSourceForModel(model, {
-        apiKey,
-        apiKeyProvider: args.apiKey ? 'explicit' : apiKey ? provider : undefined,
-        preferApiKey: args.preferApiKey,
-    });
-    if (!hasProviderCredentialForModel(model, {
+    const result = await executeOrdinaryChatTurn({
+        workspaceRoot: args.workspaceRoot,
+        stateRoot: args.stateRoot,
+        sessionStoragePath: args.sessionStoragePath,
+        sessionId: args.sessionId,
+        prompt: args.prompt,
         apiKey: args.apiKey,
-        apiKeyProvider: args.apiKey ? 'explicit' : undefined,
         preferApiKey: args.preferApiKey,
-    })) {
-        throw new Error(formatMissingProviderCredentialMessage(model));
-    }
-    const leaseOwner = args.leaseOwner ?? {
-        ownerKind: 'ask',
-        ownerId: `submit-${process.pid}`,
-        clientLabel: 'another Heddle client',
-    };
-    const leaseConflict = getSessionLeaseConflict(session, leaseOwner);
-    if (leaseConflict) {
-        throw new Error(leaseConflict);
-    }
-    const leasedSession = touchSession(acquireSessionLease(session, leaseOwner));
-    saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? leasedSession : candidate));
-    const llm = createLlmAdapter({ model, apiKey, credentialStorePath: args.stateRoot });
-    const memoryDir = join(args.stateRoot, 'memory');
-    const systemContext = appendMemoryCatalogSystemContext({
         systemContext: args.systemContext,
-        memoryRoot: memoryDir,
-    });
-    const tools = createDefaultAgentTools({
-        model,
-        apiKey,
-        providerCredentialSource,
-        credentialStorePath: args.stateRoot,
-        workspaceRoot: args.workspaceRoot,
-        memoryDir,
-        searchIgnoreDirs: [],
-        includePlanTool: true,
+        memoryMaintenanceMode: args.memoryMaintenanceMode,
+        host: {
+            events: args.onEvent ? { onAgentLoopEvent: args.onEvent } : undefined,
+            compaction: args.onCompactionStatus ? {
+                onPreflightCompactionStatus: args.onCompactionStatus,
+                onFinalCompactionStatus: args.onCompactionStatus,
+            } : undefined,
+            approvals: args.approveToolCall ? {
+                requestToolApproval: ({ call, tool }) => args.approveToolCall?.(call, tool) ?? Promise.resolve({ approved: false, reason: 'Missing approval handler.' }),
+            } : undefined,
+        },
+        onCompactionStatus: args.onCompactionStatus,
+        abortSignal: args.abortSignal,
+        leaseOwner: args.leaseOwner,
     });
-    try {
-        const preflightCompacted = await compactChatHistoryWithArchive({
-            history: session.history,
-            model,
-            sessionId: session.id,
-            stateRoot: args.stateRoot,
-            toolNames: tools.map((tool) => tool.name),
-            goal: args.prompt,
-            systemContext,
-            summarizer: { credentialSource: providerCredentialSource },
-            onStatusChange: (event) => {
-                args.onCompactionStatus?.(event);
-                if (event.status === 'running') {
-                    const compactionSeed = touchSession({
-                        ...leasedSession,
-                        context: buildCompactionRunningContext({
-                            history: leasedSession.history,
-                            previous: leasedSession.context,
-                            archiveCount: leasedSession.archives?.length,
-                            currentSummaryPath: leasedSession.context?.currentSummaryPath,
-                            lastArchivePath: event.archivePath,
-                        }),
-                    });
-                    saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? compactionSeed : candidate));
-                }
-            },
-        });
-        const preflightSession = preflightCompacted.history !== leasedSession.history || preflightCompacted.archives.length !== (leasedSession.archives?.length ?? 0) ?
-            touchSession({
-                ...leasedSession,
-                history: preflightCompacted.history,
-                context: preflightCompacted.context,
-                archives: preflightCompacted.archives,
-                messages: buildConversationMessages(preflightCompacted.history),
-            })
-            : leasedSession;
-        if (preflightSession !== leasedSession) {
-            saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? preflightSession : candidate));
-        }
-        const result = await runAgentLoop({
-            goal: args.prompt,
-            model,
-            apiKey,
-            workspaceRoot: args.workspaceRoot,
-            stateDir: args.stateRoot,
-            memoryDir,
-            llm,
-            tools,
-            includeDefaultTools: false,
-            history: preflightSession.history,
-            systemContext,
-            onEvent: args.onEvent,
-            approveToolCall: args.approveToolCall,
-            abortSignal: args.abortSignal,
-        });
-        const maintenanceMode = args.memoryMaintenanceMode ?? 'background';
-        const inlineMaintenance = maintenanceMode === 'inline' ?
-            await runMaintenanceForRecordedCandidates({
-                memoryRoot: memoryDir,
-                llm,
-                source: `chat session ${session.id}`,
-                trace: result.trace,
-                maxSteps: 20,
-                onTraceEvent: (event) => args.onEvent?.({ type: 'trace', runId: result.state.runId, event, timestamp: new Date().toISOString() }),
-            })
-            : undefined;
-        const resultTrace = inlineMaintenance && inlineMaintenance.events.length > 0 ?
-            [...result.trace, ...inlineMaintenance.events]
-            : result.trace;
-        const resultForPersistence = {
-            ...result,
-            trace: resultTrace,
-            state: {
-                ...result.state,
-                trace: resultTrace,
-            },
-        };
-        const compacted = await compactChatHistoryWithArchive({
-            history: resultForPersistence.transcript,
-            model,
-            sessionId: session.id,
-            stateRoot: args.stateRoot,
-            usage: resultForPersistence.usage,
-            toolNames: tools.map((tool) => tool.name),
-            goal: args.prompt,
-            systemContext,
-            summarizer: { credentialSource: providerCredentialSource },
-            onStatusChange: (event) => {
-                args.onCompactionStatus?.(event);
-                if (event.status === 'running') {
-                    const compactionSeed = touchSession({
-                        ...preflightSession,
-                        history: result.transcript,
-                        context: buildCompactionRunningContext({
-                            history: resultForPersistence.transcript,
-                            previous: preflightSession.context,
-                            archiveCount: preflightSession.archives?.length,
-                            currentSummaryPath: preflightSession.context?.currentSummaryPath,
-                            lastArchivePath: event.archivePath,
-                        }),
-                    });
-                    saveChatSessions(args.sessionStoragePath, sessions.map((candidate) => candidate.id === session.id ? compactionSeed : candidate));
-                }
-            },
-        });
-        const traceFile = saveTrace(join(args.stateRoot, 'traces'), resultForPersistence.trace);
-        const nextTurn = {
-            id: `server-turn-${Date.now()}`,
-            prompt: args.prompt,
-            outcome: resultForPersistence.outcome,
-            summary: resultForPersistence.summary,
-            steps: countAssistantSteps(resultForPersistence.trace),
-            traceFile,
-            events: summarizeTrace(resultForPersistence.trace),
-        };
-        const formattedSummary = resultForPersistence.outcome === 'error' ?
-            formatChatFailureMessage(resultForPersistence.summary, {
-                model,
-                estimatedHistoryTokens: estimateChatHistoryTokens(session.history),
-            })
-            : resultForPersistence.summary;
-        const updatedSession = touchSession({
-            ...preflightSession,
-            lastContinuePrompt: args.prompt,
-            history: compacted.history,
-            context: compacted.context,
-            archives: compacted.archives,
-            lease: undefined,
-            messages: buildConversationMessages(compacted.history),
-            turns: [...preflightSession.turns, nextTurn].slice(-8),
-        });
-        const nextSessions = sessions.map((candidate) => candidate.id === session.id ? updatedSession : candidate);
-        saveChatSessions(args.sessionStoragePath, nextSessions);
-        if (maintenanceMode === 'background') {
-            scheduleBackgroundMemoryMaintenance({
-                memoryRoot: memoryDir,
-                llm,
-                source: `chat session ${session.id}`,
-                trace: result.trace,
-                traceFile,
-                sessionStoragePath: args.sessionStoragePath,
-                sessionId: session.id,
-                runId: result.state?.runId ?? `session-${session.id}`,
-                onEvent: args.onEvent,
-            });
-        }
-        return {
-            outcome: resultForPersistence.outcome,
-            summary: formattedSummary,
-            session: updatedSession,
-        };
-    }
-    finally {
-        clearChatSessionLease(args.sessionStoragePath, session.id, leaseOwner);
-    }
-}
-function scheduleBackgroundMemoryMaintenance(args) {
-    void (async () => {
-        const maintenance = await runMaintenanceForRecordedCandidates({
-            memoryRoot: args.memoryRoot,
-            llm: args.llm,
-            source: args.source,
-            trace: args.trace,
-            maxSteps: 20,
-            onTraceEvent: (event) => args.onEvent?.({ type: 'trace', runId: args.runId, event, timestamp: new Date().toISOString() }),
-        });
-        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');
-        const sessions = loadChatSessions(args.sessionStoragePath, true);
-        const nextSessions = sessions.map((session) => {
-            if (session.id !== args.sessionId) {
-                return session;
-            }
-            return touchSession({
-                ...session,
-                turns: session.turns.map((turn, index) => (index === session.turns.length - 1 ?
-                    {
-                        ...turn,
-                        events: summarizeTrace(nextTrace),
-                    }
-                    : turn)),
-            });
-        });
-        saveChatSessions(args.sessionStoragePath, nextSessions);
-    })().catch((error) => {
-        args.onEvent?.({
-            type: 'trace',
-            runId: args.runId,
-            event: {
-                type: 'memory.maintenance_failed',
-                runId: `memory-run-${Date.now()}`,
-                error: error instanceof Error ? error.message : String(error),
-                candidateIds: [],
-                step: nextTraceStep(args.trace),
-                timestamp: new Date().toISOString(),
-            },
-            timestamp: new Date().toISOString(),
-        });
-    });
-}
-function readTraceEvents(path) {
-    try {
-        const parsed = JSON.parse(readFileSync(path, 'utf8'));
-        return Array.isArray(parsed) ? parsed : [];
-    }
-    catch {
-        return [];
-    }
-}
-function nextTraceStep(trace) {
-    return trace.reduce((max, event) => 'step' in event ? Math.max(max, event.step) : max, 0) + 1;
-}
-export function clearChatSessionLease(sessionStoragePath, sessionId, owner) {
-    const sessions = loadChatSessions(sessionStoragePath, true);
-    const session = sessions.find((candidate) => candidate.id === sessionId);
-    if (!session?.lease) {
-        return;
-    }
-    const released = releaseSessionLease(session, owner);
-    if (released === session) {
-        return;
-    }
-    saveChatSessions(sessionStoragePath, sessions.map((candidate) => candidate.id === sessionId ? touchSession(released) : candidate));
+    return result;
 }
+export const clearChatSessionLease = clearOrdinaryChatTurnLease;
 //# sourceMappingURL=session-submit.js.map