@nexrall/code-core 1.4.3 → 1.4.4

package/dist/agent/loop.d.ts

@@ -1,4 +1,4 @@
-import type { Message, AgentLoopOptions } from '../types';
+import type { Message, AgentLoopOptions, EnvContext } from '../types';
 export declare function resolveMaxIterations(optionValue: number | undefined, settingsRaw: Record<string, unknown>): number;
 /** Approximate serialised request-body size (bytes) for the messages array. */
 export declare function estimateBodyBytes(messages: Message[]): number;
@@ -73,5 +73,24 @@ export declare function ledgerSummary(ledger: ProgressLedger): string;
  * Returns the number of bytes reclaimed (0 if nothing was prunable).
  */
 export declare function pruneOldToolResults(messages: Message[]): number;
+/** Rough token estimate for a resumed transcript — no API round-trip needed. */
+export declare function estimateTokensRough(messages: Message[]): number;
+/**
+ * Proactively compact `messages` in place if resuming this session would blow
+ * past the auto-compact threshold on the very first turn. Returns true if any
+ * compaction happened (so the caller can surface a one-line notice to the
+ * user). Safe to call on any message array, including empty/small ones (no-op).
+ *
+ * `model` picks the right context window (mirrors runAgentLoop's own lookup);
+ * `onNotice` is optional — pass it to show the same "auto-compacted" message
+ * the in-loop path shows, so the behaviour is visually consistent.
+ */
+export declare function compactMessagesForResume(messages: Message[], opts: {
+    model?: 'turbo' | 'pro' | 'ultra';
+    workDir: string;
+    clientType?: string;
+    env?: EnvContext;
+    onNotice?: (text: string) => void;
+}): Promise<boolean>;
 export declare function runAgentLoop(initialMessages: Message[], options: AgentLoopOptions): Promise<Message[]>;
 //# sourceMappingURL=loop.d.ts.map

package/dist/agent/loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAMP,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAsKlB,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM,CAWR;AA8RD,+EAA+E;AAC/E,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAM7D;AAsBD,iFAAiF;AACjF,eAAO,MAAM,gBAAgB,aAA+G,CAAC;AAC7I,gGAAgG;AAChG,eAAO,MAAM,aAAa,QAA2J,CAAC;AAEtL;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAK5E;AAUD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAwBxD;AAoBD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,aAAa,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,qFAAqF;IACrF,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvD;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,YAAY,IAAI,cAAc,CAE7C;AAED,kFAAkF;AAClF,wBAAgB,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,EAAE,EAAE,OAAO,EACX,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAoDN;AAED,kFAAkF;AAClF,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CA6B5D;AAmBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAmB/D;AA2FD,wBAAsB,YAAY,CAChC,eAAe,EAAE,OAAO,EAAE,EAC1B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,OAAO,EAAE,CAAC,CA2kBpB"}
+{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../../src/agent/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAMP,gBAAgB,EAChB,UAAU,EACX,MAAM,UAAU,CAAC;AAsKlB,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,MAAM,CAWR;AA8RD,+EAA+E;AAC/E,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAM7D;AAsBD,iFAAiF;AACjF,eAAO,MAAM,gBAAgB,aAA+G,CAAC;AAC7I,gGAAgG;AAChG,eAAO,MAAM,aAAa,QAA2J,CAAC;AAEtL;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAK5E;AAUD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAwBxD;AAoBD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,aAAa,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAClE,qFAAqF;IACrF,aAAa,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvD;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,YAAY,IAAI,cAAc,CAE7C;AAED,kFAAkF;AAClF,wBAAgB,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC1C,EAAE,EAAE,OAAO,EACX,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAoDN;AAED,kFAAkF;AAClF,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CA6B5D;AAmBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAmB/D;AA+GD,gFAAgF;AAChF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAE/D;AAED;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,OAAO,EAAE,EACnB,IAAI,EAAE;IACJ,KAAK,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,OAAO,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,GACA,OAAO,CAAC,OAAO,CAAC,CA2DlB;AAID,wBAAsB,YAAY,CAChC,eAAe,EAAE,OAAO,EAAE,EAC1B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,OAAO,EAAE,CAAC,CA+kBpB"}

package/dist/agent/loop.js

@@ -42,6 +42,8 @@ exports.createLedger = createLedger;
 exports.ledgerRecord = ledgerRecord;
 exports.ledgerSummary = ledgerSummary;
 exports.pruneOldToolResults = pruneOldToolResults;
+exports.estimateTokensRough = estimateTokensRough;
+exports.compactMessagesForResume = compactMessagesForResume;
 exports.runAgentLoop = runAgentLoop;
 const client_1 = require("../api/client");
 const executor_1 = require("../tools/executor");
@@ -772,6 +774,95 @@ async function autoCompactMessages(messages, options, ledger) {
     void kept;
     return true;
 }
+// ─── Resume-time proactive compaction ─────────────────────────────────────────
+//
+// The in-loop auto-compact above only reacts to `lastPromptTokens`, which is
+// populated from the PREVIOUS turn's usage event. On a freshly-resumed session
+// (opening an old chat from history and sending the first new message) there is
+// no previous turn in this process — `lastPromptTokens` starts at 0 — so the
+// token-pressure trigger never fires for turn 0, and the byte-pressure trigger
+// only catches truly huge sessions (MAX_BODY_BYTES is sized to stay under the
+// backend's 25 MB body limit, not to bound cost — 8 MB of tool-heavy JSON is
+// already on the order of the 1M-token context window itself). The result: a
+// resumed session comfortably under both guards, but still hundreds of
+// thousands of tokens, gets sent to the model at FULL PRICE on the very first
+// message after resume, silently, every time.
+//
+// This function closes that gap: call it once, right after loading a stored
+// session and BEFORE the user's next message is sent, so the expensive
+// resend is compacted proactively instead of being missed by both in-loop
+// guards. It reuses the exact same threshold/mechanics as the in-loop guard
+// (cheap prune first, then summarising compaction) so behaviour stays
+// consistent whether compaction happens at resume-time or mid-run.
+const RESUME_CHARS_PER_TOKEN = 4; // rough, conservative estimate for JSON/code-heavy transcripts
+/** Rough token estimate for a resumed transcript — no API round-trip needed. */
+function estimateTokensRough(messages) {
+    return Math.ceil(estimateBodyBytes(messages) / RESUME_CHARS_PER_TOKEN);
+}
+/**
+ * Proactively compact `messages` in place if resuming this session would blow
+ * past the auto-compact threshold on the very first turn. Returns true if any
+ * compaction happened (so the caller can surface a one-line notice to the
+ * user). Safe to call on any message array, including empty/small ones (no-op).
+ *
+ * `model` picks the right context window (mirrors runAgentLoop's own lookup);
+ * `onNotice` is optional — pass it to show the same "auto-compacted" message
+ * the in-loop path shows, so the behaviour is visually consistent.
+ */
+async function compactMessagesForResume(messages, opts) {
+    if (messages.length <= COMPACT_KEEP_MIN + 2)
+        return false;
+    const settings = (0, rules_1.loadSettings)(opts.workDir);
+    if (!resolveAutoCompact(undefined, settings.raw))
+        return false;
+    const contextWindow = MODEL_CONTEXT_TOKENS[opts.model ?? 'turbo'] ?? 1000000;
+    let bodyBytes = estimateBodyBytes(messages);
+    let tokenGuess = estimateTokensRough(messages);
+    const overThreshold = () => tokenGuess > contextWindow * AUTO_COMPACT_THRESHOLD || bodyBytes > MAX_BODY_BYTES;
+    if (!overThreshold())
+        return false;
+    let compacted = false;
+    // Cheap pass first — shrinks old tool_result blocks with no model call.
+    if (messages.length > PRUNE_KEEP_RECENT + 2) {
+        const reclaimed = pruneOldToolResults(messages);
+        if (reclaimed > 0) {
+            bodyBytes = estimateBodyBytes(messages);
+            tokenGuess = estimateTokensRough(messages);
+            compacted = true;
+            opts.onNotice?.(`\n\u267b\ufe0f Trimmed ~${(reclaimed / (1024 * 1024)).toFixed(1)}MB of older tool output before resuming this chat.\n`);
+        }
+    }
+    // If still over threshold, fall through to summarising compaction — same
+    // mechanism the in-loop guard uses, so this can safely loop (a single
+    // summarisation pass may still leave a very long session over threshold).
+    let guard = 0;
+    while (overThreshold() && messages.length > COMPACT_KEEP_MIN + 2 && guard < 5) {
+        guard += 1;
+        // No ledger at resume time — the ledger is per-run, in-memory, and would
+        // have been created fresh anyway since this is a new process/run. The
+        // ORIGINAL TASK verbatim pin (inside autoCompactMessages) still applies.
+        const did = await autoCompactMessages(messages, {
+            workDir: opts.workDir,
+            model: opts.model,
+            clientType: opts.clientType,
+            env: opts.env,
+            onText: () => { },
+            onToolUse: () => { },
+            onToolResult: () => { },
+            onUsage: () => { },
+            requestPermission: async () => false,
+        });
+        if (!did)
+            break;
+        compacted = true;
+        bodyBytes = estimateBodyBytes(messages);
+        tokenGuess = estimateTokensRough(messages);
+    }
+    if (compacted) {
+        opts.onNotice?.(`\n\u267b\ufe0f Auto-compacted this chat's earlier history before resuming, to avoid resending it at full cost.\n`);
+    }
+    return compacted;
+}
 // ─── Agent Loop ───────────────────────────────────────────────────────────────
 async function runAgentLoop(initialMessages, options) {
     const messages = [...initialMessages];
@@ -970,7 +1061,11 @@ async function runAgentLoop(initialMessages, options) {
                 completedCleanly = true;
                 break;
             }
-            messages.push(assistantMessage);
+            // stopReason is transient, single-turn metadata for the truncated-tool-call guard
+            // below — it must never be replayed to the API as part of message history (Anthropic
+            // rejects unknown fields on a request message with a 400).
+            const { stopReason: _stopReason, ...historyMessage } = assistantMessage;
+            messages.push(historyMessage);
             // 3. Collect tool_use blocks from the completed message.
             //    Server-side tools (e.g. web_search_20260209) are executed by Anthropic and their
             //    tool_result blocks appear in the SAME assistant message.  We must skip those —

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrall/code-core",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Core agent loop, tools, and extension primitives for Nexrall Code — embed an AI coding agent in any Node.js application.",
   "license": "MIT",
   "author": "Nexrall <support@nexrall.com> (https://nexrall.com)",