@dreb/coding-agent 2.66.0 → 2.66.2

package/dist/core/agent-session.js

@@ -15,7 +15,7 @@
 import { copyFileSync, existsSync, mkdirSync, realpathSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
-import { isContextOverflow, modelsAreEqual, resetApiProviders, supportsMax, supportsXhigh } from "@dreb/ai";
+import { isContextOverflow, isOutputLimitExhaustion, modelsAreEqual, resetApiProviders, supportsMax, supportsXhigh, } from "@dreb/ai";
 import { getDocsPath } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
 import { sleep } from "../utils/sleep.js";
@@ -1036,8 +1036,7 @@ export class AgentSession {
                 type: "length_retry",
                 attempt: event.attempt,
                 maxAttempts: event.maxAttempts,
-                previousMaxTokens: event.previousMaxTokens,
-                nextMaxTokens: event.nextMaxTokens,
+                maxTokens: event.maxTokens,
                 discardedPartial: event.discardedPartial,
             };
             await this._extensionRunner.emit(extensionEvent);
@@ -1135,6 +1134,10 @@ export class AgentSession {
     get state() {
         return this.agent.state;
     }
+    /** Effective runtime working directory used by tools, resources, and project discovery. */
+    get cwd() {
+        return this._cwd;
+    }
     /** Current session task list (read-only) */
     get tasks() {
         return this._tasks;
@@ -1760,7 +1763,7 @@ export class AgentSession {
         await this.abort();
         this.agent.reset();
         this._dispatchArbiter.clearContext();
-        this.sessionManager.newSession({ parentSession: options?.parentSession });
+        this.sessionManager.newSession({ parentSession: options?.parentSession, cwd: this.cwd });
         this.agent.sessionId = this.sessionManager.getSessionId();
         this._steeringMessages = [];
         this._followUpMessages = [];
@@ -2209,8 +2212,14 @@ export class AgentSession {
         if (assistantIsFromBeforeCompaction) {
             return;
         }
-        // Case 1: Overflow - LLM returned context overflow error
-        if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
+        // Case 1: Overflow - LLM returned a context error, or exhausted its
+        // configured output limit when that output could not fit beside the request.
+        const estimatedInputTokens = estimateContextTokens(this.agent.state.messages.slice(0, -1)).tokens;
+        if (sameModel &&
+            isContextOverflow(assistantMessage, contextWindow, {
+                maxOutputTokens: this.model?.maxTokens,
+                estimatedInputTokens,
+            })) {
             // K3 auto context tier: an overflow in the 256k tier upgrades to the
             // 1M tier instead of compacting — the Kimi backend grows the prompt
             // cache seamlessly. This runs even when compaction is disabled since
@@ -2247,6 +2256,10 @@ export class AgentSession {
             await this._trackAutoCompaction("overflow", true, requestWillFollow);
             return;
         }
+        // A genuine output-limit exhaustion cannot be fixed by discarding conversation
+        // history. Only the context-constrained case above enters compact-and-retry.
+        if (isOutputLimitExhaustion(assistantMessage))
+            return;
         // Case 2: Threshold - context is getting large
         // For error messages (no usage data), estimate from last successful response.
         // This ensures sessions that hit persistent API errors (e.g. 529) can still compact.
@@ -3260,7 +3273,7 @@ export class AgentSession {
                 throw new Error("Cannot fork at this assistant turn: it was interrupted or is still waiting on tool results");
             }
             const { cancelled } = await this._performFork(entryId, () => {
-                this.sessionManager.createBranchedSession(entryId);
+                this.sessionManager.createBranchedSession(entryId, this.cwd);
             });
             return { selectedText: "", cancelled };
         }
@@ -3270,10 +3283,10 @@ export class AgentSession {
         // offered as editor pre-fill.
         const { cancelled } = await this._performFork(entryId, (previousSessionFile) => {
             if (!selectedEntry.parentId) {
-                this.sessionManager.newSession({ parentSession: previousSessionFile });
+                this.sessionManager.newSession({ parentSession: previousSessionFile, cwd: this.cwd });
             }
             else {
-                this.sessionManager.createBranchedSession(selectedEntry.parentId);
+                this.sessionManager.createBranchedSession(selectedEntry.parentId, this.cwd);
             }
         });
         return { selectedText, cancelled };