@leanandmean/coding-agent 0.74.1-scramjet.42 → 0.74.1-scramjet.43

package/dist/core/agent-session.js

@@ -129,6 +129,9 @@ export class AgentSession {
     // can apply per-section cache control.
     _baseSystemPromptSections = [];
     _baseSystemPromptOptions;
+    // SCRAMJET-DIVERGENCE: active-tool prompt rebuilds preserve the current top-level run's
+    // before_agent_start composition while new prompts and reloads establish a fresh composition (#524).
+    _runPromptComposition = { kind: "generated-base" };
     constructor(config) {
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
@@ -185,8 +188,8 @@ export class AgentSession {
         throw new Error(formatNoApiKeyFoundMessage(model.provider));
     }
     // SCRAMJET-DIVERGENCE: _drainAgentEventQueue ensures all queued async extension event
-    // processing has settled before proceeding. Used by beforeToolBatch (pre-extraction drain)
-    // and beforeToolCall (per-tool drain).
+    // processing has settled before proceeding. Used by beforeToolBatch (pre-extraction drain),
+    // beforeToolCall (per-tool drain), and the awaited turn_end listener barrier.
     async _drainAgentEventQueue() {
         await this._agentEventQueue;
     }
@@ -279,6 +282,10 @@ export class AgentSession {
         this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEventTracked(event), () => this._processAgentEventTracked(event));
         // Keep queue alive if an event handler fails
         this._agentEventQueue.catch(() => { });
+        // SCRAMJET-DIVERGENCE: turn_end tool/prompt changes must settle before Agent snapshots
+        // live state for the next provider request (#524).
+        if (event.type === "turn_end")
+            return this._agentEventQueue;
     };
     // SCRAMJET-DIVERGENCE: Capture provider events synchronously and reset stale throughput lifecycles (#476).
     _captureOutputThroughput(event) {
@@ -952,6 +959,19 @@ export class AgentSession {
         }
         return Array.from(unique);
     }
+    _applyRunPromptComposition() {
+        switch (this._runPromptComposition.kind) {
+            case "generated-base":
+                this.agent.state.systemPrompt = this._baseSystemPromptSections.slice();
+                break;
+            case "contributed-sections":
+                this.agent.state.systemPrompt = spliceContributedSections(this._baseSystemPromptSections, this._runPromptComposition.sections);
+                break;
+            case "authoritative-string":
+                this.agent.state.systemPrompt = this._runPromptComposition.systemPrompt;
+                break;
+        }
+    }
     /** Rebuild `_baseSystemPromptSections` from the current resources and tool set and apply it to agent state. */
     _rebuildSystemPrompt(toolNames) {
         const validToolNames = toolNames.filter((name) => this._toolRegistry.has(name));
@@ -985,7 +1005,7 @@ export class AgentSession {
             sessionFile: this.sessionManager.getSessionFile(),
         };
         this._baseSystemPromptSections = buildSystemPromptSections(this._baseSystemPromptOptions);
-        this.agent.state.systemPrompt = this._baseSystemPromptSections.slice();
+        this._applyRunPromptComposition();
     }
     // =========================================================================
     // Prompting
@@ -1095,6 +1115,7 @@ export class AgentSession {
                 messages.push(msg);
             }
             this._pendingNextTurnMessages = [];
+            this._runPromptComposition = { kind: "generated-base" };
             // Emit before_agent_start extension event
             const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, currentImages, this._baseSystemPromptSections, this._baseSystemPromptOptions);
             // Add all custom messages from extensions
@@ -1114,15 +1135,18 @@ export class AgentSession {
             // replacement is authoritative (even an empty string): it wins for the
             // whole prompt and any contributed sections are dropped for this turn.
             if (result?.systemPrompt !== undefined) {
-                this.agent.state.systemPrompt = result.systemPrompt;
+                this._runPromptComposition = {
+                    kind: "authoritative-string",
+                    systemPrompt: result.systemPrompt,
+                };
             }
             else if (result?.systemPromptSections) {
-                this.agent.state.systemPrompt = spliceContributedSections(this._baseSystemPromptSections, result.systemPromptSections);
-            }
-            else {
-                // Ensure we're using the base prompt (in case previous turn had modifications)
-                this.agent.state.systemPrompt = this._baseSystemPromptSections.slice();
+                this._runPromptComposition = {
+                    kind: "contributed-sections",
+                    sections: result.systemPromptSections.map((section) => ({ ...section })),
+                };
             }
+            this._applyRunPromptComposition();
         }
         catch (error) {
             preflightResult?.(false);
@@ -2268,6 +2292,7 @@ export class AgentSession {
         await this._resourceLoader.reload();
         await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" });
         resetApiProviders();
+        this._runPromptComposition = { kind: "generated-base" };
         this._buildRuntime({
             activeToolNames: this.getActiveToolNames(),
             flagValues: previousFlagValues,