From 1760b2d4235a595bafa42b86f40e0ce79891bed5 Mon Sep 17 00:00:00 2001 From: Zack Jackson <25274700+ScriptedAlchemy@users.noreply.github.com> Date: Thu, 19 Nov 2026 01:00:34 -0800 Subject: [PATCH 1/4] fix(memory): isolate projects and curate saved memories Bind thread knowledge tools to their project and environment. Add bounded, reversible background memory curation with source and revision validation, project settings, review history, and user-only restoration across clients. --- .../components/ProjectKnowledgeEntry.test.tsx | 24 +- .../src/components/ProjectKnowledgeEntry.tsx | 5 + .../components/ProjectKnowledgeFactDetail.tsx | 23 + .../components/ProjectKnowledgeFactList.tsx | 3 + ...SettingsServerControlsRouteScreen.test.tsx | 54 +- .../SettingsServerControlsRouteScreen.tsx | 24 +- .../src/environment/ServerEnvironment.ts | 1 + apps/server/src/git/GitManager.test.ts | 2 + apps/server/src/mcp/McpToolAccess.ts | 31 + .../knowledge/KnowledgeToolkit.test.ts | 136 +++- .../src/mcp/toolkits/knowledge/handlers.ts | 123 ++-- .../src/mcp/toolkits/knowledge/tools.ts | 6 +- .../ProviderEventIngestor.test.ts | 1 + apps/server/src/persistence/Migrations.ts | 2 + .../Migrations/121_ProjectMemoryCuration.ts | 56 ++ .../externalHistory/ExternalHistory.test.ts | 1 + .../knowledge/AssistedLearning.test.ts | 1 + .../project/knowledge/MemoryCuration.test.ts | 672 ++++++++++++++++++ .../src/project/knowledge/MemoryCuration.ts | 347 +++++++++ .../knowledge/ProjectKnowledge.test.ts | 356 +++++++++- .../src/project/knowledge/ProjectKnowledge.ts | 216 +++++- .../src/project/knowledge/persistence.ts | 47 +- .../src/provider/Drivers/ClaudeDriver.ts | 2 + .../src/provider/Drivers/CodexDriver.ts | 2 + .../provider/Drivers/CodexManagedProvider.ts | 2 + .../providerMaintenanceRunner.test.ts | 1 + apps/server/src/server.ts | 2 + apps/server/src/speech/http.test.ts | 1 + .../ClaudeTextGeneration.test.ts | 18 + .../textGeneration/ClaudeTextGeneration.ts | 5 +- .../CodexTextGeneration.test.ts | 59 ++ .../src/textGeneration/CodexTextGeneration.ts | 11 +- .../src/textGeneration/TextGeneration.test.ts | 109 ++- .../src/textGeneration/TextGeneration.ts | 37 +- .../projectKnowledge/ProjectFactDetail.tsx | 36 +- .../ProjectMemoryInspector.tsx | 18 +- .../ProjectMemoryPanel.browser.test.tsx | 53 ++ .../projectKnowledge/ProjectMemoryPanel.tsx | 15 +- .../src/components/settings/ZackSettings.tsx | 46 +- .../settings/scopedSettings.test.ts | 23 + .../src/components/settings/scopedSettings.ts | 29 +- .../src/components/settings/settingsSearch.ts | 9 + .../settings/useScopedModelAvailability.ts | 1 + docs/user/composer.md | 25 +- docs/user/outside-agents.md | 6 + evals/README.md | 1 + evals/memory-curation/README.md | 14 + evals/memory-curation/cases.ts | 113 +++ evals/memory-curation/grade.test.ts | 39 + evals/memory-curation/grade.ts | 13 + evals/memory-curation/run.ts | 121 ++++ evals/package.json | 3 +- .../src/projectKnowledge/index.test.ts | 19 + .../src/projectKnowledge/index.ts | 44 ++ packages/contracts/src/environment.ts | 1 + packages/contracts/src/projectKnowledge.ts | 24 + packages/contracts/src/server.ts | 1 + packages/contracts/src/settings.ts | 4 + .../src/server/driver.ts | 1 + .../src/server/textGeneration.ts | 24 + .../src/server/textGenerationCuration.ts | 95 +++ .../server/textGenerationOperations.test.ts | 110 +++ .../src/server/textGenerationOperations.ts | 47 +- .../src/server/textGeneration.test.ts | 77 +- .../src/server/textGeneration.ts | 3 +- packages/provider-fx/src/server/driver.ts | 1 + packages/provider-kiro/src/server/driver.ts | 1 + .../src/server/blindEvaluation.ts | 3 +- .../provider-opencode/src/server/driver.ts | 5 + .../src/server/textGeneration.test.ts | 124 ++-- .../src/server/textGeneration.ts | 6 +- .../src/server/v2/textGeneration.test.ts | 106 +-- .../src/server/v2/textGeneration.ts | 5 +- .../src/server/textGeneration.test.ts | 68 +- .../provider-pi/src/server/textGeneration.ts | 4 + 75 files changed, 3441 insertions(+), 277 deletions(-) create mode 100644 apps/server/src/persistence/Migrations/121_ProjectMemoryCuration.ts create mode 100644 apps/server/src/project/knowledge/MemoryCuration.test.ts create mode 100644 apps/server/src/project/knowledge/MemoryCuration.ts create mode 100644 evals/memory-curation/README.md create mode 100644 evals/memory-curation/cases.ts create mode 100644 evals/memory-curation/grade.test.ts create mode 100644 evals/memory-curation/grade.ts create mode 100644 evals/memory-curation/run.ts create mode 100644 packages/provider-core/src/server/textGenerationCuration.ts diff --git a/apps/mobile/src/components/ProjectKnowledgeEntry.test.tsx b/apps/mobile/src/components/ProjectKnowledgeEntry.test.tsx index 5d1b205e7c91f..90506c6fc8260 100644 --- a/apps/mobile/src/components/ProjectKnowledgeEntry.test.tsx +++ b/apps/mobile/src/components/ProjectKnowledgeEntry.test.tsx @@ -23,6 +23,7 @@ import type { SheetProps } from "./ui/Sheet.types"; const state = vi.hoisted(() => ({ uuidSequence: 0, deliveryCapabilities: {} as Record, + curation: false, deliveries: null as unknown, readDeliveries: vi.fn(), focused: true, @@ -165,6 +166,7 @@ vi.mock("../state/server", () => ({ capabilities: { projectKnowledge: true, projectKnowledgeHistory: true, + projectKnowledgeCuration: state.curation, projectKnowledgeDeliveries: state.deliveryCapabilities[environmentId], }, }, @@ -287,9 +289,10 @@ const deliveryRecord: ProjectKnowledgeDeliveries = { }, ], }; -function setup(entries: Array = [scope]) { +function setup(entries: Array = [scope], curation = false) { state.uuidSequence = 0; state.deliveryCapabilities = {}; + state.curation = curation; state.deliveries = null; state.readDeliveries.mockReset(); state.focused = true; @@ -672,8 +675,8 @@ it("forgets a fact only after the permanent-erase warning is confirmed", async ( }); }); -it("marks a superseded fact read-only and lists superseded facts on request", async () => { - using screen = setup(); +it.each([false, true])("handles superseded facts with curation support %s", async (curation) => { + using screen = setup([scope], curation); state.list = { facts: [{ ...fact, supersededBy: ProjectFactId.make("replacement") }], nextCursor: null, @@ -684,6 +687,7 @@ it("marks a superseded fact read-only and lists superseded facts on request", as const labels = [...screen.container.querySelectorAll("button")].map((item) => item.textContent); expect(labels).not.toContain("Edit"); expect(labels).not.toContain("Supersede"); + expect(labels.includes("Restore to recall")).toBe(curation); await screen.click("Back"); expect(state.listInputs.at(-1)).not.toHaveProperty("includeSuperseded"); await act(async () => @@ -692,6 +696,20 @@ it("marks a superseded fact read-only and lists superseded facts on request", as ).click(), ); expect(state.listInputs.at(-1)).toMatchObject({ includeSuperseded: true }); + if (!curation) return; + await screen.click(`Inspect fact: ${fact.content}`); + await screen.click("Restore to recall"); + expect(state.mutate).toHaveBeenCalledWith({ + environmentId: scope.environmentId, + input: { + action: "restore", + commandId: expect.any(String), + projectId: scope.projectId, + factId: fact.id, + expectedRevision: fact.revision, + }, + }); + expect(screen.container.textContent).not.toContain("Restore to recall"); }); it("supersedes a fact with a new replacement and shows the returned conflict hints", async () => { diff --git a/apps/mobile/src/components/ProjectKnowledgeEntry.tsx b/apps/mobile/src/components/ProjectKnowledgeEntry.tsx index 1f58634fa343d..ae3f1e6c868c0 100644 --- a/apps/mobile/src/components/ProjectKnowledgeEntry.tsx +++ b/apps/mobile/src/components/ProjectKnowledgeEntry.tsx @@ -135,6 +135,7 @@ export function ProjectKnowledgeEntry(props: Scope) { history={config.environment.capabilities.projectKnowledgeHistory === true} assisted={config.environment.capabilities.projectKnowledgeAssistedLearning === true} standingCheck={config.environment.capabilities.projectKnowledgeStandingCheck === true} + curation={config.environment.capabilities.projectKnowledgeCuration === true} seedMessage={open.seed} onClose={() => setOpen(null)} /> @@ -146,6 +147,7 @@ function ProjectKnowledgeSheet( readonly history: boolean; readonly assisted: boolean; readonly standingCheck: boolean; + readonly curation: boolean; readonly seedMessage: MessageCitation | null; readonly onClose: () => void; }, @@ -218,6 +220,7 @@ function ProjectKnowledgeSheet( environmentId: props.environmentId, projectId: props.projectId, history: props.history, + curation: props.curation, onArchivedChange: () => { selectionVersion.current += 1; detachDraftReference(); @@ -485,6 +488,7 @@ function ProjectKnowledgeSheet( detail={detailData} detailError={detail.error} history={props.history} + curation={props.curation} sourceUnavailable={ detailData?.sourceUnavailable ?? browse.unavailableReasons.get(inspectedFact.id) ?? @@ -517,6 +521,7 @@ function ProjectKnowledgeSheet( void apply({ action: "forget", ...factMutation(inspectedFact) }), }) } + onRestore={() => void apply({ action: "restore", ...factMutation(inspectedFact) })} onFeedback={(helpful) => void apply({ action: "feedback", helpful, ...factMutation(inspectedFact) }) } diff --git a/apps/mobile/src/components/ProjectKnowledgeFactDetail.tsx b/apps/mobile/src/components/ProjectKnowledgeFactDetail.tsx index b94d17ae18257..085d1c5a9911c 100644 --- a/apps/mobile/src/components/ProjectKnowledgeFactDetail.tsx +++ b/apps/mobile/src/components/ProjectKnowledgeFactDetail.tsx @@ -17,9 +17,11 @@ import type { import { messageAuthorLabel } from "@t3tools/client-runtime/conversationSummaries"; import { KNOWLEDGE_SOURCE_UNAVAILABLE_LABEL, + canRestoreFactToRecall, isSupersededFact, knowledgeConflictHintLabel, knowledgeOriginLabel, + memoryCurationRunLabel, projectFactVerdictLabel, projectFactHistoryLabel, } from "@t3tools/client-runtime/projectKnowledge"; @@ -96,6 +98,9 @@ function HistoryRow(props: { readonly entry: ProjectFactHistoryEntry }) { Trust {entry.trustBefore.toFixed(2)} → {entry.trustAfter.toFixed(2)} ) : null} + {entry.reason ? ( + {entry.reason} + ) : null} {content !== null ? ( {content.length > REVISION_PREVIEW_LENGTH @@ -118,6 +123,7 @@ export function ProjectFactInspector(props: { readonly detail: ProjectKnowledgeFactDetail | null; readonly detailError: string | null; readonly history: boolean; + readonly curation: boolean; readonly sourceUnavailable: KnowledgeSourceUnavailableReason | null; readonly hints: ReadonlyArray; readonly selection: KnowledgeSelectionState | null; @@ -129,6 +135,7 @@ export function ProjectFactInspector(props: { readonly onOpenFact: OpenFact; readonly onEdit: (mode: "edit" | "supersede") => void; readonly onForget: () => void; + readonly onRestore: () => void; readonly onFeedback: (helpful: boolean) => void; readonly onDismissHints: () => void; }) { @@ -203,6 +210,14 @@ export function ProjectFactInspector(props: { {active ? ( + {props.curation && canRestoreFactToRecall(fact) ? ( + + ) : null} {/* The server rejects revisions of a superseded fact; its replacement is the one to change. */} {!superseded ? (