Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Use session visibility for agent transcript reads (#2009)

Regan Bell75c8f3f01477
diff --git a/src/api/routes/memory-access.ts b/src/api/routes/memory-access.ts
index 83acd00ed..410c38e65 100644
--- a/src/api/routes/memory-access.ts
+++ b/src/api/routes/memory-access.ts
@@ -1,8 +1,3 @@
-import {
- buildMemoryContextSnapshot,
- memoryContextPayload,
- type MemoryContextSnapshot,
-} from "../../memory/context-boundary.ts";
import { disclosedMemory } from "../../memory/disclosure.ts";
import type { MemoryService } from "../../memory/memory-service.ts";
import { parseScopeId, personalScope, type Principal } from "../../types.ts";
@@ -35,26 +30,3 @@ export function memoryForRequest(ctx: ApiCtx, sourcePrincipal?: string): MemoryS
currentScopeMembers: (scope) => ctx.app.currentScopeMembers(scope),
});
}
-
-async function memorySnapshotForRequest(ctx: ApiCtx): Promise<MemoryContextSnapshot | null> {
- const { capability, deps, app } = ctx;
- if (!capability) return null;
- const actor = deps.identity?.classify(capability.actorId) ?? { id: capability.actorId, type: "internal" as const };
- const audience =
- capability.scopeId === personalScope(actor.id) ? [actor] : await app.currentScopeMembers(capability.scopeId);
- if (!audience?.length) return null;
- return buildMemoryContextSnapshot({ targetScope: capability.scopeId, audience });
-}
-
-export async function memoryBoundaryForRequest(ctx: ApiCtx, sessionId: string) {
- try {
- const entries = await ctx.deps.sessions?.getEntries(sessionId);
- const checkpoint = entries?.findLast((entry) => memoryContextPayload(entry));
- const boundary = checkpoint && memoryContextPayload(checkpoint);
- const snapshot = await memorySnapshotForRequest(ctx);
- if (!boundary || !snapshot || boundary.snapshot.audience !== snapshot.audience) return null;
- return { throughSeq: boundary.throughSeq, latestSeq: entries!.at(-1)!.seq };
- } catch {
- return null;
- }
-}
diff --git a/src/api/routes/surface.ts b/src/api/routes/surface.ts
index 26bfa7be8..946c51d6b 100644
--- a/src/api/routes/surface.ts
+++ b/src/api/routes/surface.ts
@@ -1,4 +1,4 @@
-import { memoryForRequest, memoryBoundaryForRequest } from "./memory-access.ts";
+import { memoryForRequest } from "./memory-access.ts";
import { isSessionStatus } from "../../sessions/session-status.ts";
import { suggestedActivityRoutes } from "./suggested-activities.ts";
import { runtimeFallback, runtimeConfigBody, userRuntimeConfigBody, webuiModelEnabled } from "../runtime-config.ts";
@@ -111,6 +111,8 @@ async function forkSession(ctx: ApiCtx): Promise<void> {
function agentConversation(session: Session) {
return {
id: session.id,
+ title: session.title,
+ status: session.status,
type: session.type,
scopeId: session.scopeId,
threadRef: session.threadRef,
@@ -183,12 +185,10 @@ async function getAgentConversation(ctx: ApiCtx): Promise<void> {
}
const found = await app.getSessionForViewer(ctx.params.id!, capability.actorId, window);
if (!found) return sendJson(res, 404, { error: "not_found", message: "not a conversation you can see" });
- const boundary = await memoryBoundaryForRequest(ctx, ctx.params.id!);
- if (!boundary) return sendJson(res, 403, { error: "forbidden" });
return sendJson(res, 200, {
session: agentConversation(found.session),
- entries: found.entries.filter((entry) => entry.seq > boundary.throughSeq && entry.type !== "system"),
- ...(boundary.throughSeq < 0 && found.earlierEntries ? { earlierEntries: found.earlierEntries } : {}),
+ entries: found.entries.filter((entry) => entry.type !== "system"),
+ ...(found.earlierEntries ? { earlierEntries: found.earlierEntries } : {}),
});
}
diff --git a/src/sessions/session-syscalls.ts b/src/sessions/session-syscalls.ts
index 9963a1184..53e157305 100644
--- a/src/sessions/session-syscalls.ts
+++ b/src/sessions/session-syscalls.ts
@@ -1,9 +1,4 @@
-import {
- memoryBoundedEntries,
- memoryContextPayload,
- nextMemoryContext,
- type MemoryContextSnapshot,
-} from "../memory/context-boundary.ts";
+import { memoryContextPayload, type MemoryContextSnapshot } from "../memory/context-boundary.ts";
import { principalDestination } from "../reach/reach.ts";
import type { DeliveryStore } from "../delivery/delivery-store.ts";
import { deliveryCandidatesFor } from "../core/orchestrator/turn-helpers.ts";
@@ -544,11 +539,8 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
return inFlight.length ? "pending" : "idle";
}
- const readableTitles = new Set<string>();
- const visibleTitle = (target: Session) =>
- !binding.memoryContext || readableTitles.has(target.id) ? target.title?.trim() || target.id : target.id;
+ const visibleTitle = (target: Session) => target.title?.trim() || target.id;
async function visibleHistory(target: Session): Promise<SessionEntry[]> {
- readableTitles.delete(target.id);
const audience = binding.request.conversation.audience.length
? binding.request.conversation.audience
: [binding.request.actor];
@@ -557,15 +549,6 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
deps.sessions.visibleEntries(target.id, id),
),
);
- if (binding.memoryContext) {
- const all = await deps.sessions.getEntries(target.id);
- const last = all.findLast((entry) => memoryContextPayload(entry));
- const next = nextMemoryContext(all, binding.memoryContext, all.at(-1)?.seq ?? -1);
- if (next.throughSeq > (last ? memoryContextPayload(last)!.throughSeq : -1)) return [];
- if (next.throughSeq < 0) readableTitles.add(target.id);
- const visible = new Set(memoryBoundedEntries(all).map((entry) => entry.seq));
- for (let i = 0; i < views.length; i++) views[i] = views[i]!.filter((entry) => visible.has(entry.seq));
- }
const allowed = views.slice(1).map((view) => new Set(view.map((entry) => entry.seq)));
return filterHistoryForAudience(
(views[0] ?? []).filter((entry) => allowed.every((seqs) => seqs.has(entry.seq))),
@@ -575,11 +558,6 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
);
}
- async function safeTitle(target: Session): Promise<string> {
- await visibleHistory(target);
- return visibleTitle(target);
- }
-
async function currentCaller(): Promise<OrchestratorInput> {
binding.request.cancel?.throwIfAborted();
if (await sessionRunCancelled(deps.runs, deps.signals, binding.request.runId))
@@ -686,7 +664,7 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
return {
ok: true,
sessionId: existing.id,
- title: await safeTitle(existing),
+ title: visibleTitle(existing),
liveRunsRemaining: Math.max(0, cap - live),
};
if (live >= cap) {
@@ -702,7 +680,7 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
binding.session.channelName,
binding.session.surface ?? binding.request.surface,
);
- const title = existing ? await safeTitle(existing) : input.name?.trim() || autoTitle(task);
+ const title = existing ? visibleTitle(existing) : input.name?.trim() || autoTitle(task);
const meta: SpawnMeta = {
...(caller.origin.kind === "automation"
? {
@@ -823,7 +801,7 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
);
const request = deps.prepareRequest ? await deps.prepareRequest(prepared) : prepared;
assertAudienceCompatible(caller, request);
- const title = await safeTitle(target);
+ const title = visibleTitle(target);
if (input.interrupt) {
if (privateMessage)
return { ok: false, message: "ordinary sessions accept private messages, not interrupts" };
@@ -996,7 +974,7 @@ export function createSessionSyscalls(deps: SessionSyscallDeps): SessionSyscalls
for (const session of recent)
sessions.push({
sessionId: session.id,
- title: binding.memoryContext ? await safeTitle(session) : session.title?.trim() || "Untitled",
+ title: session.title?.trim() || "Untitled",
status: await statusOf(session),
current: session.id === binding.session.id,
});
diff --git a/test/agent-conversations-route.test.ts b/test/agent-conversations-route.test.ts
index 904fe8790..fff6dbee8 100644
--- a/test/agent-conversations-route.test.ts
+++ b/test/agent-conversations-route.test.ts
@@ -72,8 +72,8 @@ describe("agent conversations self-API", async () => {
assert.deepEqual(
(
(await list.json()) as { conversations: Array<{ id: string; status: SessionStatus | null }> }
- ).conversations.find((s) => s.id === mineId)?.status,
- undefined,
+ ).conversations.find((s) => s.id === mineId)?.status ?? null,
+ status,
);
}
});
diff --git a/test/agent-transcript-memory-boundary.test.ts b/test/agent-transcript-memory-boundary.test.ts
index cac59453c..0ad93f3f1 100644
--- a/test/agent-transcript-memory-boundary.test.ts
+++ b/test/agent-transcript-memory-boundary.test.ts
@@ -109,8 +109,8 @@ async function fixture() {
setAudience: (next: Principal[]) => {
audience = next;
},
- get: (query = "") =>
- fetch(`${base}/v1/conversations/${session.id}${query}`, { headers: { "x-agent-capability": token } }),
+ get: (query = "", id = session.id) =>
+ fetch(`${base}/v1/conversations/${id}${query}`, { headers: { "x-agent-capability": token } }),
list: () => fetch(`${base}/v1/conversations`, { headers: { "x-agent-capability": token } }),
post: (suffix: string, body: unknown = {}) =>
fetch(`${base}/v1/conversations/${session.id}${suffix}`, {
@@ -131,7 +131,7 @@ async function fixture() {
}
for (const change of ["remove", "reclassify", "posture", "audience"] as const) {
- test(`agent transcript ${change === "audience" ? "rejects" : "preserves"} retained context after ${change}`, async () => {
+ test(`agent transcript preserves retained context after ${change}`, async () => {
const f = await fixture();
try {
await f.checkpoint();
@@ -147,9 +147,8 @@ for (const change of ["remove", "reclassify", "posture", "audience"] as const) {
{ id: "eve", type: "internal" },
]);
const response = await f.get();
- assert.equal(response.status, change === "audience" ? 403 : 200);
- if (change === "audience") assert.deepEqual(await response.json(), { error: "forbidden" });
- else assert.match(await response.text(), /PRIVATE_SENTINEL/);
+ assert.equal(response.status, 200);
+ assert.match(await response.text(), /PRIVATE_SENTINEL/);
if (change !== "audience") {
const fresh = await f.memoryRead();
assert.equal(fresh.status, 200);
@@ -164,19 +163,49 @@ for (const change of ["remove", "reclassify", "posture", "audience"] as const) {
});
}
-test("agent transcript fails closed for an unknown checkpoint", async () => {
+test("agent transcripts use viewer access for old, cross-scope and project sessions", async () => {
const f = await fixture();
try {
- await f.append("assistant", { text: "PRIVATE_SENTINEL" });
- const response = await f.get();
- assert.equal(response.status, 403);
- assert.deepEqual(await response.json(), { error: "forbidden" });
+ const project = await f.built.app.createProject("alice", "Research");
+ assert.ok(project);
+ const crossScope = await f.built.sessions.getOrCreateByThread("web:alice:old", "dm", HOME);
+ const projectSession = await f.built.sessions.getOrCreateByThread("web:alice:project", "group", project.scopeId);
+ const hidden = await f.built.sessions.getOrCreateByThread("web:mallory:hidden", "dm", "personal:mallory");
+ for (const session of [f.session, crossScope, projectSession, hidden]) {
+ const owner = session.id === hidden.id ? "mallory" : "alice";
+ await f.built.sessions.addParticipant(session.id, owner);
+ if (session.id === f.session.id) await f.append("assistant", { text: "readable history" });
+ else {
+ const { lease: active } = await f.built.sessions.acquireLease(session.id, "turn");
+ assert.ok(active);
+ if (session.id === projectSession.id)
+ await f.built.sessions.append(active, {
+ type: "system",
+ scopeLabel: session.scopeId,
+ payload: {
+ kind: "memory_context",
+ snapshot: buildMemoryContextSnapshot({ targetScope: session.scopeId, audience: [] }),
+ throughSeq: -1,
+ },
+ });
+ await f.built.sessions.append(active, {
+ type: "assistant",
+ scopeLabel: session.scopeId,
+ payload: { text: "readable history" },
+ });
+ await f.built.sessions.releaseLease(active);
+ }
+ const response = await f.get("", session.id);
+ assert.equal(response.status, owner === "alice" ? 200 : 404);
+ if (owner === "alice") assert.match(await response.text(), /readable history/);
+ else assert.doesNotMatch(await response.text(), /readable history/);
+ }
} finally {
await f.close();
}
});
-test("agent transcript enforces durable cutoff through old pages, pins and metadata", async () => {
+test("agent transcript retains viewer-visible history across memory checkpoints", async () => {
const f = await fixture();
try {
await f.checkpoint();
@@ -190,12 +219,13 @@ test("agent transcript enforces durable cutoff through old pages, pins and metad
await f.append("assistant", { text: "SAFE_REPLY" });
const response = await f.get();
assert.equal(response.status, 200);
- const text = await response.text();
- assert.match(text, /SAFE_REPLY/);
- assert.doesNotMatch(text, /PRIVATE_SENTINEL|memory_context|earlierEntries/);
+ const body = (await response.json()) as { entries: unknown[] };
+ assert.match(JSON.stringify(body.entries), /SAFE_REPLY/);
+ assert.match(JSON.stringify(body.entries), /PRIVATE_SENTINEL/);
+ assert.doesNotMatch(JSON.stringify(body.entries), /memory_context/);
const oldPage = await f.get(`?beforeSeq=${old.seq + 1}`);
assert.equal(oldPage.status, 200);
- assert.deepEqual(((await oldPage.json()) as { entries: unknown[] }).entries, []);
+ assert.match(JSON.stringify(((await oldPage.json()) as { entries: unknown[] }).entries), /PRIVATE_SENTINEL/);
assert.match(await (await f.human()).text(), /PRIVATE_SENTINEL/);
} finally {
await f.close();
@@ -233,7 +263,7 @@ test("adding an authorized fact preserves an otherwise compatible checkpoint", a
}
});
-test("agent list and patch responses do not disclose retained titles or statuses", async () => {
+test("agent list and patch responses include viewer-visible titles and statuses", async () => {
const f = await fixture();
try {
await f.built.sessions.updateTitle(f.session.id, "PRIVATE_TITLE");
@@ -242,15 +272,16 @@ test("agent list and patch responses do not disclose retained titles or statuses
assert.equal(listed.status, 200);
const listing = await listed.text();
assert.match(listing, new RegExp(f.session.id));
- assert.doesNotMatch(listing, /PRIVATE_TITLE|PRIVATE_STATUS/);
+ assert.match(listing, /PRIVATE_TITLE/);
+ assert.match(listing, /PRIVATE_STATUS/);
const patch = await f.post("", { archived: true });
assert.equal(patch.status, 200);
- assert.doesNotMatch(await patch.text(), /PRIVATE_TITLE|PRIVATE_STATUS/);
+ assert.match(await patch.text(), /PRIVATE_TITLE/);
const renamed = await f.post("", { title: "safe title" });
assert.equal(renamed.status, 200);
const renamedBody = await renamed.text();
assert.match(renamedBody, /safe title/);
- assert.doesNotMatch(renamedBody, /PRIVATE_STATUS/);
+ assert.match(renamedBody, /PRIVATE_STATUS/);
const cleared = await f.post("", { status: null });
assert.equal(cleared.status, 200);
assert.equal(((await cleared.json()) as { conversation: { status: null } }).conversation.status, null);
diff --git a/test/session-memory-title.test.ts b/test/session-memory-title.test.ts
index 6bcb9bd9c..aa4ebb7c6 100644
--- a/test/session-memory-title.test.ts
+++ b/test/session-memory-title.test.ts
@@ -62,7 +62,7 @@ async function rig(opts?: { treeRunCap?: number }): Promise<Rig> {
};
}
-test("previous-audience child title is not disclosed through session read", async () => {
+test("participant can read child history and title across memory checkpoints", async () => {
const r = await rig();
const child = await r.sessions.getOrCreateByThread("subagent:synthetic", "dm", scope);
await r.sessions.setParentSession(child.id, r.room.id);
@@ -86,9 +86,13 @@ test("previous-audience child title is not disclosed through session read", asyn
await r.sessions.append(lease, { type: "assistant", scopeLabel: scope, payload: { text: "PRIVATE_SENTINEL" } });
await r.sessions.releaseLease(lease);
const result = await r.syscallsFor(r.room).read({ target: child.id });
- assert.doesNotMatch(JSON.stringify(result), /PRIVATE_SENTINEL/);
+ assert.ok(result.ok && result.mode === "tape");
+ assert.equal(result.title, "PRIVATE_SENTINEL");
+ assert.match(result.rendered, /PRIVATE_SENTINEL/);
const listed = await r.syscallsFor(r.room).read({});
- assert.doesNotMatch(JSON.stringify(listed), /PRIVATE_SENTINEL/);
+ assert.ok(listed.ok && listed.mode === "children");
+ assert.equal(listed.children[0]?.title, "PRIVATE_SENTINEL");
+ assert.equal(listed.children[0]?.lastSaid, "PRIVATE_SENTINEL");
});
test("reset source title does not enter fresh child task", async () => {
@@ -118,7 +122,7 @@ test("reset source title does not enter fresh child task", async () => {
const run = (await r.runs.inFlightForThread(child.threadRef))[0]!;
assert.doesNotMatch(run.request.text, /PRIVATE_SENTINEL/);
});
-test("previous-audience child title is not disclosed through session write", async () => {
+test("participant sees child title in session write response", async () => {
const r = await rig();
const opened = await r.syscallsFor(r.room).open({ task: "task", name: "PRIVATE_SENTINEL" });
assert.ok(opened.ok);
@@ -144,5 +148,5 @@ test("previous-audience child title is not disclosed through session write", asy
await r.sessions.append(lease, { type: "assistant", scopeLabel: scope, payload: { text: "PRIVATE_SENTINEL" } });
await r.sessions.releaseLease(lease);
const result = await r.syscallsFor(r.room).write({ target: child.id, text: "generic message" });
- assert.doesNotMatch(JSON.stringify(result), /PRIVATE_SENTINEL/);
+ assert.match(JSON.stringify(result), /PRIVATE_SENTINEL/);
});
diff --git a/test/session-syscalls.test.ts b/test/session-syscalls.test.ts
index fa50c5cc4..e80eb6010 100644
--- a/test/session-syscalls.test.ts
+++ b/test/session-syscalls.test.ts
@@ -1840,7 +1840,7 @@ test("sessions list shows only sidebar sessions the whole audience can see and c
assert.deepEqual(await newAudience.start!({ fork: true }), { ok: false, message: unshareable });
const hidden = await newAudience.list!();
assert.ok(hidden.ok);
- assert.ok(!hidden.sessions.some((s) => s.title === "room"));
+ assert.ok(hidden.sessions.some((s) => s.title === "room"));
const slack = forTurn(true, { surface: "slack" });
for (const out of [
await slack.list!(),