@dreb/coding-agent 2.59.2 → 2.60.1

package/dist/core/agent-session.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";
@@ -1217,6 +1217,17 @@ export class AgentSession {
     _getFilteredSkills() {
         return this.getFilteredSkills();
     }
+    _resolveModelPromptSettings(model) {
+        if (!model)
+            return undefined;
+        const modelRef = `${model.provider}/${model.id}`;
+        const modelsJsonSettings = this._modelRegistry.getModelPromptSettings(model.provider, model.id);
+        const settingsJsonSettings = this.settingsManager.getModelPromptSettings(model.provider, model.id);
+        if (modelsJsonSettings && settingsJsonSettings) {
+            throw new Error(`System prompt behavior for ${modelRef} is configured in both models.json and settings.json; remove one source`);
+        }
+        return modelsJsonSettings ?? settingsJsonSettings;
+    }
     _rebuildSystemPrompt(toolNames) {
         const validToolNames = toolNames.filter((name) => this._toolRegistry.has(name));
         const toolSnippets = {};
@@ -1233,7 +1244,13 @@ 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._resolveModelPromptSettings(this.model);
+        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 +1259,7 @@ export class AgentSession {
             skills: loadedSkills,
             contextFiles: loadedContextFiles,
             memoryIndexes,
-            customPrompt: loaderSystemPrompt,
+            customPrompt,
             appendSystemPrompt,
             selectedTools: validToolNames,
             toolSnippets,
@@ -1723,6 +1740,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 +1762,10 @@ export class AgentSession {
     _refreshThinkingDisplay(model) {
         this.agent.thinkingDisplay = resolveThinkingDisplay(model, this.settingsManager.getModelThinkingDisplay(model.id));
     }
+    /** Reject malformed or conflicting target-model prompt settings before mutating session state. */
+    _validateModelPromptSettings(model) {
+        this._resolveModelPromptSettings(model);
+    }
     /**
      * Cycle to next/previous model.
      * Uses scoped models (from --models flag) if available, otherwise all available models.
@@ -1786,6 +1808,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 +1840,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);
@@ -2705,9 +2729,19 @@ export class AgentSession {
         });
     }
     async reload() {
+        // Refresh and validate prompt configuration before tearing down the active runtime.
+        // A bad external edit must leave the current prompt and extension runtime usable.
+        this.settingsManager.reload();
+        this._modelRegistry.refresh();
+        const modelRegistryError = this._modelRegistry.getError();
+        if (modelRegistryError) {
+            throw new Error(modelRegistryError);
+        }
+        if (this.model) {
+            this._validateModelPromptSettings(this.model);
+        }
         const previousFlagValues = this._extensionRunner?.getFlagValues();
         await this._extensionRunner?.emit({ type: "session_shutdown" });
-        this.settingsManager.reload();
         resetApiProviders();
         await this._resourceLoader.reload();
         this._buildRuntime({
@@ -2959,6 +2993,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 +3025,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 +3050,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;
     }