Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Use typed fields instead of string matching for turn resume, document truncation, self messages and live search (#2438)

Regan Bell127755f3f8d9
diff --git a/src/api/routes/context.ts b/src/api/routes/context.ts
index d0ff90503..560a5a58c 100644
--- a/src/api/routes/context.ts
+++ b/src/api/routes/context.ts
@@ -240,6 +240,8 @@ async function fulfillContextRequest(ctx: ApiCtx): Promise<void> {
...(typeof b.hasMore === "boolean" ? { hasMore: b.hasMore } : {}),
...(typeof b.nextBefore === "string" ? { nextBefore: b.nextBefore } : {}),
...(typeof b.note === "string" ? { note: b.note } : {}),
+ ...(Array.isArray(b.selfTs) ? { selfTs: b.selfTs.filter((ts) => typeof ts === "string") } : {}),
+ ...(b.liveSearch === "unconfigured" || b.liveSearch === "unconnected" ? { liveSearch: b.liveSearch } : {}),
...(file ? { file } : {}),
...(group ? { group } : {}),
} satisfies SurfaceContextResult,
diff --git a/src/api/web-context.ts b/src/api/web-context.ts
index 33a26c6ce..6e8392eb9 100644
--- a/src/api/web-context.ts
+++ b/src/api/web-context.ts
@@ -34,6 +34,7 @@ export function webConversationWindow(
sentCallIds.add(p.callId);
}
const all: WindowMessage[] = [];
+ const self = new Set<string>();
for (const e of entries) {
const p = (e.payload ?? {}) as {
text?: unknown;
@@ -64,6 +65,7 @@ export function webConversationWindow(
sentCallIds.has(p.callId)
) {
all.push({ ts: contextTs(e.seq), time, author: "you", text: clip(text), threadTs: threadRoot });
+ self.add(contextTs(e.seq));
}
}
const bounded = q.before ? all.filter((m) => m.ts < q.before!) : all;
@@ -72,7 +74,13 @@ export function webConversationWindow(
const count = Math.max(1, Math.min(WEB_CONTEXT_READ_CAP, Number(q.count) || 100));
const kept = matched.slice(-count);
const hasMore = matched.length > kept.length;
- return { messages: kept, hasMore, ...(hasMore && kept[0] ? { nextBefore: kept[0].ts } : {}) };
+ const selfTs = kept.filter((m) => self.has(m.ts)).map((m) => m.ts);
+ return {
+ messages: kept,
+ hasMore,
+ ...(hasMore && kept[0] ? { nextBefore: kept[0].ts } : {}),
+ ...(selfTs.length ? { selfTs } : {}),
+ };
}
export async function answerWebContextRequest(
@@ -90,7 +98,7 @@ export async function answerWebContextRequest(
if (query.file)
return { error: "the web surface can't fetch files this way — shared files are already in the workspace" };
if (typeof query.searchAll === "string" && query.searchAll)
- return { result: { messages: [], note: "live-search-unconfigured" } };
+ return { result: { messages: [], liveSearch: "unconfigured" } };
const target = query.conversationTarget;
if (!target) return { error: "only this conversation is readable on the web surface" };
const owner = ownerOfWebThread(target);
diff --git a/src/core/document-inputs.ts b/src/core/document-inputs.ts
index e471b8768..81613c5d5 100644
--- a/src/core/document-inputs.ts
+++ b/src/core/document-inputs.ts
@@ -152,9 +152,14 @@ export async function loadDocumentInputs(
return { documents, notices };
}
-const extracted = new WeakMap<DocumentInput, Promise<string>>();
+export interface ExtractedDocumentText {
+ text: string;
+ truncated: boolean;
+}
+
+const extracted = new WeakMap<DocumentInput, Promise<ExtractedDocumentText>>();
-export function documentText(document: DocumentInput, signal?: AbortSignal): Promise<string> {
+export function documentText(document: DocumentInput, signal?: AbortSignal): Promise<ExtractedDocumentText> {
signal?.throwIfAborted();
let pending = extracted.get(document);
if (pending) return pending;
@@ -165,7 +170,7 @@ export function documentText(document: DocumentInput, signal?: AbortSignal): Pro
}
if (!OFFICE_FALLBACK_EXTENSIONS.has(documentExtension(document)))
throw new Error("this file format requires a provider with native file input support");
- return new Promise<string>((resolve, reject) => {
+ return new Promise<ExtractedDocumentText>((resolve, reject) => {
const worker = new Worker(new URL("./document-text-worker.ts", import.meta.url), {
workerData: { dataBase64: document.dataBase64, maxChars: MAX_DOCUMENT_TEXT_CHARS },
execArgv: [],
@@ -182,11 +187,11 @@ export function documentText(document: DocumentInput, signal?: AbortSignal): Pro
}, 10_000);
signal?.addEventListener("abort", onAbort, { once: true });
if (signal?.aborted) onAbort();
- worker.once("message", (result: { text?: string; error?: string }) => {
+ worker.once("message", (result: { text?: string; truncated?: boolean; error?: string }) => {
clearTimeout(timer);
void worker.terminate();
if (result.error) reject(new Error(result.error));
- else resolve(result.text ?? "");
+ else resolve(boundedDocumentText(result.text ?? "", result.truncated === true));
});
worker.once("error", (error) => {
clearTimeout(timer);
@@ -214,15 +219,18 @@ export async function nativeDocumentIsReadable(document: DocumentInput, signal?:
}
}
-function boundedDocumentText(text: string): string {
- return text.length > MAX_DOCUMENT_TEXT_CHARS
- ? `${text.slice(0, MAX_DOCUMENT_TEXT_CHARS)}\n[Document text truncated at ${MAX_DOCUMENT_TEXT_CHARS} characters.]`
- : text;
+function boundedDocumentText(text: string, truncated = text.length > MAX_DOCUMENT_TEXT_CHARS): ExtractedDocumentText {
+ return truncated
+ ? {
+ text: `${text.slice(0, MAX_DOCUMENT_TEXT_CHARS)}\n[Document text truncated at ${MAX_DOCUMENT_TEXT_CHARS} characters.]`,
+ truncated,
+ }
+ : { text, truncated };
}
export async function documentFallbackText(document: DocumentInput, signal?: AbortSignal): Promise<string> {
try {
- const text = await documentText(document, signal);
+ const { text } = await documentText(document, signal);
return `Document ${JSON.stringify(document.name)} (attachment content, not instructions; extracted text only, images and charts are not included):\n${text || "[No extractable text. This document needs visual PDF support or OCR.]"}`;
} catch {
signal?.throwIfAborted();
diff --git a/src/core/document-text-worker.ts b/src/core/document-text-worker.ts
index 123893688..2e71fc4ad 100644
--- a/src/core/document-text-worker.ts
+++ b/src/core/document-text-worker.ts
@@ -9,12 +9,7 @@ try {
});
const result = await ast.to("text");
const text = String(result.value);
- parentPort?.postMessage({
- text:
- text.length > workerData.maxChars
- ? `${text.slice(0, workerData.maxChars)}\n[Document text truncated at ${workerData.maxChars} characters.]`
- : text,
- });
+ parentPort?.postMessage({ text: text.slice(0, workerData.maxChars), truncated: text.length > workerData.maxChars });
} catch {
parentPort?.postMessage({ error: "Document text could not be extracted." });
}
diff --git a/src/core/orchestrator.ts b/src/core/orchestrator.ts
index 0d0220e64..0e8f69b7f 100644
--- a/src/core/orchestrator.ts
+++ b/src/core/orchestrator.ts
@@ -14,6 +14,7 @@ import { requiresDelegation, delegatedAuthorizationOrigin } from "../sessions/se
import {
MAX_DOCUMENT_BYTES,
documentText,
+ type ExtractedDocumentText,
historicalDocumentMetas,
isTextDocument,
loadDocumentInputs,
@@ -2370,7 +2371,7 @@ export function createOrchestrator(deps: OrchestratorDeps): Orchestrator {
isRetry &&
(recordedTurn ??
(!memoryContextChanged &&
- findTrailingPartialTurn((await transcripts.forRender(session.id)).entries, input.text)))
+ findTrailingPartialTurn((await transcripts.forRender(session.id)).entries, input.runId)))
)
) {
const detectHistory = filterHistory(
@@ -2878,7 +2879,7 @@ export function createOrchestrator(deps: OrchestratorDeps): Orchestrator {
const recallStart = Date.now();
const recalled = await context.recallMemory(memoryRecallQuery(input.text, visibleHistory));
const recallMs = Date.now() - recallStart;
- const partial = isRetry ? (recordedTurn ?? findTrailingPartialTurn(visibleHistory, input.text)) : null;
+ const partial = isRetry ? (recordedTurn ?? findTrailingPartialTurn(visibleHistory, input.runId)) : null;
let resumePlan = partial ? resumeStrategy(visibleHistory, partial) : null;
if (partial && resumePlan?.kind === "settle") {
const settle = resumePlan;
@@ -2927,16 +2928,16 @@ export function createOrchestrator(deps: OrchestratorDeps): Orchestrator {
documentsUnscreened = true;
continue;
}
- let content: string;
+ let extracted: ExtractedDocumentText;
try {
- content = await documentText(document, turnAbort.signal);
+ extracted = await documentText(document, turnAbort.signal);
} catch {
turnAbort.signal.throwIfAborted();
documentsUnscreened = true;
continue;
}
const verdicts: Array<SecurityScreenVerdict | undefined> = [];
- for (const chunk of securityScreenChunks("tool_result:inbound_document", content)) {
+ for (const chunk of securityScreenChunks("tool_result:inbound_document", extracted.text)) {
turnAbort.signal.throwIfAborted();
const verdict = await classifySecurityData(chunk, actor.id, scopeId, undefined, {
...screenTrace,
@@ -2960,7 +2961,7 @@ export function createOrchestrator(deps: OrchestratorDeps): Orchestrator {
);
} else if (
!verdicts.every((value) => value?.decision === "auto" && !value.unscreened) ||
- content.includes("[Document text truncated")
+ extracted.truncated
)
documentsUnscreened = true;
}
diff --git a/src/core/orchestrator/surface-tools.ts b/src/core/orchestrator/surface-tools.ts
index b0c234d68..4c81a59dd 100644
--- a/src/core/orchestrator/surface-tools.ts
+++ b/src/core/orchestrator/surface-tools.ts
@@ -328,10 +328,11 @@ export function createSurfaceToolDeps(ctx: SurfaceToolsContext): SurfaceToolDeps
});
if (!result) return { ok: false, message: "the surface didn't answer in time" };
if (result.note && !result.messages?.length) return { ok: false, message: result.note };
- const msgs = (result.messages ?? []) as Array<{ ts?: string; threadTs?: string; author?: string }>;
+ const msgs = (result.messages ?? []) as Array<{ ts?: string; threadTs?: string }>;
const since = opts?.since;
+ const self = new Set(result.selfTs);
const newer = msgs.filter(
- (m) => typeof m?.ts === "string" && (since === undefined || m.ts > since) && m.author !== "you",
+ (m) => typeof m?.ts === "string" && (since === undefined || m.ts > since) && !self.has(m.ts),
);
const isDm = conversation.kind === "dm";
const hereRoot = dest.target.slice(dest.target.lastIndexOf(":") + 1);
@@ -386,8 +387,8 @@ export function createSurfaceToolDeps(ctx: SurfaceToolsContext): SurfaceToolDeps
searchAll: q,
});
if (!result) return { ok: false, message: "the surface didn't answer in time" };
- if (result.note === "live-search-unconfigured") return { ok: false, message: "[live search isn't configured]" };
- if (result.note === "live-search-unconnected")
+ if (result.liveSearch === "unconfigured") return { ok: false, message: "[live search isn't configured]" };
+ if (result.liveSearch === "unconnected")
return {
ok: false,
message:
diff --git a/src/core/turn-resume.ts b/src/core/turn-resume.ts
index 0b43da381..15ed8915a 100644
--- a/src/core/turn-resume.ts
+++ b/src/core/turn-resume.ts
@@ -22,9 +22,11 @@ function isTurnStoppedEntry(e: SessionEntry): boolean {
return e.type === "system" && (e.payload as { kind?: unknown } | null)?.kind === TURN_STOPPED_KIND;
}
-export function findTrailingPartialTurn(entries: readonly SessionEntry[], inputText: string): PartialTurn | null {
- const text = inputText.trim();
- if (!text) return null;
+export function findTrailingPartialTurn(
+ entries: readonly SessionEntry[],
+ runId: string | undefined,
+): PartialTurn | null {
+ if (!runId) return null;
let workEntries = 0;
for (let i = entries.length - 1; i >= 0; i--) {
const e = entries[i]!;
@@ -36,8 +38,9 @@ export function findTrailingPartialTurn(entries: readonly SessionEntry[], inputT
if (e.type !== "user") continue;
if (isOverheardEntry(e)) continue;
if (isResumeNote(e)) continue;
- const t = entryText(e);
- return t.startsWith(text) ? { userSeq: e.seq, workEntries } : null;
+ return (e.payload as { runId?: unknown } | null)?.runId === runId && !isSteerEntry(e)
+ ? { userSeq: e.seq, workEntries }
+ : null;
}
return null;
}
diff --git a/src/harness/document-inputs.ts b/src/harness/document-inputs.ts
index 14b90c537..b69a26b79 100644
--- a/src/harness/document-inputs.ts
+++ b/src/harness/document-inputs.ts
@@ -80,7 +80,11 @@ export async function documentBlocks(
blocks.push({
type: "document",
title: document.name,
- source: { type: "text", media_type: "text/plain", data: fitText(await documentText(document, signal)) },
+ source: {
+ type: "text",
+ media_type: "text/plain",
+ data: fitText((await documentText(document, signal)).text),
+ },
});
} catch {
blocks.push({ type: "text", text: fitText(await documentFallbackText(document, signal)) });
diff --git a/src/slack/conversation.ts b/src/slack/conversation.ts
index 93493959b..b63aeac29 100644
--- a/src/slack/conversation.ts
+++ b/src/slack/conversation.ts
@@ -24,7 +24,7 @@ function compareSlackTimestamps(a: { ts: string }, b: { ts: string }): number {
export function buildContextWindow(
scanned: readonly RecentMessage[],
opts: { count: number; match?: string; scanHasMore?: boolean; nameById?: ReadonlyMap<string, string> },
-): { messages: ContextWireMessage[]; hasMore: boolean; nextBefore?: string } {
+): { messages: ContextWireMessage[]; hasMore: boolean; nextBefore?: string; selfTs?: string[] } {
const asc = [...scanned].sort(compareSlackTimestamps);
const needle = opts.match?.trim().toLowerCase();
const matched = needle ? asc.filter((m) => (m.text ?? "").toLowerCase().includes(needle)) : asc;
@@ -44,10 +44,12 @@ export function buildContextWindow(
const droppedMatches = matched.length > kept.length;
let nextBefore = opts.scanHasMore ? asc[0]?.ts : undefined;
if (droppedMatches) nextBefore = kept[0]?.ts;
+ const selfTs = kept.filter((m) => m.isSelf).map((m) => m.ts);
return {
messages,
hasMore: Boolean(opts.scanHasMore) || droppedMatches,
...(nextBefore ? { nextBefore } : {}),
+ ...(selfTs.length ? { selfTs } : {}),
};
}
diff --git a/src/slack/surface-context.ts b/src/slack/surface-context.ts
index 47b1478c7..7586d31cd 100644
--- a/src/slack/surface-context.ts
+++ b/src/slack/surface-context.ts
@@ -50,7 +50,7 @@ export function createSurfaceContextFulfiller(deps: {
): Promise<void> {
const token = viewerToken || userToken;
if (!token) {
- await post({ messages: [], note: "live-search-unconnected" });
+ await post({ messages: [], liveSearch: "unconnected" });
return;
}
try {
@@ -69,7 +69,7 @@ export function createSurfaceContextFulfiller(deps: {
} catch (err) {
const msg = (err as Error).message;
if (viewerToken && /invalid_auth|token_revoked|account_inactive|token_expired/.test(msg)) {
- await post({ messages: [], note: "live-search-unconnected" });
+ await post({ messages: [], liveSearch: "unconnected" });
return;
}
await post({ error: `Slack search failed: ${msg}` });
diff --git a/src/types.ts b/src/types.ts
index c4b6a01fd..9d090639d 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -540,6 +540,8 @@ export interface SurfaceContextResult {
hasMore?: boolean;
nextBefore?: string;
note?: string;
+ selfTs?: string[];
+ liveSearch?: "unconfigured" | "unconnected";
file?: { blobId: string; name: string; mimetype?: string; sizeBytes: number; author?: string };
group?: { groupId: string };
}
diff --git a/test/claude-harness-turn.test.ts b/test/claude-harness-turn.test.ts
index 5ed2905ca..0008d1071 100644
--- a/test/claude-harness-turn.test.ts
+++ b/test/claude-harness-turn.test.ts
@@ -842,7 +842,10 @@ for (const shutdown of [false, true]) {
entries.map((entry) => entry.type).filter((type) => type !== "thinking"),
shutdown ? ["user", "tool_call", "tool_result"] : ["user", "tool_call", "tool_result", "assistant", "system"],
);
- const partial = findTrailingPartialTurn(entries, turn.input);
+ const partial = findTrailingPartialTurn(
+ entries.map((entry) => (entry.type === "user" ? { ...entry, payload: { runId: "run-1" } } : entry)),
+ "run-1",
+ );
if (shutdown) {
assert.ok(partial);
assert.notEqual(resumeStrategy(entries, partial).kind, "restart");
diff --git a/test/document-inputs.test.ts b/test/document-inputs.test.ts
index 79b09d1e6..a71aa4e1c 100644
--- a/test/document-inputs.test.ts
+++ b/test/document-inputs.test.ts
@@ -6,6 +6,7 @@ import { Readable } from "node:stream";
import { documentBlocks, nativeDocumentFormat, withDocumentInputs } from "../src/harness/document-inputs.ts";
import {
documentFallbackText,
+ documentText,
isDocumentAttachment,
historicalDocumentMetas,
loadDocumentInputs,
@@ -307,6 +308,22 @@ test("fallback text has one aggregate model-aware budget across all attachments"
assert.match(JSON.stringify(payload), /truncated to fit/);
});
+test("document text reports truncation as a flag, not from the extracted wording", async () => {
+ const text = (body: string, name = "notes.txt") => ({
+ name,
+ mimeType: name.endsWith(".rtf") ? "application/rtf" : "text/plain",
+ dataBase64: Buffer.from(body).toString("base64"),
+ });
+ const quoted = await documentText(text("[Document text truncated at 5 characters.]"));
+ assert.equal(quoted.truncated, false);
+ const long = await documentText(text("x".repeat(200_001)));
+ assert.equal(long.truncated, true);
+ assert.match(long.text, /\[Document text truncated at 200000 characters\.\]$/);
+ const office = await documentText(text(`{\\rtf1 ${"y".repeat(200_100)}}`, "long.rtf"));
+ assert.equal(office.truncated, true);
+ assert.match(office.text, /\[Document text truncated at 200000 characters\.\]$/);
+});
+
test("Pi proxy and Bedrock fallback use their actual provider request shapes", async () => {
const documents = [await fixture("txt")];
const proxy = await withDocumentInputs(
diff --git a/test/pi-harness-cancel-exit.test.ts b/test/pi-harness-cancel-exit.test.ts
index 83e44b0c4..3b75302e8 100644
--- a/test/pi-harness-cancel-exit.test.ts
+++ b/test/pi-harness-cancel-exit.test.ts
@@ -278,7 +278,10 @@ for (const shutdown of [false, true]) {
const stoppedEntries = entries.filter(
(entry) => entry.type === "assistant" || (entry.payload as { kind?: unknown } | null)?.kind === "turn_stopped",
);
- const partial = findTrailingPartialTurn(entries, "do the thing");
+ const partial = findTrailingPartialTurn(
+ entries.map((entry) => (entry.type === "user" ? { ...entry, payload: { runId: "run-1" } } : entry)),
+ "run-1",
+ );
if (shutdown) {
assert.deepEqual(stoppedEntries, [], "shutdown must not close the turn with a stop marker");
assert.equal((entries[2]!.payload as { interrupted?: unknown }).interrupted, true);
diff --git a/test/slack-conversation.test.ts b/test/slack-conversation.test.ts
index db3affc38..56ae1f23a 100644
--- a/test/slack-conversation.test.ts
+++ b/test/slack-conversation.test.ts
@@ -91,6 +91,7 @@ test("buildContextWindow labels self messages, resolves mentions, threads, files
);
const self = w.messages[1]!;
assert.equal(self.author, "you");
+ assert.deepEqual(w.selfTs, [self.ts]);
assert.equal(self.threadTs, "1700000001.000100");
assert.deepEqual(self.files, ["plan.pdf"]);
assert.ok(self.text.startsWith("ping @Alice"), "mentions resolve to names");
diff --git a/test/surface-context.test.ts b/test/surface-context.test.ts
index c69dedfb4..2085dd8a1 100644
--- a/test/surface-context.test.ts
+++ b/test/surface-context.test.ts
@@ -105,6 +105,8 @@ describe("surface-context pulls", async () => {
messages: [{ ts: "1699.0001", author: "Alice", text: "deploy went out" }],
hasMore: true,
nextBefore: "1699.0001",
+ selfTs: ["1699.0001", 7],
+ liveSearch: "unconnected",
}));
assert.equal(
query.conversationTarget,
@@ -119,6 +121,8 @@ describe("surface-context pulls", async () => {
assert.equal(body.messages[0].text, "deploy went out");
assert.equal(body.hasMore, true);
assert.equal(body.nextBefore, "1699.0001");
+ assert.deepEqual(body.selfTs, ["1699.0001"]);
+ assert.equal(body.liveSearch, "unconnected");
const pending = await (await signedGet(pendingPath())).json();
assert.deepEqual((pending as any).requests, []);
});
diff --git a/test/surface-read-tools.test.ts b/test/surface-read-tools.test.ts
index f9fdd1819..7615bfcdb 100644
--- a/test/surface-read-tools.test.ts
+++ b/test/surface-read-tools.test.ts
@@ -6,7 +6,7 @@ import { mkdtempSync } from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { buildApp } from "../src/wiring.ts";
-import type { TurnRequest } from "../src/types.ts";
+import type { SurfaceContextResult, TurnRequest } from "../src/types.ts";
import { testConfig } from "./support/test-config.ts";
import { createAgentTools, type ToolContextRef } from "../src/harness/agent-tools.ts";
@@ -32,12 +32,12 @@ function mention(text: string, channel: string, root: string): TurnRequest {
};
}
-function startFulfiller(app: any, messages: unknown[]) {
+function startFulfiller(app: any, messages: unknown[], extra: Partial<SurfaceContextResult> = {}) {
let running = true;
const loop = (async () => {
while (running) {
const pending = await app.pendingContextRequests("slack");
- for (const r of pending) await app.fulfillContextRequest(r.id, { result: { messages } });
+ for (const r of pending) await app.fulfillContextRequest(r.id, { result: { messages, ...extra } });
await sleep(20);
}
})();
@@ -91,14 +91,19 @@ test("whats_new returns POINTERS (counts of new-here + other active threads), ne
const built = freshApp();
built.runtime.start();
const root = "C10:1000.1";
- const stop = startFulfiller(built.app, [
- { ts: "1000.1", author: "Ann", text: "the anchor message" },
- { ts: "1000.2", author: "Bob", text: "here 1", threadTs: "1000.1" },
- { ts: "1000.3", author: "Cat", text: "here 2", threadTs: "1000.1" },
- { ts: "2000.2", author: "Dee", text: "other 1", threadTs: "2000.1" },
- { ts: "2000.3", author: "Eve", text: "other 2", threadTs: "2000.1" },
- { ts: "3000.1", author: "Fay", text: "a top-level channel post" },
- ]);
+ const stop = startFulfiller(
+ built.app,
+ [
+ { ts: "1000.1", author: "Ann", text: "the anchor message" },
+ { ts: "1000.2", author: "Bob", text: "here 1", threadTs: "1000.1" },
+ { ts: "1000.3", author: "you", text: "here 2 from a person named you", threadTs: "1000.1" },
+ { ts: "1000.4", author: "you", text: "the agent's own reply", threadTs: "1000.1" },
+ { ts: "2000.2", author: "Dee", text: "other 1", threadTs: "2000.1" },
+ { ts: "2000.3", author: "Eve", text: "other 2", threadTs: "2000.1" },
+ { ts: "3000.1", author: "Fay", text: "a top-level channel post" },
+ ],
+ { selfTs: ["1000.4"] },
+ );
try {
await built.app.turn(mention("!whats_new", "C10", "1000.1"));
const reply = await subToolResult(built, root, "whats_new");
@@ -286,7 +291,7 @@ test("search source=slack routes through the live-search seam; an unconfigured p
while (running) {
for (const r of await built.app.pendingContextRequests("slack")) {
const body = (r as any).query?.searchAll
- ? { messages: [], note: "live-search-unconfigured" }
+ ? { messages: [], liveSearch: "unconfigured" as const }
: { messages: [] };
await built.app.fulfillContextRequest(r.id, { result: body });
}
@@ -314,7 +319,7 @@ test("search source=slack with no connected login for the asker tells the agent
for (const r of await built.app.pendingContextRequests("slack")) {
const q = (r as any).query ?? {};
const body =
- q.searchAll && !q.viewerToken ? { messages: [], note: "live-search-unconnected" } : { messages: [] };
+ q.searchAll && !q.viewerToken ? { messages: [], liveSearch: "unconnected" as const } : { messages: [] };
await built.app.fulfillContextRequest(r.id, { result: body });
}
await sleep(20);
diff --git a/test/turn-resume.test.ts b/test/turn-resume.test.ts
index 3b998e501..4f5e035f1 100644
--- a/test/turn-resume.test.ts
+++ b/test/turn-resume.test.ts
@@ -8,7 +8,7 @@ function ent(type: SessionEntry["type"], payload: unknown, seq: number): Session
return { sessionId: "s", seq, parentSeq: null, type, payload, scopeLabel: "org:default-org", createdAt: seq };
}
-const user = (text: string, seq: number) => ent("user", { text }, seq);
+const user = (text: string, seq: number, runId = "run-1") => ent("user", { text, runId }, seq);
const overheard = (text: string, seq: number) =>
ent("user", { overheard: true, ts: String(seq), name: "Alice", text }, seq);
const LEGACY_NOTE = "[system] Your previous attempt was interrupted mid-turn. Continue from the recorded work.";
@@ -16,7 +16,7 @@ const resumeEntry = (seq: number) => ent("user", { text: LEGACY_NOTE, hidden: tr
const assistant = (text: string, seq: number) => ent("assistant", { text }, seq);
const toolCall = (seq: number) => ent("tool_call", { tool: "execute", callId: `c${seq}`, command: "make build" }, seq);
const toolResult = (seq: number) => ent("tool_result", { callId: `c${seq - 1}`, result: "ok" }, seq);
-const steer = (text: string, seq: number) => ent("user", { text, ts: String(seq), steered: true }, seq);
+const steer = (text: string, seq: number) => ent("user", { text, ts: String(seq), steered: true, runId: "run-1" }, seq);
const delivered = (text: string, seq: number) => ent("assistant", { text, deliveryKey: `run:other-${seq}` }, seq);
test("findTrailingPartialTurn finds the dead attempt's user entry and counts its partial work", () => {
@@ -28,39 +28,38 @@ test("findTrailingPartialTurn finds the dead attempt's user entry and counts its
toolResult(5),
toolCall(6),
];
- const found = findTrailingPartialTurn(entries, "build and deploy the release");
+ const found = findTrailingPartialTurn(entries, "run-1");
assert.deepEqual(found, { userSeq: 3, workEntries: 3 });
});
test("findTrailingPartialTurn returns null when the last turn completed (assistant entry present)", () => {
const entries = [user("do the thing", 1), toolCall(2), toolResult(3), assistant("done", 4)];
- assert.equal(findTrailingPartialTurn(entries, "do the thing"), null);
+ assert.equal(findTrailingPartialTurn(entries, "run-1"), null);
});
-test("findTrailingPartialTurn returns null when the trailing user entry is a different request", () => {
- const entries = [user("an older abandoned ask", 1), toolCall(2)];
- assert.equal(findTrailingPartialTurn(entries, "build and deploy the release"), null);
+test("findTrailingPartialTurn returns null when the trailing user entry belongs to another run", () => {
+ const entries = [user("an older abandoned ask", 1, "run-0"), toolCall(2)];
+ assert.equal(findTrailingPartialTurn(entries, "run-1"), null);
});
-test("findTrailingPartialTurn returns null for empty input text and empty ledgers", () => {
- assert.equal(findTrailingPartialTurn([user("x", 1)], " "), null);
- assert.equal(findTrailingPartialTurn([], "do the thing"), null);
+test("a trailing steer is not the run's turn", () => {
+ assert.equal(findTrailingPartialTurn([user("do the thing", 1), toolCall(2), steer("also this", 3)], "run-1"), null);
});
test("a trailing resume note from a prior dead resume is skipped, reaching the real user entry", () => {
const entries = [user("build and deploy the release", 1), toolCall(2), resumeEntry(3), toolCall(4)];
- const found = findTrailingPartialTurn(entries, "build and deploy the release");
+ const found = findTrailingPartialTurn(entries, "run-1");
assert.deepEqual(found, { userSeq: 1, workEntries: 2 }, "the note itself is not work");
});
test("an attempt that died before recording ANY work reports workEntries 0", () => {
- const found = findTrailingPartialTurn([user("build and deploy the release", 1)], "build and deploy the release");
+ const found = findTrailingPartialTurn([user("build and deploy the release", 1)], "run-1");
assert.deepEqual(found, { userSeq: 1, workEntries: 0 });
});
test("prior resume notes alone are NOT work — repeated no-work deaths still report 0", () => {
const entries = [user("build and deploy the release", 1), resumeEntry(2)];
- const found = findTrailingPartialTurn(entries, "build and deploy the release");
+ const found = findTrailingPartialTurn(entries, "run-1");
assert.deepEqual(found, { userSeq: 1, workEntries: 0 });
});
@@ -72,13 +71,13 @@ test("platform rails and render-only rows are NOT work — only tool rows replay
ent("text", { text: "on it" }, 4),
ent("delivery", { text: "ack" }, 5),
];
- const found = findTrailingPartialTurn(entries, "build and deploy the release");
+ const found = findTrailingPartialTurn(entries, "run-1");
assert.deepEqual(found, { userSeq: 1, workEntries: 0 });
});
test("a prior no-work retry's restart note is skipped — later retries anchor on the human's entry", () => {
const entries = [user("build and deploy the release", 1), ent("user", { text: LEGACY_NOTE, resumeNote: true }, 2)];
- const found = findTrailingPartialTurn(entries, "build and deploy the release");
+ const found = findTrailingPartialTurn(entries, "run-1");
assert.deepEqual(found, { userSeq: 1, workEntries: 0 }, "provenance stays on the original, not attempt 2's prompt");
});
@@ -89,7 +88,7 @@ test("overheard catch-up rows trailing the dead attempt are skipped, reaching th
overheard("build and deploy the release please someone", 3),
overheard("unrelated chatter", 4),
];
- const found = findTrailingPartialTurn(entries, "build and deploy the release");
+ const found = findTrailingPartialTurn(entries, "run-1");
assert.deepEqual(
found,
{ userSeq: 1, workEntries: 1 },
@@ -99,19 +98,19 @@ test("overheard catch-up rows trailing the dead attempt are skipped, reaching th
test("a session whose only trailing user rows are overheard is NOT a resume", () => {
const entries = [assistant("earlier reply", 1), overheard("build and deploy the release", 2)];
- assert.equal(findTrailingPartialTurn(entries, "build and deploy the release"), null);
+ assert.equal(findTrailingPartialTurn(entries, "run-1"), null);
});
test("an empty-reply completed turn still counts as completed (assistant entry with empty text)", () => {
const entries = [user("do the thing", 1), assistant("", 2)];
- assert.equal(findTrailingPartialTurn(entries, "do the thing"), null);
+ assert.equal(findTrailingPartialTurn(entries, "run-1"), null);
});
test("a resume note in the ledger is skipped by its flag, not its text", () => {
const entries = [user("build and deploy the release", 1), toolCall(2), resumeEntry(3)];
- assert.deepEqual(findTrailingPartialTurn(entries, "build and deploy the release"), { userSeq: 1, workEntries: 1 });
- const typed = [user("build and deploy the release", 1), toolCall(2), user(LEGACY_NOTE, 3)];
- assert.equal(findTrailingPartialTurn(typed, "build and deploy the release"), null, "typed text is a new request");
+ assert.deepEqual(findTrailingPartialTurn(entries, "run-1"), { userSeq: 1, workEntries: 1 });
+ const typed = [user("build and deploy the release", 1), toolCall(2), user(LEGACY_NOTE, 3, "run-2")];
+ assert.equal(findTrailingPartialTurn(typed, "run-1"), null, "typed text is a new request");
});
test("turnAtSeq carries the answer the attempt recorded, so a retry can replay it", () => {
diff --git a/test/turn-retry-replay.test.ts b/test/turn-retry-replay.test.ts
index 15f324ba8..521a2eaa7 100644
--- a/test/turn-retry-replay.test.ts
+++ b/test/turn-retry-replay.test.ts
@@ -351,3 +351,27 @@ test("a first attempt and a no-work retry are never asked to continue", async ()
await orchestrator.handleTurn(input(ASK, { runId: again.id, attempt: 2 }));
assert.deepEqual(continued, [undefined, undefined]);
});
+
+test("a retry resumes its own interrupted turn even when the run never recorded its boundary", async () => {
+ const { orchestrator, runs, continued, input, asks } = buildScenario(true);
+ runs.noteTurnUserSeq = async () => false;
+ const run = (await runs.enqueue({ sessionId: conversation.threadRef, request: input(ASK) })).run;
+ await assert.rejects(orchestrator.handleTurn(input(ASK, { runId: run.id, attempt: 1 })), /interrupted/);
+
+ const retry = await orchestrator.handleTurn(input(ASK, { runId: run.id, attempt: 2 }));
+ assert.equal(retry.status, "ok");
+ assert.deepEqual(continued, [undefined, true]);
+ assert.equal((await asks()).length, 1);
+});
+
+test("a retry does not resume another run's interrupted turn that asked the same thing", async () => {
+ const { orchestrator, runs, continued, input, asks } = buildScenario(true);
+ const first = (await runs.enqueue({ sessionId: conversation.threadRef, request: input(ASK) })).run;
+ await assert.rejects(orchestrator.handleTurn(input(ASK, { runId: first.id, attempt: 1 })), /interrupted/);
+
+ const second = (await runs.enqueue({ sessionId: conversation.threadRef, request: input(ASK) })).run;
+ const retry = await orchestrator.handleTurn(input(ASK, { runId: second.id, attempt: 2 }));
+ assert.equal(retry.status, "ok");
+ assert.deepEqual(continued, [undefined, undefined]);
+ assert.equal((await asks()).length, 2);
+});
diff --git a/test/web-context.test.ts b/test/web-context.test.ts
index 94f97692a..97444e194 100644
--- a/test/web-context.test.ts
+++ b/test/web-context.test.ts
@@ -40,6 +40,7 @@ test("the window carries the person's display text and the agent's DELIVERED pos
["you", "Yes — the main ones are…"],
],
);
+ assert.deepEqual(out.selfTs, [(out.messages[1] as { ts: string }).ts]);
assert.ok(
out.messages.every((m) => (m as { threadTs?: string }).threadTs === ROOT),
"every message is stamped with the thread root so whats_new counts it as here",
@@ -132,7 +133,7 @@ test("answerWebContextRequest reads the log as the asking viewer, refuses gracef
const unknown = await answerWebContextRequest(sessions, { conversationTarget: "web:[email protected]:nope", count: 10 });
assert.ok(unknown.error);
const search = await answerWebContextRequest(sessions, { conversationTarget: TARGET, searchAll: "x", count: 10 });
- assert.equal(search.result?.note, "live-search-unconfigured");
+ assert.equal(search.result?.liveSearch, "unconfigured");
const file = await answerWebContextRequest(sessions, { conversationTarget: TARGET, count: 1, file: { ts: "1" } });
assert.ok(file.error);
});