@dreb/coding-agent 2.59.1 → 2.60.0

package/dist/core/agent-session.js

@@ -20,7 +20,7 @@ import { getDocsPath } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { sleep } from "../utils/sleep.js";
 import { executeBash as executeBashCommand, executeBashWithOperations } from "./bash-executor.js";
-import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
+import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { DispatchArbiter } from "./dispatch-arbiter.js";
 import { exportSessionToHtml } from "./export-html/index.js";
@@ -36,7 +36,7 @@ import { PerformanceTracker } from "./performance-tracker.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { scrubSecrets } from "./secret-scrubber.js";
 import { isSensitivePath } from "./sensitive-paths.js";
-import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
+import { CURRENT_SESSION_VERSION, getLatestCompactionEntry, SessionManager, } from "./session-manager.js";
 import { DEFAULT_BG_PARENT_TURN_LIMIT, DEFAULT_MAX_CONCURRENT_SUBAGENTS, } from "./settings-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
@@ -1233,7 +1233,15 @@ export class AgentSession {
         }
         const loaderSystemPrompt = this._resourceLoader.getSystemPrompt();
         const loaderAppendSystemPrompt = this._resourceLoader.getAppendSystemPrompt();
-        const appendSystemPrompt = loaderAppendSystemPrompt.length > 0 ? loaderAppendSystemPrompt.join("\n\n") : undefined;
+        const modelPromptSettings = this.model
+            ? this.settingsManager.getModelPromptSettings(this.model.provider, this.model.id)
+            : undefined;
+        const customPrompt = loaderSystemPrompt ?? modelPromptSettings?.systemPrompt;
+        const appendPromptParts = [...loaderAppendSystemPrompt];
+        if (modelPromptSettings?.appendSystemPrompt) {
+            appendPromptParts.push(modelPromptSettings.appendSystemPrompt);
+        }
+        const appendSystemPrompt = appendPromptParts.length > 0 ? appendPromptParts.join("\n\n") : undefined;
         const loadedSkills = this._getFilteredSkills();
         const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
         const memoryIndexes = this._resourceLoader.getMemoryIndexes();
@@ -1242,7 +1250,7 @@ export class AgentSession {
             skills: loadedSkills,
             contextFiles: loadedContextFiles,
             memoryIndexes,
-            customPrompt: loaderSystemPrompt,
+            customPrompt,
             appendSystemPrompt,
             selectedTools: validToolNames,
             toolSnippets,
@@ -1723,6 +1731,7 @@ export class AgentSession {
         if (!apiKey) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
+        this._validateModelPromptSettings(model);
         const previousModel = this.model;
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
         this.agent.setModel(this._applyContextTier(model));
@@ -1744,6 +1753,10 @@ export class AgentSession {
     _refreshThinkingDisplay(model) {
         this.agent.thinkingDisplay = resolveThinkingDisplay(model, this.settingsManager.getModelThinkingDisplay(model.id));
     }
+    /** Reject malformed target-model prompt settings before a model switch mutates session state. */
+    _validateModelPromptSettings(model) {
+        this.settingsManager.getModelPromptSettings(model.provider, model.id);
+    }
     /**
      * Cycle to next/previous model.
      * Uses scoped models (from --models flag) if available, otherwise all available models.
@@ -1786,6 +1799,7 @@ export class AgentSession {
         const len = scopedModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const next = scopedModels[nextIndex];
+        this._validateModelPromptSettings(next.model);
         const thinkingLevel = this._getThinkingLevelForModelSwitch(next.thinkingLevel);
         // Apply model
         this.agent.setModel(this._applyContextTier(next.model));
@@ -1817,6 +1831,7 @@ export class AgentSession {
         if (!apiKey) {
             throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
         }
+        this._validateModelPromptSettings(nextModel);
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
         this.agent.setModel(this._applyContextTier(nextModel));
         this._refreshThinkingDisplay(nextModel);
@@ -2959,6 +2974,17 @@ export class AgentSession {
                 return false;
             }
         }
+        // Resolve and validate the target model before disconnecting or mutating the active session.
+        // Prompt validation can throw for malformed settings, so it belongs in this preflight phase.
+        const targetModel = SessionManager.open(sessionPath).buildSessionContext().model;
+        let restoredModel;
+        if (targetModel) {
+            const availableModels = await this._modelRegistry.getAvailable();
+            restoredModel = availableModels.find((m) => m.provider === targetModel.provider && m.id === targetModel.modelId);
+            if (restoredModel) {
+                this._validateModelPromptSettings(restoredModel);
+            }
+        }
         this._disconnectFromAgent();
         await this.abort();
         this._steeringMessages = [];
@@ -2980,16 +3006,12 @@ export class AgentSession {
         }
         // Emit session event to custom tools
         this.agent.replaceMessages(sessionContext.messages);
-        // Restore model if saved
-        if (sessionContext.model) {
+        // Restore the preflighted model if the target session saved one that is still available.
+        if (restoredModel) {
             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(this._applyContextTier(match));
-                this._refreshThinkingDisplay(match);
-                await this._emitModelSelect(match, previousModel, "restore");
-            }
+            this.agent.setModel(this._applyContextTier(restoredModel));
+            this._refreshThinkingDisplay(restoredModel);
+            await this._emitModelSelect(restoredModel, previousModel, "restore");
         }
         const hasThinkingEntry = this.sessionManager.getBranch().some((entry) => entry.type === "thinking_level_change");
         const defaultThinkingLevel = this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
@@ -3009,6 +3031,7 @@ export class AgentSession {
         this._gitRepoState = getGitRepoState(this._cwd) ?? undefined;
         this._resourceLoader.refreshDreamLastRun();
         this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
+        this.agent.setSystemPrompt(this._baseSystemPrompt);
         this._reconnectToAgent();
         return true;
     }
@@ -3346,11 +3369,12 @@ export class AgentSession {
             return undefined;
         // After compaction, the last assistant usage reflects pre-compaction context size.
         // We can only trust usage from an assistant that responded after the latest compaction.
-        // If no such assistant exists, context token count is unknown until the next LLM response.
+        // Until then, estimate every rebuilt message independently so the stale kept
+        // assistant usage cannot leak into the current context value.
         const branchEntries = this.sessionManager.getBranch();
         const latestCompaction = getLatestCompactionEntry(branchEntries);
         if (latestCompaction) {
-            // Check if there's a valid assistant usage after the compaction boundary
+            // Check if there's a valid assistant usage after the compaction boundary.
             const compactionIndex = branchEntries.lastIndexOf(latestCompaction);
             let hasPostCompactionUsage = false;
             for (let i = branchEntries.length - 1; i > compactionIndex; i--) {
@@ -3359,23 +3383,22 @@ export class AgentSession {
                     const assistant = entry.message;
                     if (assistant.stopReason !== "aborted" && assistant.stopReason !== "error") {
                         const contextTokens = calculateContextTokens(assistant.usage);
-                        if (contextTokens > 0) {
+                        if (contextTokens > 0)
                             hasPostCompactionUsage = true;
-                        }
                         break;
                     }
                 }
             }
             if (!hasPostCompactionUsage) {
-                return { tokens: null, contextWindow, percent: null };
+                const tokens = this.messages.reduce((total, message) => total + estimateTokens(message), 0);
+                return { tokens, contextWindow, percent: (tokens / contextWindow) * 100 };
             }
         }
         const estimate = estimateContextTokens(this.messages);
-        const percent = (estimate.tokens / contextWindow) * 100;
         return {
             tokens: estimate.tokens,
             contextWindow,
-            percent,
+            percent: (estimate.tokens / contextWindow) * 100,
         };
     }
     /**