@draht/coding-agent 2026.3.25 → 2026.4.5

package/dist/core/agent-session.js

@@ -12,14 +12,14 @@
  *
  * Modes use this class and add their own I/O layer on top.
  */
-import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { isContextOverflow, modelsAreEqual, resetApiProviders, supportsXhigh } from "@draht/ai";
 import { getDocsPath } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { sleep } from "../utils/sleep.js";
-import { executeBash as executeBashCommand, executeBashWithOperations } from "./bash-executor.js";
+import { executeBashWithOperations } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
@@ -29,6 +29,7 @@ import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
+import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool, wrapToolDefinition } from "./tools/tool-definition-wrapper.js";
 /**
@@ -95,6 +96,7 @@ export class AgentSession {
     _extensionRunnerRef;
     _initialActiveToolNames;
     _baseToolsOverride;
+    _sessionStartEvent;
     _extensionUIContext;
     _extensionCommandContextActions;
     _extensionShutdownHandler;
@@ -121,6 +123,7 @@ export class AgentSession {
         this._extensionRunnerRef = config.extensionRunnerRef;
         this._initialActiveToolNames = config.initialActiveToolNames;
         this._baseToolsOverride = config.baseToolsOverride;
+        this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
@@ -134,6 +137,23 @@ export class AgentSession {
     get modelRegistry() {
         return this._modelRegistry;
     }
+    async _getRequiredRequestAuth(model) {
+        const result = await this._modelRegistry.getApiKeyAndHeaders(model);
+        if (!result.ok) {
+            throw new Error(result.error);
+        }
+        if (result.apiKey) {
+            return { apiKey: result.apiKey, headers: result.headers };
+        }
+        const isOAuth = this._modelRegistry.isUsingOAuth(model);
+        if (isOAuth) {
+            throw new Error(`Authentication failed for "${model.provider}". ` +
+                `Credentials may have expired or network is unavailable. ` +
+                `Run '/login ${model.provider}' to re-authenticate.`);
+        }
+        throw new Error(`No API key found for ${model.provider}.\n\n` +
+            `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}`);
+    }
     /**
      * Install tool hooks once on the Agent instance.
      *
@@ -686,9 +706,7 @@ export class AgentSession {
                 `Use /login or set an API key environment variable. See ${join(getDocsPath(), "providers.md")}\n\n` +
                 "Then use /model to select a model.");
         }
-        // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(this.model);
-        if (!apiKey) {
+        if (!this._modelRegistry.hasConfiguredAuth(this.model)) {
             const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
             if (isOAuth) {
                 throw new Error(`Authentication failed for "${this.model.provider}". ` +
@@ -1000,54 +1018,6 @@ export class AgentSession {
         this.agent.abort();
         await this.agent.waitForIdle();
     }
-    /**
-     * Start a new session, optionally with initial messages and parent tracking.
-     * Clears all messages and starts a new session.
-     * Listeners are preserved and will continue receiving events.
-     * @param options.parentSession - Optional parent session path for tracking
-     * @param options.setup - Optional callback to initialize session (e.g., append messages)
-     * @returns true if completed, false if cancelled by extension
-     */
-    async newSession(options) {
-        const previousSessionFile = this.sessionFile;
-        // Emit session_before_switch event with reason "new" (can be cancelled)
-        if (this._extensionRunner?.hasHandlers("session_before_switch")) {
-            const result = (await this._extensionRunner.emit({
-                type: "session_before_switch",
-                reason: "new",
-            }));
-            if (result?.cancel) {
-                return false;
-            }
-        }
-        this._disconnectFromAgent();
-        await this.abort();
-        this.agent.reset();
-        this.sessionManager.newSession({ parentSession: options?.parentSession });
-        this.agent.sessionId = this.sessionManager.getSessionId();
-        this._steeringMessages = [];
-        this._followUpMessages = [];
-        this._pendingNextTurnMessages = [];
-        this.sessionManager.appendThinkingLevelChange(this.thinkingLevel);
-        // Run setup callback if provided (e.g., to append initial messages)
-        if (options?.setup) {
-            await options.setup(this.sessionManager);
-            // Sync agent state with session manager after setup
-            const sessionContext = this.sessionManager.buildSessionContext();
-            this.agent.replaceMessages(sessionContext.messages);
-        }
-        this._reconnectToAgent();
-        // Emit session_switch event with reason "new" to extensions
-        if (this._extensionRunner) {
-            await this._extensionRunner.emit({
-                type: "session_switch",
-                reason: "new",
-                previousSessionFile,
-            });
-        }
-        // Emit session event to custom tools
-        return true;
-    }
     // =========================================================================
     // Model Management
     // =========================================================================
@@ -1065,12 +1035,11 @@ export class AgentSession {
     }
     /**
      * Set model directly.
-     * Validates API key, saves to session and settings.
-     * @throws Error if no API key available for the model
+     * Validates that auth is configured, saves to session and settings.
+     * @throws Error if no auth is configured for the model
      */
     async setModel(model) {
-        const apiKey = await this._modelRegistry.getApiKey(model);
-        if (!apiKey) {
+        if (!this._modelRegistry.hasConfiguredAuth(model)) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
         const previousModel = this.model;
@@ -1094,27 +1063,8 @@ export class AgentSession {
         }
         return this._cycleAvailableModel(direction);
     }
-    async _getScopedModelsWithApiKey() {
-        const apiKeysByProvider = new Map();
-        const result = [];
-        for (const scoped of this._scopedModels) {
-            const provider = scoped.model.provider;
-            let apiKey;
-            if (apiKeysByProvider.has(provider)) {
-                apiKey = apiKeysByProvider.get(provider);
-            }
-            else {
-                apiKey = await this._modelRegistry.getApiKeyForProvider(provider);
-                apiKeysByProvider.set(provider, apiKey);
-            }
-            if (apiKey) {
-                result.push(scoped);
-            }
-        }
-        return result;
-    }
     async _cycleScopedModel(direction) {
-        const scopedModels = await this._getScopedModelsWithApiKey();
+        const scopedModels = this._scopedModels.filter((scoped) => this._modelRegistry.hasConfiguredAuth(scoped.model));
         if (scopedModels.length <= 1)
             return undefined;
         const currentModel = this.model;
@@ -1148,10 +1098,6 @@ export class AgentSession {
         const len = availableModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const nextModel = availableModels[nextIndex];
-        const apiKey = await this._modelRegistry.getApiKey(nextModel);
-        if (!apiKey) {
-            throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
-        }
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
         this.agent.setModel(nextModel);
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
@@ -1280,10 +1226,7 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error("No model selected");
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
-            if (!apiKey) {
-                throw new Error(`No API key for ${this.model.provider}`);
-            }
+            const { apiKey, headers } = await this._getRequiredRequestAuth(this.model);
             const pathEntries = this.sessionManager.getBranch();
             const settings = this.settingsManager.getCompactionSettings();
             const preparation = prepareCompaction(pathEntries, settings);
@@ -1326,7 +1269,7 @@ export class AgentSession {
             }
             else {
                 // Generate compaction result
-                const result = await compact(preparation, this.model, apiKey, customInstructions, this._compactionAbortController.signal);
+                const result = await compact(preparation, this.model, apiKey, headers, customInstructions, this._compactionAbortController.signal);
                 summary = result.summary;
                 firstKeptEntryId = result.firstKeptEntryId;
                 tokensBefore = result.tokensBefore;
@@ -1456,11 +1399,12 @@ export class AgentSession {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
             }
-            const apiKey = await this._modelRegistry.getApiKey(this.model);
-            if (!apiKey) {
+            const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
+            if (!authResult.ok || !authResult.apiKey) {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
             }
+            const { apiKey, headers } = authResult;
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
             if (!preparation) {
@@ -1499,7 +1443,7 @@ export class AgentSession {
             }
             else {
                 // Generate compaction result
-                const compactResult = await compact(preparation, this.model, apiKey, undefined, this._autoCompactionAbortController.signal);
+                const compactResult = await compact(preparation, this.model, apiKey, headers, undefined, this._autoCompactionAbortController.signal);
                 summary = compactResult.summary;
                 firstKeptEntryId = compactResult.firstKeptEntryId;
                 tokensBefore = compactResult.tokensBefore;
@@ -1588,8 +1532,8 @@ export class AgentSession {
         }
         if (this._extensionRunner) {
             this._applyExtensionBindings(this._extensionRunner);
-            await this._extensionRunner.emit({ type: "session_start" });
-            await this.extendResourcesFromExtensions("startup");
+            await this._extensionRunner.emit(this._sessionStartEvent);
+            await this.extendResourcesFromExtensions(this._sessionStartEvent.reason === "reload" ? "reload" : "startup");
         }
     }
     async extendResourcesFromExtensions(reason) {
@@ -1710,8 +1654,7 @@ export class AgentSession {
             refreshTools: () => this._refreshToolRegistry(),
             getCommands,
             setModel: async (model) => {
-                const key = await this.modelRegistry.getApiKey(model);
-                if (!key)
+                if (!this.modelRegistry.hasConfiguredAuth(model))
                     return false;
                 await this.setModel(model);
                 return true;
@@ -1873,7 +1816,7 @@ export class AgentSession {
             this._extensionShutdownHandler ||
             this._extensionErrorListener;
         if (this._extensionRunner && hasBindings) {
-            await this._extensionRunner.emit({ type: "session_start" });
+            await this._extensionRunner.emit({ type: "session_start", reason: "reload" });
             await this.extendResourcesFromExtensions("reload");
         }
     }
@@ -2014,15 +1957,10 @@ export class AgentSession {
         const prefix = this.settingsManager.getShellCommandPrefix();
         const resolvedCommand = prefix ? `${prefix}\n${command}` : command;
         try {
-            const result = options?.operations
-                ? await executeBashWithOperations(resolvedCommand, process.cwd(), options.operations, {
-                    onChunk,
-                    signal: this._bashAbortController.signal,
-                })
-                : await executeBashCommand(resolvedCommand, {
-                    onChunk,
-                    signal: this._bashAbortController.signal,
-                });
+            const result = await executeBashWithOperations(resolvedCommand, this.sessionManager.getCwd(), options?.operations ?? createLocalBashOperations(), {
+                onChunk,
+                signal: this._bashAbortController.signal,
+            });
             this.recordBashResult(command, result, options);
             return result;
         }
@@ -2090,130 +2028,12 @@ export class AgentSession {
     // =========================================================================
     // Session Management
     // =========================================================================
-    /**
-     * Switch to a different session file.
-     * Aborts current operation, loads messages, restores model/thinking.
-     * Listeners are preserved and will continue receiving events.
-     * @returns true if switch completed, false if cancelled by extension
-     */
-    async switchSession(sessionPath) {
-        const previousSessionFile = this.sessionManager.getSessionFile();
-        // Emit session_before_switch event (can be cancelled)
-        if (this._extensionRunner?.hasHandlers("session_before_switch")) {
-            const result = (await this._extensionRunner.emit({
-                type: "session_before_switch",
-                reason: "resume",
-                targetSessionFile: sessionPath,
-            }));
-            if (result?.cancel) {
-                return false;
-            }
-        }
-        this._disconnectFromAgent();
-        await this.abort();
-        this._steeringMessages = [];
-        this._followUpMessages = [];
-        this._pendingNextTurnMessages = [];
-        // Set new session
-        this.sessionManager.setSessionFile(sessionPath);
-        this.agent.sessionId = this.sessionManager.getSessionId();
-        // Reload messages
-        const sessionContext = this.sessionManager.buildSessionContext();
-        // Emit session_switch event to extensions
-        if (this._extensionRunner) {
-            await this._extensionRunner.emit({
-                type: "session_switch",
-                reason: "resume",
-                previousSessionFile,
-            });
-        }
-        // Emit session event to custom tools
-        this.agent.replaceMessages(sessionContext.messages);
-        // Restore model if saved
-        if (sessionContext.model) {
-            const previousModel = this.model;
-            const availableModels = await this._modelRegistry.getAvailable();
-            const match = availableModels.find((m) => m.provider === sessionContext.model.provider && m.id === sessionContext.model.modelId);
-            if (match) {
-                this.agent.setModel(match);
-                await this._emitModelSelect(match, previousModel, "restore");
-            }
-        }
-        const hasThinkingEntry = this.sessionManager.getBranch().some((entry) => entry.type === "thinking_level_change");
-        const defaultThinkingLevel = this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
-        if (hasThinkingEntry) {
-            // Restore thinking level if saved (setThinkingLevel clamps to model capabilities)
-            this.setThinkingLevel(sessionContext.thinkingLevel);
-        }
-        else {
-            const availableLevels = this.getAvailableThinkingLevels();
-            const effectiveLevel = availableLevels.includes(defaultThinkingLevel)
-                ? defaultThinkingLevel
-                : this._clampThinkingLevel(defaultThinkingLevel, availableLevels);
-            this.agent.setThinkingLevel(effectiveLevel);
-            this.sessionManager.appendThinkingLevelChange(effectiveLevel);
-        }
-        this._reconnectToAgent();
-        return true;
-    }
     /**
      * Set a display name for the current session.
      */
     setSessionName(name) {
         this.sessionManager.appendSessionInfo(name);
     }
-    /**
-     * Create a fork from a specific entry.
-     * Emits before_fork/fork session events to extensions.
-     *
-     * @param entryId ID of the entry to fork from
-     * @returns Object with:
-     *   - selectedText: The text of the selected user message (for editor pre-fill)
-     *   - cancelled: True if an extension cancelled the fork
-     */
-    async fork(entryId) {
-        const previousSessionFile = this.sessionFile;
-        const selectedEntry = this.sessionManager.getEntry(entryId);
-        if (!selectedEntry || selectedEntry.type !== "message" || selectedEntry.message.role !== "user") {
-            throw new Error("Invalid entry ID for forking");
-        }
-        const selectedText = this._extractUserMessageText(selectedEntry.message.content);
-        let skipConversationRestore = false;
-        // Emit session_before_fork event (can be cancelled)
-        if (this._extensionRunner?.hasHandlers("session_before_fork")) {
-            const result = (await this._extensionRunner.emit({
-                type: "session_before_fork",
-                entryId,
-            }));
-            if (result?.cancel) {
-                return { selectedText, cancelled: true };
-            }
-            skipConversationRestore = result?.skipConversationRestore ?? false;
-        }
-        // Clear pending messages (bound to old session state)
-        this._pendingNextTurnMessages = [];
-        if (!selectedEntry.parentId) {
-            this.sessionManager.newSession({ parentSession: previousSessionFile });
-        }
-        else {
-            this.sessionManager.createBranchedSession(selectedEntry.parentId);
-        }
-        this.agent.sessionId = this.sessionManager.getSessionId();
-        // Reload messages from entries (works for both file and in-memory mode)
-        const sessionContext = this.sessionManager.buildSessionContext();
-        // Emit session_fork event to extensions (after fork completes)
-        if (this._extensionRunner) {
-            await this._extensionRunner.emit({
-                type: "session_fork",
-                previousSessionFile,
-            });
-        }
-        // Emit session event to custom tools (with reason "fork")
-        if (!skipConversationRestore) {
-            this.agent.replaceMessages(sessionContext.messages);
-        }
-        return { selectedText, cancelled: false };
-    }
     // =========================================================================
     // Tree Navigation
     // =========================================================================
@@ -2292,14 +2112,12 @@ export class AgentSession {
         let summaryDetails;
         if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
             const model = this.model;
-            const apiKey = await this._modelRegistry.getApiKey(model);
-            if (!apiKey) {
-                throw new Error(`No API key for ${model.provider}`);
-            }
+            const { apiKey, headers } = await this._getRequiredRequestAuth(model);
             const branchSummarySettings = this.settingsManager.getBranchSummarySettings();
             const result = await generateBranchSummary(entriesToSummarize, {
                 model,
                 apiKey,
+                headers,
                 signal: this._branchSummaryAbortController.signal,
                 customInstructions,
                 replaceInstructions,
@@ -2511,6 +2329,7 @@ export class AgentSession {
         const toolRenderer = createToolHtmlRenderer({
             getToolDefinition: (name) => this.getToolDefinition(name),
             theme,
+            cwd: this.sessionManager.getCwd(),
         });
         return await exportSessionToHtml(this.sessionManager, this.state, {
             outputPath,
@@ -2549,29 +2368,6 @@ export class AgentSession {
         writeFileSync(filePath, `${lines.join("\n")}\n`);
         return filePath;
     }
-    /**
-     * Import a JSONL session file.
-     * Copies the file into the session directory and switches to it (like /resume).
-     * @param inputPath Path to the JSONL file to import.
-     * @returns true if the session was switched successfully.
-     */
-    async importFromJsonl(inputPath) {
-        const resolved = resolve(inputPath);
-        if (!existsSync(resolved)) {
-            throw new Error(`File not found: ${resolved}`);
-        }
-        // Copy into the session directory so we don't modify the original
-        const sessionDir = this.sessionManager.getSessionDir();
-        if (!existsSync(sessionDir)) {
-            mkdirSync(sessionDir, { recursive: true });
-        }
-        const destPath = join(sessionDir, basename(resolved));
-        // Avoid overwriting if source and destination are the same file
-        if (resolve(destPath) !== resolved) {
-            copyFileSync(resolved, destPath);
-        }
-        return this.switchSession(destPath);
-    }
     // =========================================================================
     // Utilities
     // =========================================================================