Multiplayer agent harness for work.
Name compacted documents in the summary input instead of a separate file list
Joshua Franceddf5f4bf25a1
diff --git a/src/core/document-kinds.ts b/src/core/document-kinds.tsindex 4ede280e0..4b76fc3fc 100644--- a/src/core/document-kinds.ts+++ b/src/core/document-kinds.ts@@ -50,9 +50,6 @@ export function isTextDocument(file: { name: string; mimeType?: string; mimetypereturn TEXT_EXTENSIONS.has(ext) || ["csv", "tsv", "iif"].includes(ext);}-// Conservative per-byte estimate of what an attachment costs once expanded into a model request:-// native PDFs are billed per page (text plus a page image), which tracks file size far better than-// the few words a session entry stores for the attachment itself.const DOCUMENT_BYTES_PER_TOKEN = 4;export function estimateDocumentTokens(file: {@@ -82,7 +79,6 @@ export function documentAttachmentTokens(payload: unknown): number {return replayableDocumentMetas(payload).reduce((sum, file) => sum + estimateDocumentTokens(file), 0);}-/** How the agent fetches a saved file's bytes through its self-API. */export function fileContentRequest(artifactId: string): string {return `GET $AGENT_API_URL/v1/files/${artifactId}/content (header x-agent-capability: $AGENT_API_TOKEN)`;}diff --git a/src/core/orchestrator/compaction.ts b/src/core/orchestrator/compaction.tsindex 67b957c13..3e27f5498 100644--- a/src/core/orchestrator/compaction.ts+++ b/src/core/orchestrator/compaction.ts@@ -17,10 +17,7 @@ import {overBudgetFraction,planCompaction,recentEntryCountWithinBudget,- summarizedDocuments,- withSummarizedDocuments,} from "../../harness/context-compaction.ts";-import type { SummarizedDocument } from "../../sessions/session-store.ts";import { estimateCostUsd } from "../../ratelimit/budget.ts";import { errMessage } from "../../util/errors.ts";import { createKeyedQueue } from "../../util/async.ts";@@ -35,7 +32,6 @@ interface Summarized {summaryLabel: ScopeId;throughSeq: number;mode?: "recent";- documents?: SummarizedDocument[];}export interface CompactionContext {@@ -48,7 +44,6 @@ export interface CompactionContext {actorId: string;model?: string;cancel?: AbortSignal;- /** Tokens this turn's inline documents will add on top of the history. */reservedTokens?: number;}): Promise<SessionEntry[]>;compactRecent(input: {@@ -69,7 +64,6 @@ export interface CompactionContext {actorId: string;model?: string;}): void;- /** Most of the context budget that inline documents may take in one model request. */documentTokenBudget(scopeId: string, model?: string): number;}@@ -153,7 +147,6 @@ export function createCompaction(deps: OrchestratorDeps): CompactionContext {text,summaryLabel,throughSeq: compactionThroughSeq(plan.toSummarize),- documents: summarizedDocuments(plan.toSummarize),};}@@ -162,11 +155,11 @@ export function createCompaction(deps: OrchestratorDeps): CompactionContext {lease: Lease;summarized: Summarized;}): Promise<SessionEntry> {- const { text, summaryLabel, throughSeq, mode, documents = [] } = input.summarized;+ const { text, summaryLabel, throughSeq, mode } = input.summarized;const summary = await deps.sessions.append(input.lease, {type: "system",payload: {- ...createContextSummaryPayload(throughSeq, withSummarizedDocuments(text, documents), documents),+ ...createContextSummaryPayload(throughSeq, text),...(mode ? { mode } : {}),},scopeLabel: summaryLabel,@@ -274,7 +267,6 @@ export function createCompaction(deps: OrchestratorDeps): CompactionContext {summaryLabel: (includedPrior?.scopeLabel ?? input.scopeId) as ScopeId,throughSeq,mode: "recent",- documents: summarizedDocuments([...(prior ? [prior] : []), ...rest.slice(0, start)]),},});return [summary, ...recent];diff --git a/src/harness/agent-tools.ts b/src/harness/agent-tools.tsindex e77180f52..810d913d4 100644--- a/src/harness/agent-tools.ts+++ b/src/harness/agent-tools.ts@@ -72,7 +72,6 @@ function describePublishAudience(a: PublishAudienceDescriptor | undefined): striexport interface ToolContextRef {documents?: DocumentInput[];- /** Set once a provider rejects a request carrying `documents`; later requests send stubs instead. */documentsStubbed?: boolean;runtimeHandoff?: HarnessHandoff;runtimeRunId?: string;diff --git a/src/harness/context-compaction.ts b/src/harness/context-compaction.tsindex 8ff7ebd74..b8c81b0a8 100644--- a/src/harness/context-compaction.ts+++ b/src/harness/context-compaction.ts@@ -1,10 +1,10 @@import type { RunStop } from "../runs/run-store.ts";import type { SessionEntry } from "../types.ts";-import { contextSummaryPayload, type SummarizedDocument } from "../sessions/session-store.ts";+import { contextSummaryPayload } from "../sessions/session-store.ts";import { headSlice, tailSlice } from "../util/text.ts";import { countTokens } from "../util/tokens.ts";import { isObj } from "../util/objects.ts";-import { documentAttachmentTokens, fileContentRequest, replayableDocumentMetas } from "../core/document-kinds.ts";+import { documentAttachmentTokens, replayableDocumentMetas } from "../core/document-kinds.ts";const MAX_COMPACT_ENTRY_CHARS = 16_000;const COMPACT_ENTRY_TAIL_CHARS = 2_000;@@ -151,11 +151,15 @@ export function compactTranscript(history: SessionEntry[]): string {const ov = entry.type === "user" && op?.overheard === true;const text = String(op?.text ?? "").trim();const ovFiles = ov && Array.isArray(op?.files) ? (op!.files as unknown[]).map(String).filter(Boolean) : [];+ const files =+ entry.type === "user" && !ov+ ? replayableDocumentMetas(entry.payload).map((meta) => `${meta.name} [file ${meta.artifactId}]`)+ : ovFiles;const author = entry.type === "user" && typeof op?.name === "string" && op.name ? op.name : null;const label = ov? `overheard#${entry.seq}${stamp} (${op?.sourceRole === "agent" ? "agent" : (author ?? "someone")})`: `${entry.type}#${entry.seq}${stamp}${author ? ` (${author})` : ""}`;- if (text) push(`${label}: ${text}${ovFiles.length ? ` (files: ${ovFiles.join(", ")})` : ""}`);+ if (text) push(`${label}: ${text}${files.length ? ` (files: ${files.join(", ")})` : ""}`);else if (ov && ovFiles.length) push(`${label}: (shared file) (files: ${ovFiles.join(", ")})`);else if (!ov) {const payload =@@ -223,39 +227,6 @@ export function planCompaction(return { toSummarize, kept: afterSummary.slice(overflowCount) };}-const SUMMARIZED_DOCUMENTS_HEADER = `[Files shared in the summarized turns are no longer included inline. Each is still saved; read one with ${fileContentRequest("<file id>")} when you need its contents.]`;-const MAX_SUMMARIZED_DOCUMENTS = 20;-const MAX_SUMMARIZED_DOCUMENT_NAME_CHARS = 200;--/** Documents attached across `entries` (carrying forward any listed by a prior summary), newest last. */-export function summarizedDocuments(entries: readonly SessionEntry[]): SummarizedDocument[] {- const byId = new Map<string, SummarizedDocument>();- for (const entry of entries) {- const documents =- contextSummaryPayload(entry)?.documents ??- (entry.type === "user"- ? replayableDocumentMetas(entry.payload).map((meta) => ({ name: meta.name, artifactId: meta.artifactId! }))- : []);- for (const document of documents) {- byId.delete(document.artifactId);- byId.set(document.artifactId, {- name: headSlice(document.name, MAX_SUMMARIZED_DOCUMENT_NAME_CHARS),- artifactId: document.artifactId,- });- }- }- return [...byId.values()].slice(-MAX_SUMMARIZED_DOCUMENTS);-}--/** Replaces the summary's trailing file list so documents dropped from model input stay discoverable. */-export function withSummarizedDocuments(text: string, documents: readonly SummarizedDocument[]): string {- const at = text.indexOf(`\n\n${SUMMARIZED_DOCUMENTS_HEADER}`);- const base = at >= 0 ? text.slice(0, at) : text;- if (!documents.length) return base;- const list = documents.map((document) => `- ${JSON.stringify(document.name)} (file ${document.artifactId})`);- return `${base}\n\n${SUMMARIZED_DOCUMENTS_HEADER}\n${list.join("\n")}`;-}-export function compactionThroughSeq(entries: SessionEntry[]): number {return entries.reduce((max, entry) => {const summary = contextSummaryPayload(entry);diff --git a/src/harness/document-inputs.ts b/src/harness/document-inputs.tsindex 51828edb7..46390f769 100644--- a/src/harness/document-inputs.ts+++ b/src/harness/document-inputs.ts@@ -129,7 +129,6 @@ export async function withDocumentInputs(model: DocumentModel,documents: readonly DocumentInput[],signal?: AbortSignal,- /** When set, send this text in place of the documents' content. */stubText?: string,): Promise<unknown> {if (!documents.length || !payload || typeof payload !== "object") return payload;diff --git a/src/harness/history-summary.ts b/src/harness/history-summary.tsindex 2ab8da6ef..fc6ead367 100644--- a/src/harness/history-summary.ts+++ b/src/harness/history-summary.ts@@ -17,6 +17,7 @@ const SUMMARY_INSTRUCTIONS = ["Keep goals, constraints, decisions, open tasks, and facts that cannot be re-derived inline.","Preserve necessary facts from tool results inline. For details that can be re-derived, cite the tool call.","Preserve timestamps on time-sensitive facts. An interrupted tool call has an unknown outcome.",+ "Name every shared file listed as (files: name [file id]) with its file id; its contents are no longer inline.","Do not include secrets or credentials. Keep the summary under 8,000 characters.",].join("\n");diff --git a/src/harness/pi-harness.ts b/src/harness/pi-harness.tsindex 233d0cf45..38c5461f1 100644--- a/src/harness/pi-harness.ts+++ b/src/harness/pi-harness.ts@@ -932,7 +932,6 @@ function piAssistantFailure(session: AssistantTextSession): ProviderTurnError |/** Codes that retry the turn on the configured fallback model. */const FALLBACK_CODES = new Set(["refusal", "model_unavailable"]);-/** Codes that retry a request once without its inline documents (oversized or unreadable attachments). */const DOCUMENT_REJECTION_CODES = new Set(["context_too_long", "bad_request"]);function documentsDroppedNote(documents: readonly DocumentInput[]): string {@@ -2183,7 +2182,7 @@ export function createPiHarness(opts?: PiHarnessOptions): Harness {documentRejection = failure;entry.ref.documentsStubbed = true;console.error(- `[pi] request with ${entry.ref.documents.length} inline document(s) rejected (${failure.code}) — replacing them with stubs session=${turn.session.id}`,+ `[pi] request with ${entry.ref.documents.length} inline document(s) rejected (${failure.code}: ${failure.raw || failure.message}) — replacing them with stubs session=${turn.session.id}`,);};const retryWithoutDocuments = async (): Promise<boolean> => {diff --git a/src/sessions/session-store.ts b/src/sessions/session-store.tsindex ff7d8a180..ed8d1ddb5 100644--- a/src/sessions/session-store.ts+++ b/src/sessions/session-store.ts@@ -17,17 +17,10 @@ export function promptEnvelopeBody(envelope: unknown): { hash: string; body: strconst CONTEXT_SUMMARY_KIND = "context_summary";-export interface SummarizedDocument {- name: string;- artifactId: string;-}-export interface ContextSummaryPayload {kind: typeof CONTEXT_SUMMARY_KIND;throughSeq: number;text: string;- /** Documents attached in the summarized turns; they are no longer replayed into model input. */- documents?: SummarizedDocument[];}export function contextSummaryPayload(entry: SessionEntry): ContextSummaryPayload | null {@@ -38,28 +31,13 @@ export function contextSummaryPayload(entry: SessionEntry): ContextSummaryPayloatypeof payload.throughSeq === "number" &&typeof payload.text === "string") {- const documents = Array.isArray(payload.documents)- ? payload.documents.filter(- (document): document is SummarizedDocument =>- typeof document?.name === "string" && typeof document.artifactId === "string",- )- : [];- return {- kind: CONTEXT_SUMMARY_KIND,- throughSeq: payload.throughSeq,- text: payload.text,- ...(documents.length ? { documents } : {}),- };+ return { kind: CONTEXT_SUMMARY_KIND, throughSeq: payload.throughSeq, text: payload.text };}return null;}-export function createContextSummaryPayload(- throughSeq: number,- text: string,- documents: readonly SummarizedDocument[] = [],-): ContextSummaryPayload {- return { kind: CONTEXT_SUMMARY_KIND, throughSeq, text, ...(documents.length ? { documents: [...documents] } : {}) };+export function createContextSummaryPayload(throughSeq: number, text: string): ContextSummaryPayload {+ return { kind: CONTEXT_SUMMARY_KIND, throughSeq, text };}export interface ContextWindow {diff --git a/test/document-context-budget.test.ts b/test/document-context-budget.test.tsindex b4ec8611f..8a92f26e9 100644--- a/test/document-context-budget.test.ts+++ b/test/document-context-budget.test.ts@@ -4,11 +4,9 @@ import {estimateEntryTokens,overBudgetFraction,planCompaction,- summarizedDocuments,- withSummarizedDocuments,+ compactTranscript,} from "../src/harness/context-compaction.ts";import { estimateDocumentTokens } from "../src/core/document-kinds.ts";-import { createContextSummaryPayload } from "../src/sessions/session-store.ts";import type { ScopeId, SessionEntry } from "../src/types.ts";let seq = 0;@@ -58,33 +56,15 @@ test("history that is small in words but carries large PDFs compacts them out ofassert.ok(overBudgetFraction(history, budget, 0.9), "five 1MB PDFs no longer look like a few hundred tokens");const plan = planCompaction(history, budget, 0.6);assert.ok(plan);- const keptDocuments = summarizedDocuments(plan.kept).length;- assert.ok(keptDocuments * 250_000 <= budget * 0.6, `kept ${keptDocuments} documents`);- assert.deepEqual(- summarizedDocuments(plan.toSummarize).map((document) => document.name),- ["a.pdf", "b.pdf", "c.pdf", "d.pdf", "e.pdf"].slice(0, 5 - keptDocuments),- );+ const kept = plan.kept.reduce((sum, item) => sum + estimateEntryTokens(item), 0);+ assert.ok(kept <= budget * 0.6, `kept ~${kept} tokens`);+ assert.match(compactTranscript(plan.toSummarize), /a\.pdf \[file fa\]/);});-test("summaries list compacted documents once and carry them forward", () => {- const first = summarizedDocuments([- entry("user", { text: "x", attachments: [pdf("a.pdf", "fa"), pdf("b.pdf", "fb")] }),+test("compaction input names each compacted document and its saved file", () => {+ const transcript = compactTranscript([+ entry("user", { text: "review these", attachments: [pdf("a.pdf", "fa"), pdf("b.pdf", "fb")] }),+ entry("assistant", { text: "Done." }),]);- const text = withSummarizedDocuments("Earlier: reviewed two agreements.", first);- assert.match(text, /"a\.pdf" \(file fa\)/);- assert.match(text, /GET \$AGENT_API_URL\/v1\/files\/<file id>\/content/);- assert.equal(withSummarizedDocuments(text, first), text);- const prior = entry("system", createContextSummaryPayload(1, text, first));- const carried = summarizedDocuments([- prior,- entry("user", { text: "y", attachments: [pdf("c.pdf", "fc"), pdf("a.pdf", "fa")] }),- ]);- assert.deepEqual(- carried.map((document) => document.artifactId),- ["fb", "fc", "fa"],- );- const next = withSummarizedDocuments(`New summary.\n\n${text}`, carried);- assert.equal(next.match(/no longer included inline/g)?.length, 1);- assert.match(next, /"c\.pdf" \(file fc\)/);- assert.equal(withSummarizedDocuments(next, []), "New summary.\n\nEarlier: reviewed two agreements.");+ assert.match(transcript, /review these \(files: a\.pdf \[file fa\], b\.pdf \[file fb\]\)/);});diff --git a/test/orchestrator-documents.test.ts b/test/orchestrator-documents.test.tsindex 75647d386..9c21b62a3 100644--- a/test/orchestrator-documents.test.ts+++ b/test/orchestrator-documents.test.ts@@ -197,12 +197,4 @@ test("large documents never push a follow-up turn past the context budget", asyn).map((document) => document.name);const replayedTokens = replayed.reduce((sum, name) => sum + Math.ceil(sizes.get(name)! / 4), 0);assert.ok(replayedTokens <= budget / 2, `replayed ${replayed.join(", ")} (~${replayedTokens} tokens)`);- const entries = await built.sessions.getEntries(followup.sessionId!);- const visible = JSON.stringify(entries.filter((entry) => entry.type === "system" || entry.type === "user").at(-1));- for (const name of sizes.keys())- if (!replayed.includes(name))- assert.ok(- JSON.stringify(entries.slice(-12)).includes(name),- `${name} must stay discoverable as a stub after it leaves model context: ${visible.slice(0, 200)}`,- );});