Skip to content

Commit bde1474

Browse files
authored
feat: use pi-memory in projects (#2973)
1 parent 4644373 commit bde1474

17 files changed

Lines changed: 1506 additions & 675 deletions

‎pnpm-lock.yaml‎

Lines changed: 705 additions & 657 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/Project/useRenameProjectAction.test.tsx‎

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import userEvent from "@testing-library/user-event";
33
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
44

55
import { DialogProvider } from "@/providers/DialogProvider/DialogProvider";
6+
import { getProject } from "@/services/projects/projectsService";
67
import type { Project } from "@/services/projects/types";
78
import { useUpdateProject } from "@/services/projects/useProjects";
89

@@ -28,6 +29,10 @@ vi.mock("@/services/projects/useProjects", () => ({
2829
useUpdateProject: vi.fn(),
2930
}));
3031

32+
vi.mock("@/services/projects/projectsService", () => ({
33+
getProject: vi.fn(),
34+
}));
35+
3136
vi.mock("@/hooks/useToastNotification", () => ({
3237
default: () => notify,
3338
}));
@@ -55,10 +60,14 @@ function Subject({ subject }: { subject: Project }) {
5560
return <button onClick={() => void rename()}>Rename project</button>;
5661
}
5762

58-
async function openRename(overrides: Partial<Project> = {}) {
63+
async function openRename(
64+
overrides: Partial<Project> = {},
65+
latest: Partial<Project> = overrides,
66+
) {
5967
vi.mocked(useUpdateProject).mockReturnValue({
6068
mutate,
6169
} as unknown as ReturnType<typeof useUpdateProject>);
70+
vi.mocked(getProject).mockResolvedValue({ ...project, ...latest });
6271

6372
const user = userEvent.setup();
6473
render(
@@ -70,12 +79,22 @@ async function openRename(overrides: Partial<Project> = {}) {
7079
return user;
7180
}
7281

73-
async function renameTo(name: string, overrides: Partial<Project> = {}) {
74-
const user = await openRename(overrides);
75-
82+
async function submitName(
83+
user: ReturnType<typeof userEvent.setup>,
84+
name: string,
85+
) {
7686
await user.clear(screen.getByLabelText("Name"));
7787
await user.type(screen.getByLabelText("Name"), name);
7888
await user.click(screen.getByRole("button", { name: "Rename" }));
89+
}
90+
91+
async function renameTo(
92+
name: string,
93+
overrides: Partial<Project> = {},
94+
latest: Partial<Project> = overrides,
95+
) {
96+
const user = await openRename(overrides, latest);
97+
await submitName(user, name);
7998

8099
await waitFor(() => expect(mutate).toHaveBeenCalled());
81100
}
@@ -117,6 +136,45 @@ describe("useRenameProjectAction", () => {
117136
);
118137
});
119138

139+
/** A stale copy would drop keys written since, like the shared folder id. */
140+
it("keeps metadata written since the project was loaded", async () => {
141+
await renameTo(
142+
"Churn model v2",
143+
{ metadata: { provisionalName: true } },
144+
{
145+
metadata: { provisionalName: true, tangentSharedFolderId: "folder-1" },
146+
},
147+
);
148+
149+
expect(getProject).toHaveBeenCalledWith("project-1");
150+
expect(mutate).toHaveBeenCalledWith(
151+
{
152+
id: "project-1",
153+
input: {
154+
name: "Churn model v2",
155+
metadata: { tangentSharedFolderId: "folder-1" },
156+
},
157+
},
158+
expect.anything(),
159+
);
160+
});
161+
162+
it("leaves the project alone when it cannot be re-read", async () => {
163+
const consoleError = vi
164+
.spyOn(console, "error")
165+
.mockImplementation(() => {});
166+
const user = await openRename();
167+
vi.mocked(getProject).mockRejectedValue(new Error("down"));
168+
169+
await submitName(user, "Churn model v2");
170+
171+
await waitFor(() =>
172+
expect(notify).toHaveBeenCalledWith("Failed to update project", "error"),
173+
);
174+
expect(mutate).not.toHaveBeenCalled();
175+
consoleError.mockRestore();
176+
});
177+
120178
it("says so once the rename lands", async () => {
121179
await renameTo("Churn model v2");
122180

‎src/components/Project/useRenameProjectAction.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import useToastNotification from "@/hooks/useToastNotification";
66
import { useAnalytics } from "@/providers/AnalyticsProvider";
77
import { useDialog } from "@/providers/DialogProvider/hooks/useDialog";
88
import { convertCancelErrorTo } from "@/providers/DialogProvider/utils";
9+
import { getProject } from "@/services/projects/projectsService";
910
import { withoutProvisionalName } from "@/services/projects/provisionalName";
1011
import type { Project } from "@/services/projects/types";
1112
import { useUpdateProject } from "@/services/projects/useProjects";
@@ -35,14 +36,24 @@ export function useRenameProjectAction(project: Project): () => Promise<void> {
3536

3637
if (!name) return;
3738

39+
// The PATCH replaces the whole metadata object, and the cached copy may
40+
// predate keys written since (such as Tangent's shared folder id).
41+
const latest = await getProject(project.id).catch((error: unknown) => {
42+
console.error("Failed to read the project before renaming it", error);
43+
notify("Failed to update project", "error");
44+
return undefined;
45+
});
46+
47+
if (!latest) return;
48+
3849
updateProject.mutate(
3950
{
4051
id: project.id,
4152
input: {
4253
name,
4354
// A name someone typed is a deliberate one, so the agent stops
4455
// offering to replace it.
45-
metadata: withoutProvisionalName(project.metadata),
56+
metadata: withoutProvisionalName(latest.metadata),
4657
},
4758
},
4859
{

‎src/routes/v2/pages/Tangent/context/TangentProjectContext.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import useToastNotification from "@/hooks/useToastNotification";
1010
import { useBackfillSessionTags } from "@/routes/v2/pages/Tangent/hooks/useBackfillSessionTags";
1111
import { usePrepareProjectArrival } from "@/routes/v2/pages/Tangent/hooks/usePrepareProjectArrival";
1212
import { useProjectSessions } from "@/routes/v2/pages/Tangent/hooks/useProjectSessions";
13+
import { useProjectSharedFolder } from "@/routes/v2/pages/Tangent/hooks/useProjectSharedFolder";
1314
import { useRemoteEnvAuthToken } from "@/routes/v2/pages/Tangent/hooks/useRemoteEnvAuthToken";
1415
import { useTangentBaseUrl } from "@/routes/v2/pages/Tangent/hooks/useTangentBaseUrl";
1516
import { TangentProjectStore } from "@/routes/v2/pages/Tangent/store/TangentProjectStore";
@@ -41,6 +42,7 @@ export function TangentProjectProvider({
4142
detachSession,
4243
renameSession,
4344
} = useProjectSessions(projectId);
45+
const ensureSharedFolderId = useProjectSharedFolder(projectId);
4446
const [store] = useState(() => new TangentProjectStore(projectId));
4547
const storage = usePipelineStorage();
4648
const queryClient = useQueryClient();
@@ -61,6 +63,7 @@ export function TangentProjectProvider({
6163
if (!session || session.name || !name) return;
6264
await renameSession(session.resourceId, name);
6365
},
66+
ensureSharedFolderId,
6467
notify,
6568
projectInstructions: instructions,
6669
});
@@ -71,6 +74,7 @@ export function TangentProjectProvider({
7174
detachSession,
7275
renameSession,
7376
sessions,
77+
ensureSharedFolderId,
7478
notify,
7579
instructions,
7680
]);

‎src/routes/v2/pages/Tangent/hooks/usePrepareProjectArrival.test.tsx‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
66
import { useAiProviderSettings } from "@/hooks/useAiProviderSettings";
77
import { createNewPipeline } from "@/routes/v2/pages/Editor/components/EditorMenuBar/components/fileMenu.actions";
88
import type { TangentProjectStore } from "@/routes/v2/pages/Tangent/store/TangentProjectStore";
9+
import { getProject } from "@/services/projects/projectsService";
910
import { startingSessionMetadata } from "@/services/projects/startingSession";
1011
import type {
1112
Project,
@@ -37,6 +38,10 @@ vi.mock("@/services/projects/useProjects", () => ({
3738
useUpdateProject: () => ({ mutateAsync: updateProject }),
3839
}));
3940

41+
vi.mock("@/services/projects/projectsService", () => ({
42+
getProject: vi.fn(),
43+
}));
44+
4045
vi.mock("@/services/projects/useProjectResources", () => ({
4146
useProjectResources: vi.fn(),
4247
useCreateProjectResource: () => ({ mutateAsync: createResource }),
@@ -113,6 +118,7 @@ function given({
113118
vi.mocked(useProject).mockReturnValue({
114119
data: { ...project, ...projectOverrides },
115120
} as unknown as ReturnType<typeof useProject>);
121+
vi.mocked(getProject).mockResolvedValue({ ...project, ...projectOverrides });
116122
vi.mocked(useProjectResources).mockReturnValue({
117123
data: { items: documents },
118124
} as unknown as ReturnType<typeof useProjectResources>);
@@ -335,6 +341,31 @@ describe("usePrepareProjectArrival", () => {
335341
);
336342
});
337343

344+
/** Starting the session saves the project's shared folder onto it. */
345+
it("keeps what starting the session wrote when it clears the ask", async () => {
346+
given({
347+
projectOverrides: {
348+
metadata: startingSessionMetadata({ prompt: "Fix run 7" }),
349+
},
350+
});
351+
vi.mocked(getProject).mockResolvedValue({
352+
...project,
353+
metadata: {
354+
...startingSessionMetadata({ prompt: "Fix run 7" }),
355+
tangentSharedFolderId: "folder-1",
356+
},
357+
});
358+
359+
prepare(makeStore(), 2);
360+
361+
await waitFor(() =>
362+
expect(updateProject).toHaveBeenCalledWith({
363+
id: "project-1",
364+
input: { metadata: { tangentSharedFolderId: "folder-1" } },
365+
}),
366+
);
367+
});
368+
338369
/**
339370
* An ask left on the project and never arrived for would otherwise open
340371
* whichever session is started there next, days later or by someone else.

‎src/routes/v2/pages/Tangent/hooks/usePrepareProjectArrival.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
pipelineFileTarget,
2020
remoteResourceTarget,
2121
} from "@/services/projects/pipelineResource";
22+
import { getProject } from "@/services/projects/projectsService";
2223
import { MAX_PAGE_SIZE } from "@/services/projects/queryDefaults";
2324
import {
2425
describeResource,
@@ -124,12 +125,15 @@ export function usePrepareProjectArrival(
124125
// it, is housekeeping that stops the next arrival repeating it. The
125126
// session has already started, so a refusal here must not cost the
126127
// caller the pipeline and the workarea they came for — it is left for
127-
// the next arrival to try again.
128+
// the next arrival to try again. The metadata is re-read because
129+
// starting the session may have written to it, and the PATCH replaces
130+
// the whole object.
128131
if (waiting) {
129132
try {
133+
const latest = await getProject(projectId);
130134
await updateProject({
131135
id: projectId,
132-
input: { metadata: withoutStartingSession(project?.metadata) },
136+
input: { metadata: withoutStartingSession(latest.metadata) },
133137
});
134138
} catch (error) {
135139
console.error(

0 commit comments

Comments
 (0)