@cubicecho/agent-core 4.4.0 → 4.5.0

package/README.md

@@ -815,9 +815,15 @@ once `used` (the last turn's prompt tokens, or the estimate) is past three quart
 The kept tail fills at most 35% of it and starts on a user message, since a transcript resuming
 mid-exchange is one servers refuse; leading system prompts are never folded, and an earlier
 summary is continued rather than summarised. `compactTranscript` writes the summary and tells
-`beforeCompact` hooks what is going while it does. Because the cut lands on
-a user message, one long tool run under a single question has nothing to fold — pruning is what
-keeps that one going.
+`beforeCompact` hooks what is going while it does.
+
+A run that is one question and a long tool loop has no user message to cut at, so there the plan
+cuts inside the loop instead: the question is kept whole (the plan's `question`), the calls and
+results after it are folded up to an assistant message, and the request becomes the summary, the
+question, then the rest of the loop — every tool result still after its call. A transcript with a
+user message to cut at is planned as before. `runAgentLoop({ compact: true })` folds such a run on
+its own; a host that numbers messages across steps passes `hooks.offset`, the stored index of the
+run's first message, so the ids `beforeCompact` is told match its own.
 
 ```ts
 beforeStep: async (messages, step) => {
@@ -950,8 +956,8 @@ leading `system` messages, and reads an earlier summary back out of a `SUMMARY_L
 them. A host whose system prompt is a separate argument and whose summary is a column has neither
 in the array, and knows both exactly. Given them, nothing is scanned.
 
-`applyCompaction(messages, fold)` is the way back — the summary as a `system` message, then
-everything from `through` — and it writes the same `SUMMARY_LEAD` `planCompaction` looks for, so
+`applyCompaction(messages, fold)` is the way back — the summary as a `system` message, then the
+fold's `question` if it was made inside one, then everything from `through` — and it writes the same `SUMMARY_LEAD` `planCompaction` looks for, so
 the next fold continues those notes rather than summarising them a second time. No fold yet hands
 back the messages themselves.
 

package/dist/context/compaction.d.ts

@@ -125,9 +125,17 @@ export interface CompactionOptions {
 export interface CompactionPlan {
     /** The first message folded away. Everything before it is a system prompt and stays. */
     from: number;
-    /** The first message kept whole, always a user message. */
+    /**
+     * The first message kept whole: a user message, or an assistant message on a fold made inside
+     * one question's tool loop (see `question`).
+     */
     cut: number;
-    /** The messages from `from` to `cut`, the ones the summary replaces. */
+    /**
+     * The user message kept whole between the summary and `cut`, on a fold made inside its tool
+     * loop. Absent on a fold that cuts at a user message.
+     */
+    question?: number;
+    /** The messages from `from` to `cut`, `question` left out: the ones the summary replaces. */
     toSummarise: Message[];
     /** The summary an earlier compaction left, which this one continues. */
     previous?: string;
@@ -155,6 +163,13 @@ export interface CompactionPlan {
  * than summarised as if it were conversation. No plan comes back when the window is not full
  * enough, or when the only legal cut folds too little to pay for the summary.
  *
+ * A transcript that is one question and a long tool loop has no user message to cut at, so where
+ * no user cut folds anything the plan cuts inside the last question's loop instead: the question
+ * is kept whole as `question`, the assistant and tool messages after it are folded up to an
+ * assistant message, and the tail resumes there — every tool result in it still follows its call.
+ * `applyCompaction` sends the question after the summary. A transcript with a user cut is planned
+ * exactly as it was.
+ *
  * Both of those are recovered by reading the transcript, which is what a host whose array holds
  * everything it sends has to do. A host that keeps its fold as a record beside an append-only
  * transcript — its system prompt a separate argument, no summary message in the array at all —
@@ -206,6 +221,11 @@ export interface CompactionRecord {
     summary: string;
     /** Index into the transcript the plan was made for: the first message still sent whole. */
     through: number;
+    /**
+     * The user message sent whole after the summary and ahead of `through`, on a fold made inside
+     * that question's tool loop. Absent on a fold that cut at a user message.
+     */
+    question?: number;
     /** ISO 8601, so the chat can show where history was folded and how stale the notes are. */
     at: string;
 }
@@ -213,7 +233,8 @@ export interface CompactionRecord {
 export interface CompactionRunOptions {
     /**
      * Hooks to tell. `context` is extended with `compacting` and `range`, whose indexes are the
-     * plan's — and so the host's own, for a plan made over a stored transcript. `honourVeto` waits
+     * plan's — and so the host's own, for a plan made over a stored transcript. `compacting` leaves
+     * out a `question` the fold keeps. `honourVeto` waits
      * for the hooks and lets one stop the compaction; without it they add no latency.
      */
     hooks?: {
@@ -221,6 +242,14 @@ export interface CompactionRunOptions {
         context: HookContext;
         onNote?: OnNote;
         honourVeto?: boolean;
+        /**
+         * What the transcript's first message is numbered as in the `compacting` uuids: the host's
+         * stored index of `messages[0]`, for a host that numbers messages across steps or requests.
+         * See `turnMessages`.
+         *
+         * @defaultValue `0`
+         */
+        offset?: number;
     };
     /**
      * The window is already exceeded — the caller caught a `ContextOverflow`, or is compacting to
@@ -256,7 +285,8 @@ export declare function runCompaction(messages: Message[], plan: CompactionPlan,
  * Absent, the leading `system` messages are found by scanning, and zero of them is the ordinary
  * case for a host whose system prompt is a separate argument.
  * @returns `messages` itself when there is no record or its summary is blank, otherwise a new
- * array: the kept head, one summary message, then everything from the record's `through` on.
+ * array: the kept head, one summary message, the record's `question` when it has one and the head
+ * does not already hold it, then everything from the record's `through` on.
  *
  * @remarks
  * The inverse of storing a `CompactionRecord`, and the shape `planCompaction` expects to meet
@@ -264,7 +294,7 @@ export declare function runCompaction(messages: Message[], plan: CompactionPlan,
  * continues these notes rather than summarising them a second time. Any earlier summary message in
  * the kept head is dropped, since the record's already contains it.
  */
-export declare function applyCompaction(messages: Message[], record?: Pick<CompactionRecord, 'summary' | 'through'>, { from }?: {
+export declare function applyCompaction(messages: Message[], record?: Pick<CompactionRecord, 'summary' | 'through' | 'question'>, { from }?: {
     from?: number;
 }): Message[];
 /**
@@ -278,7 +308,8 @@ export declare function applyCompaction(messages: Message[], record?: Pick<Compa
  * prompts, when the host keeps them in the array. Zero is the stored-fold case,
  * where the summary is the request's first message.
  * @returns The index in the request. One before the record's `through` gives `head`, where the
- * summary sits — an index among the kept head messages themselves included.
+ * summary sits — an index among the kept head messages themselves included — except the record's
+ * `question`, which is sent whole right after the summary.
  *
  * @remarks
  * A transcript that stays append-only and a request that does not are two numberings of the same
@@ -286,7 +317,7 @@ export declare function applyCompaction(messages: Message[], record?: Pick<Compa
  * hook — has to say which it is in. An index inside the folded stretch answers with the summary
  * message that now stands for it.
  */
-export declare const requestIndex: (index: number, record?: Pick<CompactionRecord, 'through'>, head?: number) => number;
+export declare const requestIndex: (index: number, record?: Pick<CompactionRecord, 'through' | 'question'>, head?: number) => number;
 /**
  * The transcript with the plan's stretch replaced by one system message holding its summary.
  *

package/dist/context/compaction.js

@@ -142,6 +142,56 @@ export function pruneToolResults(messages, { keepLast = 5, maxChars = 256 } = {}
  * @returns `index` where it lies from zero to `most`, otherwise the nearer of the two.
  */
 const clamp = (index, most) => Math.min(Math.max(index, 0), most);
+/**
+ * Where to cut, by `target` when there is one and by `keepRatio` otherwise, among the indexes
+ * `isCut` allows.
+ *
+ * @param messages - The transcript. Not written to.
+ * @param search - The weights, the bounds and which indexes are legal cuts. See `CutSearch`.
+ * @returns `cut`, the length of `messages` when no legal cut was found, and on a plan made to a
+ * `target` the cost it leaves as `after`.
+ */
+const findCut = (messages, { from, cost, limit, keepRatio, target, summaryTokens, estimate, isCut, kept }) => {
+    let cut = messages.length;
+    let after;
+    if (target !== undefined && target > 0) {
+        // Forward from the head, so the first cut that reaches the target is the one that folds least.
+        let folded = 0;
+        for (let at = from; at < messages.length; at++) {
+            if (isCut(at)) {
+                cut = at;
+                after = cost - folded + summaryTokens;
+                if (after <= limit * target) {
+                    break;
+                }
+            }
+            if (at !== kept) {
+                folded += estimate(messages[at]);
+            }
+        }
+        return { cut, after };
+    }
+    const budget = limit * keepRatio;
+    let tail = 0;
+    for (let at = messages.length - 1; at > from; at--) {
+        tail += estimate(messages[at]);
+        if (tail > budget) {
+            break;
+        }
+        cut = at;
+    }
+    while (cut < messages.length && isCut(cut) === false) {
+        cut++;
+    }
+    return { cut };
+};
+/**
+ * The index of the last user message in a transcript.
+ *
+ * @param messages - The transcript.
+ * @returns The index, or `-1` when there is none.
+ */
+const lastUser = (messages) => messages.findLastIndex((message) => message.role === Role.User);
 /**
  * Where to fold a transcript that has grown into its window, or `undefined` when it should not be.
  *
@@ -159,6 +209,13 @@ const clamp = (index, most) => Math.min(Math.max(index, 0), most);
  * than summarised as if it were conversation. No plan comes back when the window is not full
  * enough, or when the only legal cut folds too little to pay for the summary.
  *
+ * A transcript that is one question and a long tool loop has no user message to cut at, so where
+ * no user cut folds anything the plan cuts inside the last question's loop instead: the question
+ * is kept whole as `question`, the assistant and tool messages after it are folded up to an
+ * assistant message, and the tail resumes there — every tool result in it still follows its call.
+ * `applyCompaction` sends the question after the summary. A transcript with a user cut is planned
+ * exactly as it was.
+ *
  * Both of those are recovered by reading the transcript, which is what a host whose array holds
  * everything it sends has to do. A host that keeps its fold as a record beside an append-only
  * transcript — its system prompt a separate argument, no summary message in the array at all —
@@ -184,47 +241,53 @@ export function planCompaction(messages, { limit, used, compactAt = COMPACT_AT,
     const head = systemHead(messages);
     const from = clamp(givenFrom ?? head.from, messages.length);
     const previous = givenPrevious ?? head.previous;
-    let cut = messages.length;
-    let after;
-    if (target !== undefined && target > 0) {
-        // Forward from the head, so the first cut that reaches the target is the one that folds least.
-        let folded = 0;
-        for (let at = from; at < messages.length; at++) {
-            if (messages[at].role === Role.User) {
-                cut = at;
-                after = cost - folded + summaryTokens;
-                if (after <= limit * target) {
-                    break;
-                }
-            }
-            folded += estimate(messages[at]);
-        }
+    const search = { from, cost, limit, keepRatio, target, summaryTokens, estimate };
+    const atUser = findCut(messages, { ...search, isCut: (at) => messages[at].role === Role.User });
+    const foldsAtUser = atUser.cut < messages.length && atUser.cut - from >= FEWEST_FOLDED;
+    if (foldsAtUser) {
+        return planFor(messages, from, atUser.cut, previous, atUser.after);
     }
-    else {
-        const budget = limit * keepRatio;
-        let kept = 0;
-        for (let at = messages.length - 1; at > from; at--) {
-            kept += estimate(messages[at]);
-            if (kept > budget) {
-                break;
-            }
-            cut = at;
-        }
-        while (cut < messages.length && messages[cut].role !== Role.User) {
-            cut++;
-        }
+    // A cut that folds too little but already reaches the target means there is nothing to fold.
+    const reachesTarget = target !== undefined && atUser.after !== undefined && atUser.after <= limit * target;
+    if (reachesTarget) {
+        return undefined;
     }
-    if (cut >= messages.length || cut - from < FEWEST_FOLDED) {
+    // No user message to cut at: fold inside the last question's tool loop, keeping the question.
+    const question = lastUser(messages);
+    if (question < 0) {
         return undefined;
     }
-    return {
-        from,
-        cut,
-        toSummarise: messages.slice(from, cut),
-        ...(previous ? { previous } : {}),
-        ...(after === undefined ? {} : { after: Math.round(after) }),
-    };
+    const inLoop = findCut(messages, {
+        ...search,
+        isCut: (at) => at > question && messages[at].role === Role.Assistant,
+        kept: question,
+    });
+    if (inLoop.cut >= messages.length) {
+        return undefined;
+    }
+    const folded = planFor(messages, from, inLoop.cut, previous, inLoop.after, question);
+    return folded.toSummarise.length >= FEWEST_FOLDED ? folded : undefined;
 }
+/**
+ * A plan for a cut `planCompaction` has chosen.
+ *
+ * @param messages - The transcript. Not written to.
+ * @param from - The first message folded.
+ * @param cut - The first message kept whole.
+ * @param [previous] - The summary this one continues.
+ * @param [after] - What the request is expected to cost once folded, on a plan made to a target.
+ * @param [question] - The user message kept whole ahead of `cut`, on a fold inside its tool loop.
+ * Left out of `toSummarise` where it lies between `from` and `cut`.
+ * @returns The plan, `toSummarise` a new array of the same message objects.
+ */
+const planFor = (messages, from, cut, previous, after, question) => ({
+    from,
+    cut,
+    ...(question === undefined ? {} : { question }),
+    toSummarise: messages.slice(from, cut).filter((_, at) => at + from !== question),
+    ...(previous ? { previous } : {}),
+    ...(after === undefined ? {} : { after: Math.round(after) }),
+});
 /**
  * What the summariser is handed for a plan: the earlier summary if there was one, then each
  * message as its role and at most 4000 characters of its text.
@@ -256,6 +319,22 @@ export function summaryInput(plan) {
  * resolves with an empty string where the model wrote nothing.
  */
 export const summariser = (config, model, { system = SUMMARY_PROMPT, maxTokens = SUMMARY_TOKENS, ...options } = {}) => (text) => ask(config, model, system, text, { maxTokens, ...options });
+/**
+ * What `beforeCompact` hooks are told is going: the plan's stretch as `turnMessages` reads it,
+ * less the question the fold keeps.
+ *
+ * @param sessionId - Prefixes every uuid.
+ * @param messages - The transcript the plan was made for.
+ * @param plan - What `planCompaction` returned for it.
+ * @param [offset] - What `messages[0]` is numbered as in the uuids.
+ * @returns The user and assistant text from `plan.from` to `plan.cut`, `plan.question` left out.
+ */
+const foldedMessages = (sessionId, messages, plan, offset = 0) => {
+    const { from, cut, question } = plan;
+    const read = (start, end) => turnMessages(sessionId, messages, start, end, { offset });
+    const splitsAtQuestion = question !== undefined && question >= from && question < cut;
+    return splitsAtQuestion ? [...read(from, question), ...read(question + 1, cut)] : read(from, cut);
+};
 /**
  * The hooks and the summariser for a plan, as a record to store rather than a transcript to send.
  *
@@ -275,7 +354,7 @@ export const summariser = (config, model, { system = SUMMARY_PROMPT, maxTokens =
 export async function runCompaction(messages, plan, summarise, { hooks, forced = false } = {}) {
     const context = hooks && {
         ...hooks.context,
-        compacting: turnMessages(hooks.context.session.id, messages, plan.from, plan.cut),
+        compacting: foldedMessages(hooks.context.session.id, messages, plan, hooks.offset),
         range: { from: plan.from, through: plan.cut },
     };
     let summary;
@@ -295,7 +374,12 @@ export async function runCompaction(messages, plan, summarise, { hooks, forced =
     if (!summary.trim()) {
         return undefined;
     }
-    return { summary: summary.trim(), through: plan.cut, at: new Date().toISOString() };
+    return {
+        summary: summary.trim(),
+        through: plan.cut,
+        ...(plan.question === undefined ? {} : { question: plan.question }),
+        at: new Date().toISOString(),
+    };
 }
 /**
  * The transcript as the server should see it: the folded head replaced by its summary.
@@ -308,7 +392,8 @@ export async function runCompaction(messages, plan, summarise, { hooks, forced =
  * Absent, the leading `system` messages are found by scanning, and zero of them is the ordinary
  * case for a host whose system prompt is a separate argument.
  * @returns `messages` itself when there is no record or its summary is blank, otherwise a new
- * array: the kept head, one summary message, then everything from the record's `through` on.
+ * array: the kept head, one summary message, the record's `question` when it has one and the head
+ * does not already hold it, then everything from the record's `through` on.
  *
  * @remarks
  * The inverse of storing a `CompactionRecord`, and the shape `planCompaction` expects to meet
@@ -321,12 +406,22 @@ export function applyCompaction(messages, record, { from } = {}) {
         return messages;
     }
     const head = clamp(from ?? systemHead(messages).from, record.through);
+    const question = keptQuestion(record, head);
     return [
         ...messages.slice(0, head).filter((message) => !isSummary(message)),
         summaryMessage(record.summary),
+        ...(question === undefined ? [] : [messages[question]]),
         ...messages.slice(record.through),
     ];
 }
+/**
+ * The question a fold sends after its summary, unless the kept head already holds it.
+ *
+ * @param record - The fold.
+ * @param head - How many messages are kept ahead of the summary.
+ * @returns `record.question` where it lies from `head` up to `through`, otherwise `undefined`.
+ */
+const keptQuestion = ({ question, through }, head) => question !== undefined && question >= head && question < through ? question : undefined;
 /**
  * Where a stored index sits in the request `applyCompaction` builds, once a fold has shifted
  * everything after it.
@@ -338,7 +433,8 @@ export function applyCompaction(messages, record, { from } = {}) {
  * prompts, when the host keeps them in the array. Zero is the stored-fold case,
  * where the summary is the request's first message.
  * @returns The index in the request. One before the record's `through` gives `head`, where the
- * summary sits — an index among the kept head messages themselves included.
+ * summary sits — an index among the kept head messages themselves included — except the record's
+ * `question`, which is sent whole right after the summary.
  *
  * @remarks
  * A transcript that stays append-only and a request that does not are two numberings of the same
@@ -350,7 +446,12 @@ export const requestIndex = (index, record, head = 0) => {
     if (!record) {
         return index;
     }
-    return index < record.through ? head : index - record.through + head + 1;
+    const question = keptQuestion(record, head);
+    if (index === question) {
+        return head + 1;
+    }
+    const afterSummary = question === undefined ? 1 : 2;
+    return index < record.through ? head : index - record.through + head + afterSummary;
 };
 /**
  * The transcript with the plan's stretch replaced by one system message holding its summary.

package/dist/run/agent-loop.d.ts

@@ -70,6 +70,14 @@ export interface AgentLoopHooks {
     preface?: string;
     /** Hears each note, from before the request and from `afterTurn`. */
     onNote?: OnNote;
+    /**
+     * What the run's first message is numbered as in the uuids hooks are told — the host's stored
+     * index of `messages[0]`, for a host that numbers messages across steps or runs. Read for
+     * `beforeCompact`'s `compacting` and `afterTurn`'s `turn`. See `turnMessages`.
+     *
+     * @defaultValue `0`
+     */
+    offset?: number;
 }
 /** How full the window is as a step is about to be sent, as `beforeStep` is told it. */
 export interface StepWindow {

package/dist/run/agent-loop.js

@@ -235,10 +235,10 @@ async function foldBeforeStep(transcript, reported, summarise, { options, charsP
         return transcript;
     }
     const folded = await compactTranscript(transcript, plan, summarise, {
-        ...(hooks ? { hooks: { run: hooks.run, context: hooks.context, onNote: hooks.onNote } } : {}),
+        ...(hooks ? { hooks: { run: hooks.run, context: hooks.context, onNote: hooks.onNote, offset: hooks.offset } } : {}),
     });
     if (folded !== transcript) {
-        notice(`compacted ${plan.cut - plan.from} messages into a summary`);
+        notice(`compacted ${plan.toSummarise.length} messages into a summary`);
     }
     return folded;
 }
@@ -260,7 +260,7 @@ const tellAfterTurn = (hooks, messages, at, reply) => notify(hooks.run, HookEven
         ? {
             turn: {
                 index: turnIndex(messages, at),
-                messages: turnMessages(hooks.context.session.id, messages, at),
+                messages: turnMessages(hooks.context.session.id, messages, at, undefined, { offset: hooks.offset }),
             },
         }
         : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubicecho/agent-core",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "The endpoint-agnostic half of an OpenAI-compatible agent loop: tool-schema compatibility, on-demand tool loading, one-shot side tasks, run events, and a pooled client.",
   "keywords": [
     "openai",