forked from farhoodlabs/paperclip
e89076148a
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - That operator experience depends not just on issue chat, but also on how workspaces, inbox groups, and navigation state behave over long-running sessions > - The current branch included a separate cluster of workspace-runtime controls, inbox grouping, sidebar ordering, and worktree lifecycle fixes > - Those changes cross server, shared contracts, database state, and UI navigation, but they still form one coherent operator workflow area > - This pull request isolates the workspace/runtime and navigation ergonomics work into one standalone branch > - The benefit is better workspace recovery and navigation persistence without forcing reviewers through the unrelated issue-detail/chat work ## What Changed - Improved execution workspace and project workspace controls, request wiring, layout, and JSON editor ergonomics - Hardened linked worktree reuse/startup behavior and documented the `worktree repair` flow for recovering linked worktrees safely - Added inbox workspace grouping, mobile collapse, archive undo, keyboard navigation, shared group-header styling, and persisted collapsed-group behavior - Added persistent sidebar order preferences with the supporting DB migration, shared/server contracts, routes, services, hooks, and UI integration - Scoped issue-list preferences by context and added targeted UI/server tests for workspace controls, inbox behavior, sidebar preferences, and worktree validation ## Verification - `pnpm vitest run server/src/__tests__/sidebar-preferences-routes.test.ts ui/src/pages/Inbox.test.tsx ui/src/components/ProjectWorkspaceSummaryCard.test.tsx ui/src/components/WorkspaceRuntimeControls.test.tsx ui/src/api/workspace-runtime-control.test.ts` - `server/src/__tests__/workspace-runtime.test.ts` was attempted, but the embedded Postgres suite self-skipped/hung on this host after reporting an init-script issue, so it is not counted as a local pass here ## Risks - Medium: this branch includes migration-backed preference storage plus worktree/runtime behavior, so merge review should pay attention to state persistence and worktree recovery semantics - The sidebar preference migration is standalone, but it should still be watched for conflicts if another migration lands first ## Model Used - OpenAI Codex coding agent (GPT-5-class runtime in Codex CLI; exact deployed model ID is not exposed in this environment), reasoning enabled, tool use and local code execution enabled ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [ ] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [ ] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
124 lines
4.9 KiB
TypeScript
124 lines
4.9 KiB
TypeScript
import { z } from "zod";
|
|
import { PROJECT_STATUSES } from "../constants.js";
|
|
import { envConfigSchema } from "./secret.js";
|
|
|
|
const executionWorkspaceStrategySchema = z
|
|
.object({
|
|
type: z.enum(["project_primary", "git_worktree", "adapter_managed", "cloud_sandbox"]).optional(),
|
|
baseRef: z.string().optional().nullable(),
|
|
branchTemplate: z.string().optional().nullable(),
|
|
worktreeParentDir: z.string().optional().nullable(),
|
|
provisionCommand: z.string().optional().nullable(),
|
|
teardownCommand: z.string().optional().nullable(),
|
|
})
|
|
.strict();
|
|
|
|
export const projectExecutionWorkspacePolicySchema = z
|
|
.object({
|
|
enabled: z.boolean(),
|
|
defaultMode: z.enum(["shared_workspace", "isolated_workspace", "operator_branch", "adapter_default"]).optional(),
|
|
allowIssueOverride: z.boolean().optional(),
|
|
defaultProjectWorkspaceId: z.string().uuid().optional().nullable(),
|
|
workspaceStrategy: executionWorkspaceStrategySchema.optional().nullable(),
|
|
workspaceRuntime: z.record(z.unknown()).optional().nullable(),
|
|
branchPolicy: z.record(z.unknown()).optional().nullable(),
|
|
pullRequestPolicy: z.record(z.unknown()).optional().nullable(),
|
|
runtimePolicy: z.record(z.unknown()).optional().nullable(),
|
|
cleanupPolicy: z.record(z.unknown()).optional().nullable(),
|
|
})
|
|
.strict();
|
|
|
|
export const projectWorkspaceRuntimeConfigSchema = z.object({
|
|
workspaceRuntime: z.record(z.unknown()).optional().nullable(),
|
|
desiredState: z.enum(["running", "stopped"]).optional().nullable(),
|
|
serviceStates: z.record(z.enum(["running", "stopped"])).optional().nullable(),
|
|
}).strict();
|
|
|
|
const projectWorkspaceSourceTypeSchema = z.enum(["local_path", "git_repo", "remote_managed", "non_git_path"]);
|
|
const projectWorkspaceVisibilitySchema = z.enum(["default", "advanced"]);
|
|
|
|
const projectWorkspaceFields = {
|
|
name: z.string().min(1).optional(),
|
|
sourceType: projectWorkspaceSourceTypeSchema.optional(),
|
|
cwd: z.string().min(1).optional().nullable(),
|
|
repoUrl: z.string().url().optional().nullable(),
|
|
repoRef: z.string().optional().nullable(),
|
|
defaultRef: z.string().optional().nullable(),
|
|
visibility: projectWorkspaceVisibilitySchema.optional(),
|
|
setupCommand: z.string().optional().nullable(),
|
|
cleanupCommand: z.string().optional().nullable(),
|
|
remoteProvider: z.string().optional().nullable(),
|
|
remoteWorkspaceRef: z.string().optional().nullable(),
|
|
sharedWorkspaceKey: z.string().optional().nullable(),
|
|
metadata: z.record(z.unknown()).optional().nullable(),
|
|
runtimeConfig: projectWorkspaceRuntimeConfigSchema.optional().nullable(),
|
|
};
|
|
|
|
function validateProjectWorkspace(value: Record<string, unknown>, ctx: z.RefinementCtx) {
|
|
const sourceType = value.sourceType ?? "local_path";
|
|
const hasCwd = typeof value.cwd === "string" && value.cwd.trim().length > 0;
|
|
const hasRepo = typeof value.repoUrl === "string" && value.repoUrl.trim().length > 0;
|
|
const hasRemoteRef = typeof value.remoteWorkspaceRef === "string" && value.remoteWorkspaceRef.trim().length > 0;
|
|
|
|
if (sourceType === "remote_managed") {
|
|
if (!hasRemoteRef && !hasRepo) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
message: "Remote-managed workspace requires remoteWorkspaceRef or repoUrl.",
|
|
path: ["remoteWorkspaceRef"],
|
|
});
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (!hasCwd && !hasRepo) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
message: "Workspace requires at least one of cwd or repoUrl.",
|
|
path: ["cwd"],
|
|
});
|
|
}
|
|
}
|
|
|
|
export const createProjectWorkspaceSchema = z.object({
|
|
...projectWorkspaceFields,
|
|
isPrimary: z.boolean().optional().default(false),
|
|
}).superRefine(validateProjectWorkspace);
|
|
|
|
export type CreateProjectWorkspace = z.infer<typeof createProjectWorkspaceSchema>;
|
|
|
|
export const updateProjectWorkspaceSchema = z.object({
|
|
...projectWorkspaceFields,
|
|
isPrimary: z.boolean().optional(),
|
|
}).partial();
|
|
|
|
export type UpdateProjectWorkspace = z.infer<typeof updateProjectWorkspaceSchema>;
|
|
|
|
const projectFields = {
|
|
/** @deprecated Use goalIds instead */
|
|
goalId: z.string().uuid().optional().nullable(),
|
|
goalIds: z.array(z.string().uuid()).optional(),
|
|
name: z.string().min(1),
|
|
description: z.string().optional().nullable(),
|
|
status: z.enum(PROJECT_STATUSES).optional().default("backlog"),
|
|
leadAgentId: z.string().uuid().optional().nullable(),
|
|
targetDate: z.string().optional().nullable(),
|
|
color: z.string().optional().nullable(),
|
|
env: envConfigSchema.optional().nullable(),
|
|
executionWorkspacePolicy: projectExecutionWorkspacePolicySchema.optional().nullable(),
|
|
archivedAt: z.string().datetime().optional().nullable(),
|
|
};
|
|
|
|
export const createProjectSchema = z.object({
|
|
...projectFields,
|
|
workspace: createProjectWorkspaceSchema.optional(),
|
|
});
|
|
|
|
export type CreateProject = z.infer<typeof createProjectSchema>;
|
|
|
|
export const updateProjectSchema = z.object(projectFields).partial();
|
|
|
|
export type UpdateProject = z.infer<typeof updateProjectSchema>;
|
|
|
|
export type ProjectExecutionWorkspacePolicy = z.infer<typeof projectExecutionWorkspacePolicySchema>;
|