Skip to content

Refactor/Zero shell-only mutators #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
urjitc merged 2 commits into from
Apr 18, 2026
Merged

Refactor/Zero shell-only mutators #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1194732
Optimize Zero mutators to eliminate unnecessary content writes
urjitc Apr 18, 2026
5d3d687
fix: type-safe updateShellOnly — cast to satisfy Zero's ReadonlyJSONV…
urjitc Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/contexts/WorkspaceContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useWorkspaceStore } from "@/lib/stores/workspace-store";
* - Workspace list: WorkspaceContext (this file)
* - Current workspace & save status: Zustand (workspace-store.ts)
* - UI state: Zustand (ui-store.ts)
* - Workspace data: Event sourcing + React Query
* - Workspace data: Zero sync + React Query
*/
interface WorkspaceContextType {
// Workspace list
Expand Down
47 changes: 0 additions & 47 deletions src/lib/db/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,53 +247,6 @@ export const userProfiles = pgTable(
],
);

// Retained temporarily for operational safety; runtime current-state reads no longer use snapshots.
export const workspaceSnapshots = pgTable(
"workspace_snapshots",
{
id: uuid().defaultRandom().primaryKey().notNull(),
workspaceId: uuid("workspace_id").notNull(),
snapshotVersion: integer("snapshot_version").notNull(),
state: jsonb().notNull(),
eventCount: integer("event_count").notNull(),
createdAt: timestamp("created_at", {
withTimezone: true,
mode: "string",
}).defaultNow(),
},
(table) => [
index("idx_workspace_snapshots_version").using(
"btree",
table.workspaceId.asc().nullsLast().op("uuid_ops"),
table.snapshotVersion.desc().nullsFirst().op("int4_ops"),
),
index("idx_workspace_snapshots_workspace").using(
"btree",
table.workspaceId.asc().nullsLast().op("uuid_ops"),
),
foreignKey({
columns: [table.workspaceId],
foreignColumns: [workspaces.id],
name: "workspace_snapshots_workspace_id_fkey",
}).onDelete("cascade"),
unique("workspace_snapshots_workspace_id_snapshot_version_key").on(
table.workspaceId,
table.snapshotVersion,
),
pgPolicy("Service role can insert workspace snapshots", {
as: "permissive",
for: "insert",
to: ["public"],
withCheck: sql`true`,
}),
pgPolicy("Users can read workspace snapshots they have access to", {
as: "permissive",
for: "select",
to: ["public"],
}),
],
);

const workspaceItemsReadAccessSql = sql`(EXISTS ( SELECT 1
Comment thread
capy-ai[bot] marked this conversation as resolved.
FROM workspaces
WHERE ((workspaces.id = workspace_items.workspace_id) AND (workspaces.user_id = (auth.jwt() ->> 'sub'::text))))) OR (EXISTS ( SELECT 1
Expand Down
116 changes: 39 additions & 77 deletions src/lib/zero/mutators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,33 @@ async function upsertItem(
);
}

async function updateShellOnly(
tx: ZeroTx,
params: {
workspaceId: string;
itemId: string;
shellChanges: Partial<{
layout: Item["layout"];
folderId: string | undefined;
lastModified: number;
}>;
},
) {
await tx.mutate.workspace_items.update({
workspaceId: params.workspaceId,
itemId: params.itemId,
...("layout" in params.shellChanges
? { layout: params.shellChanges.layout ?? null }
: {}),
...("folderId" in params.shellChanges
? { folderId: params.shellChanges.folderId ?? null }
: {}),
...(params.shellChanges.lastModified !== undefined
? { lastModified: params.shellChanges.lastModified }
: {}),
} as Parameters<typeof tx.mutate.workspace_items.update>[0]);
}

async function deleteItemById(
tx: ZeroTx,
params: {
Expand Down Expand Up @@ -386,25 +413,12 @@ async function deleteItemById(
.where("workspaceId", params.workspaceId)
.where("folderId", params.itemId),
);

const now = Date.now();

for (const child of children) {
const loadedChild = await loadItem(tx, {
await updateShellOnly(tx, {
workspaceId: params.workspaceId,
itemId: child.itemId,
});

if (!loadedChild) {
continue;
}

await upsertItem(tx, {
workspaceId: params.workspaceId,
userId: null,
sourceVersion: loadedChild.sourceVersion,
item: {
...loadedChild.item,
shellChanges: {
folderId: undefined,
layout: undefined,
lastModified: now,
Expand Down Expand Up @@ -545,23 +559,10 @@ export const mutators = defineMutators({
const now = Date.now();

for (const layoutUpdate of args.layoutUpdates) {
const existing = await loadItem(tx, {
await updateShellOnly(tx, {
workspaceId: args.workspaceId,
itemId: layoutUpdate.id,
});

if (!existing) {
throw new ApplicationError(
`Workspace item ${layoutUpdate.id} was not found.`,
);
}

await upsertItem(tx, {
workspaceId: args.workspaceId,
userId: ctx.userId,
sourceVersion: existing.sourceVersion,
item: {
...existing.item,
shellChanges: {
layout: {
x: layoutUpdate.x,
y: layoutUpdate.y,
Expand All @@ -577,24 +578,11 @@ export const mutators = defineMutators({
),
move: defineMutator(
zeroMutatorSchemas.item.move,
async ({ tx, ctx, args }) => {
const existing = await loadItem(tx, {
async ({ tx, args }) => {
await updateShellOnly(tx, {
workspaceId: args.workspaceId,
itemId: args.itemId,
});

if (!existing) {
throw new ApplicationError(
`Workspace item ${args.itemId} was not found.`,
);
}

await upsertItem(tx, {
workspaceId: args.workspaceId,
userId: ctx.userId,
sourceVersion: existing.sourceVersion,
item: {
...existing.item,
shellChanges: {
folderId: args.folderId ?? undefined,
layout: undefined,
lastModified: Date.now(),
Expand All @@ -604,27 +592,14 @@ export const mutators = defineMutators({
),
moveMany: defineMutator(
zeroMutatorSchemas.item.moveMany,
async ({ tx, ctx, args }) => {
async ({ tx, args }) => {
const now = Date.now();

for (const itemId of args.itemIds) {
const existing = await loadItem(tx, {
await updateShellOnly(tx, {
workspaceId: args.workspaceId,
itemId,
});

if (!existing) {
throw new ApplicationError(
`Workspace item ${itemId} was not found.`,
);
}

await upsertItem(tx, {
workspaceId: args.workspaceId,
userId: ctx.userId,
sourceVersion: existing.sourceVersion,
item: {
...existing.item,
shellChanges: {
folderId: args.folderId ?? undefined,
layout: undefined,
lastModified: now,
Expand All @@ -651,23 +626,10 @@ export const mutators = defineMutators({
});

for (const itemId of args.itemIds) {
const existing = await loadItem(tx, {
await updateShellOnly(tx, {
workspaceId: args.workspaceId,
itemId,
});

if (!existing) {
throw new ApplicationError(
`Workspace item ${itemId} was not found.`,
);
}

await upsertItem(tx, {
workspaceId: args.workspaceId,
userId: ctx.userId,
sourceVersion: existing.sourceVersion,
item: {
...existing.item,
shellChanges: {
folderId: args.folder.id,
layout: undefined,
lastModified: now,
Expand Down
26 changes: 19 additions & 7 deletions src/lib/zero/server-mutators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,26 @@ export const serverMutators = defineMutators(sharedMutators, {
sharedMutators.item.patchMany,
(args) => args.updates.map((update) => update.id),
),
updateMany: withAuth(
updateMany: defineMutator(
zeroMutatorSchemas.item.updateMany,
sharedMutators.item.updateMany,
(args) => [
...(args.deletedIds ?? []),
...(args.addedItems ?? []).map((item) => item.id),
...(args.layoutUpdates ?? []).map((update) => update.id),
],
async ({ tx, ctx, args }) => {
const wrappedTx = getWrappedTransaction(tx as ServerZeroTx);
await assertWorkspaceWriteAccess(wrappedTx, args.workspaceId, ctx.userId);
await sharedMutators.item.updateMany.fn({ tx, ctx, args });

const contentAffectedIds = [
...(args.deletedIds ?? []),
...(args.addedItems ?? []).map((item) => item.id),
];

if (contentAffectedIds.length > 0) {
await syncExtractedRows(wrappedTx, {
workspaceId: args.workspaceId,
itemIds: [...new Set(contentAffectedIds)],
userId: ctx.userId,
});
}
},
),
move: withAuthOnly(zeroMutatorSchemas.item.move, sharedMutators.item.move),
moveMany: withAuthOnly(
Expand Down