@ashx-j/lunr-dev 0.2.13-dev.8.1 → 0.2.19-dev.10.1

package/dist/core/agent-session.js

@@ -17,7 +17,6 @@ import { basename, dirname, join, resolve } from "node:path";
 import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, isRetryableAssistantError, modelsAreEqual, resetApiProviders, streamSimple, } from "@ashx-j/lunr-ai/compat";
 import { getAgentDir } from "../config.js";
 import { getThemeByName, theme } from "../modes/interactive/theme/theme.js";
-import { markStartupMilestone } from "../startup/startup-milestones.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { resolvePath } from "../utils/paths.js";
 import { sleep } from "../utils/sleep.js";
@@ -25,20 +24,18 @@ import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth
 import { executeBashWithOperations } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
-import { exportSessionToHtml } from "./export-html/index.js";
-import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
 import { MEMORY_TOOL_NAMES } from "./memory-cap.js";
 import { isUserInstructionsPath, loadSelectedUserInstructions } from "./model-instructions.js";
 import { ModelRegistry } from "./model-registry.js";
 import { gateToolCall } from "./permissions.js";
-import { isExplicitSwarmTurn } from "./swarm.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { rollbackSnapshotBeforeWrite } from "./rollback.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
+import { measureStartup } from "./timings.js";
 import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
@@ -100,6 +97,7 @@ export class AgentSession {
     _pendingNextTurnMessages = [];
     // Compaction state
     _compactionAbortController = undefined;
+    _manualCompactionPromise = undefined;
     _autoCompactionAbortController = undefined;
     _overflowRecoveryAttempted = false;
     // Branch summarization state
@@ -240,10 +238,8 @@ export class AgentSession {
     _installAgentToolHooks() {
         this.agent.beforeToolCall = async ({ toolCall, args, assistantMessage }) => {
             // lunr: permission gate (async) runs before sync gates — may show an approval dialog.
-            const explicitSwarmTurn = toolCall.name === "subagent" ? isExplicitSwarmTurn(this.sessionManager.getBranch()) : undefined;
             const permBlock = await gateToolCall(toolCall.name, args, this._cwd, this.sessionId, {
                 confirmLargeSubagentLaunches: this.settingsManager.getConfirmLargeSubagentLaunches(),
-                explicitSwarmTurn,
                 assistantMessage,
             });
             if (permBlock) {
@@ -334,7 +330,19 @@ export class AgentSession {
                 : undefined);
         this.agent.prepareNextTurnWithContext = async (turn, signal) => {
             const previousSnapshot = await previousPrepareNextTurnWithContext?.(turn, signal);
-            const previousContext = previousSnapshot?.context ?? turn.context;
+            let previousContext = previousSnapshot?.context ?? turn.context;
+            const model = this.model;
+            const settings = this.settingsManager.getCompactionSettings();
+            if (model?.provider === "openai-codex" &&
+                settings.enabled &&
+                shouldCompact(estimateContextTokens(previousContext.messages).tokens, model.contextWindow, settings)) {
+                const previousCompactionId = getLatestCompactionEntry(this.sessionManager.getBranch())?.id;
+                await this._runAutoCompaction("threshold", true);
+                const currentCompaction = getLatestCompactionEntry(this.sessionManager.getBranch());
+                if (currentCompaction && currentCompaction.id !== previousCompactionId) {
+                    previousContext = { ...previousContext, messages: this.agent.state.messages.slice() };
+                }
+            }
             return {
                 ...previousSnapshot,
                 context: {
@@ -869,7 +877,6 @@ export class AgentSession {
     async _runAgentPrompt(messages) {
         this._isAgentRunActive = true;
         try {
-            markStartupMilestone("first_provider_request_started");
             await this.agent.prompt(messages);
             while (await this._handlePostAgentRun()) {
                 await this.agent.continue();
@@ -1522,14 +1529,48 @@ export class AgentSession {
     // =========================================================================
     // Compaction
     // =========================================================================
+    _latestCompactionResult() {
+        const pathEntries = this.sessionManager.getBranch();
+        const lastEntry = pathEntries[pathEntries.length - 1];
+        if (lastEntry?.type !== "compaction")
+            return undefined;
+        return {
+            summary: lastEntry.summary,
+            firstKeptEntryId: lastEntry.firstKeptEntryId,
+            tokensBefore: lastEntry.tokensBefore,
+            estimatedTokensAfter: estimateMessagesTokens(this.sessionManager.buildSessionContext().messages),
+            details: lastEntry.details,
+        };
+    }
     /**
      * Manually compact the session context.
      * Aborts current agent operation first.
      * @param customInstructions Optional instructions for the compaction summary
      */
     async compact(customInstructions) {
+        const existing = this._latestCompactionResult();
+        if (existing)
+            return existing;
+        if (this._manualCompactionPromise)
+            return this._manualCompactionPromise;
+        const promise = this._compact(customInstructions);
+        this._manualCompactionPromise = promise;
+        try {
+            return await promise;
+        }
+        finally {
+            if (this._manualCompactionPromise === promise)
+                this._manualCompactionPromise = undefined;
+        }
+    }
+    async _compact(customInstructions) {
         this._disconnectFromAgent();
         await this.abort();
+        const existing = this._latestCompactionResult();
+        if (existing) {
+            this._reconnectToAgent();
+            return existing;
+        }
         this._compactionAbortController = new AbortController();
         this._emit({ type: "compaction_start", reason: "manual" });
         try {
@@ -1748,12 +1789,11 @@ export class AgentSession {
      * Internal: Run auto-compaction with events.
      */
     async _runAutoCompaction(reason, willRetry) {
+        if (!this.model || this._compactionAbortController || this._autoCompactionAbortController)
+            return false;
         const settings = this.settingsManager.getCompactionSettings();
         let started = false;
         try {
-            if (!this.model) {
-                return false;
-            }
             let apiKey;
             let headers;
             let env;
@@ -1980,7 +2020,7 @@ export class AgentSession {
                 continue;
             for (const handler of handlers) {
                 try {
-                    await handler(this._sessionStartEvent, ctx);
+                    await measureStartup(`${ext.path} session_start`, () => handler(this._sessionStartEvent, ctx), "lifecycle");
                 }
                 catch (err) {
                     const message = err instanceof Error ? err.message : String(err);
@@ -2847,6 +2887,10 @@ export class AgentSession {
      * @returns Path to exported file
      */
     async exportToHtml(outputPath) {
+        const [{ exportSessionToHtml }, { createToolHtmlRenderer }] = await Promise.all([
+            import("./export-html/index.js"),
+            import("./export-html/tool-renderer.js"),
+        ]);
         const configuredThemeName = this.settingsManager.getTheme();
         const themeName = configuredThemeName && getThemeByName(configuredThemeName) ? configuredThemeName : undefined;
         // Create tool renderer if we have an extension runner (for custom tool HTML rendering)