@dreb/coding-agent 2.60.0 → 2.60.1

package/dist/core/agent-session.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,9 +1244,7 @@ export class AgentSession {
         }
         const loaderSystemPrompt = this._resourceLoader.getSystemPrompt();
         const loaderAppendSystemPrompt = this._resourceLoader.getAppendSystemPrompt();
-        const modelPromptSettings = this.model
-            ? this.settingsManager.getModelPromptSettings(this.model.provider, this.model.id)
-            : undefined;
+        const modelPromptSettings = this._resolveModelPromptSettings(this.model);
         const customPrompt = loaderSystemPrompt ?? modelPromptSettings?.systemPrompt;
         const appendPromptParts = [...loaderAppendSystemPrompt];
         if (modelPromptSettings?.appendSystemPrompt) {
@@ -1753,9 +1762,9 @@ 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. */
+    /** Reject malformed or conflicting target-model prompt settings before mutating session state. */
     _validateModelPromptSettings(model) {
-        this.settingsManager.getModelPromptSettings(model.provider, model.id);
+        this._resolveModelPromptSettings(model);
     }
     /**
      * Cycle to next/previous model.
@@ -2720,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({