Sync public snapshot from freebuff-private

Source: CodebuffAI/freebuff-private@fb6a058503604724e7c933d57209bbf20ea5d0cc

Author: github-actions[bot]

bun.lock

@@ -326,6 +326,8 @@ describe('getAxiomOnlyLogEvent', () => {
         context_token_count: 212_000,
         summary_estimated_tokens: 13_000,
         preserved_fresh_messages: 2,
+        working_set_files: 3,
+        working_set_stubs: 9,
         post_tokens: 41_000,
         // Not in the allowlist: user content.
         summaryText: '[USER]\nsecret',
@@ -338,6 +340,8 @@ describe('getAxiomOnlyLogEvent', () => {
         context_token_count: 212_000,
         summary_estimated_tokens: 13_000,
         preserved_fresh_messages: 2,
+        working_set_files: 3,
+        working_set_stubs: 9,
         post_tokens: 41_000,
       },
     })

common/src/util/__tests__/axiom-only-log.test.ts

@@ -290,6 +290,10 @@ const CONTEXT_COMPACTION_COMPLETED_FIELDS = {
   summary_estimated_tokens: 'number',
   budget_dropped_summary_parts: 'number',
   preserved_fresh_messages: 'number',
+  /** Files re-provided whole, files left as an outline stub, and their size. */
+  working_set_files: 'number',
+  working_set_stubs: 'number',
+  working_set_tokens: 'number',
   post_tokens: 'number',
 } as const satisfies AxiomOnlyFieldSchema
 

common/src/util/axiom-only-log.ts

@@ -30,7 +30,12 @@ const assistant = (text: string): Message => ({
 const call = (id: string, paths: unknown[] = ['file.ts']): Message => ({
   role: 'assistant',
   content: [
-    { type: 'tool-call', toolCallId: id, toolName: 'read_files', input: { paths } },
+    {
+      type: 'tool-call',
+      toolCallId: id,
+      toolName: 'read_files',
+      input: { paths },
+    },
   ],
 })
 const tool = (id: string, value: JSONValue): Message => ({
@@ -42,15 +47,38 @@ const tool = (id: string, value: JSONValue): Message => ({
 const read = (id: string, content: string, path = 'file.ts') =>
   tool(id, [{ path, content, referencedBy: {} }])
 
-/** A settled conversation: several exchanges, then a final assistant answer. */
+const edit = (id: string, path: string): Message[] => [
+  {
+    role: 'assistant',
+    content: [
+      {
+        type: 'tool-call',
+        toolCallId: id,
+        toolName: 'str_replace',
+        input: { path, replacements: [] },
+      },
+    ],
+  },
+  {
+    role: 'tool',
+    toolCallId: id,
+    toolName: 'str_replace',
+    content: [{ type: 'json', value: { file: path, message: 'Updated' } }],
+  },
+]
+
+/** A settled conversation: several exchanges, then a final assistant answer.
+ * Each file was edited after it was read, so no working set carries it. */
 const settledHistory = (): Message[] => [
   user('Add a retry to the uploader.'),
   call('a', ['uploader.ts']),
   read('a', 'export const upload = () => {}\n'.repeat(400), 'uploader.ts'),
+  ...edit('a-edit', 'uploader.ts'),
   assistant('Added the retry.'),
   user('Now document it.'),
   call('b', ['README.md']),
   read('b', '# docs\n'.repeat(400), 'README.md'),
+  ...edit('b-edit', 'README.md'),
   assistant('Documented.'),
 ]
 
@@ -72,8 +100,9 @@ describe('compactHistoryNow', () => {
     expect(forced).not.toBeNull()
     expect(forced!.nextTokens).toBeLessThan(forced!.previousTokens)
     expect(countTokensMessages(forced!.messages)).toBe(forced!.nextTokens)
+    // Edited after it was read, so it comes back as an outline, not a body.
     expect(JSON.stringify(forced!.messages)).not.toContain(
-      'export const upload',
+      JSON.stringify('export const upload = () => {}\nexport const').slice(1, -1),
     )
   })
 

packages/agent-runtime/src/__tests__/compact-history-now.test.ts

@@ -121,7 +121,13 @@ describe('request-sized compaction', () => {
         content: [{ type: 'text', text: 'I used those contents.' }],
       },
     ])
-    expect(output.some((message) => message.role === 'tool')).toBe(false)
+    // Not preserved as a fresh result. Too big for this window's working set,
+    // it comes back only as a stub.
+    expect(
+      output
+        .filter((message) => message.role === 'tool')
+        .every((message) => message.tags?.includes('COMPACTION_WORKING_SET')),
+    ).toBe(true)
     expect(JSON.stringify(output)).not.toContain('ALREADY_CONSUMED')
   })
 

packages/agent-runtime/src/__tests__/compact-request-budget.test.ts

@@ -5,6 +5,7 @@ import {
   measureCompactionWindow,
   openCompactionWindow,
 } from '../compaction-followup'
+import { COMPACTED_READ_MARKER } from '../compaction-working-set'
 
 import type { Message } from '@codebuff/common/types/messages/codebuff-message'
 
@@ -24,7 +25,18 @@ const read = (id: string, paths: unknown[]): Message[] => [
     role: 'tool',
     toolCallId: id,
     toolName: 'read_files',
-    content: [{ type: 'json', value: [{ path: 'x', content: 'BODY' }] }],
+    content: [
+      {
+        type: 'json',
+        value: paths.map((entry) => ({
+          path:
+            typeof entry === 'string'
+              ? entry
+              : (entry as { path: string }).path,
+          content: 'BODY',
+        })),
+      },
+    ],
   },
 ]
 
@@ -52,6 +64,34 @@ describe('compaction follow-up window', () => {
     expect([...window.elidedPaths]).toEqual(['a.ts'])
   })
 
+  it('a working-set stub names a file without carrying it', () => {
+    const stubbed: Message[] = [
+      summary,
+      {
+        role: 'tool',
+        toolCallId: 'ws',
+        toolName: 'read_files',
+        content: [
+          {
+            type: 'json',
+            value: [
+              { path: 'b.ts', content: 'BODY' },
+              { path: 'a.ts', content: `${COMPACTED_READ_MARKER}. 3 lines.]` },
+            ],
+          },
+        ],
+      },
+    ]
+    const window = openCompactionWindow({
+      before,
+      after: stubbed,
+      mode: 'mechanical',
+      trigger: 'context_limit',
+      now: 0,
+    })
+    expect([...window.elidedPaths]).toEqual(['a.ts'])
+  })
+
   it('a re-read of a dropped file is a re-read; a carried one is not new', () => {
     const window = openCompactionWindow({
       before,