forked from farhoodlabs/paperclip
b9a80dcf22
## Thinking Path > - Paperclip is the control plane for autonomous AI companies. > - V1 needs to stay local-first while also supporting shared, authenticated deployments. > - Human operators need real identities, company membership, invite flows, profile surfaces, and company-scoped access controls. > - Agents and operators also need the existing issue, inbox, workspace, approval, and plugin flows to keep working under those authenticated boundaries. > - This branch accumulated the multi-user implementation, follow-up QA fixes, workspace/runtime refinements, invite UX improvements, release-branch conflict resolution, and review hardening. > - This pull request consolidates that branch onto the current `master` branch as a single reviewable PR. > - The benefit is a complete multi-user implementation path with tests and docs carried forward without dropping existing branch work. ## What Changed - Added authenticated human-user access surfaces: auth/session routes, company user directory, profile settings, company access/member management, join requests, and invite management. - Added invite creation, invite landing, onboarding, logo/branding, invite grants, deduped join requests, and authenticated multi-user E2E coverage. - Tightened company-scoped and instance-admin authorization across board, plugin, adapter, access, issue, and workspace routes. - Added profile-image URL validation hardening, avatar preservation on name-only profile updates, and join-request uniqueness migration cleanup for pending human requests. - Added an atomic member role/status/grants update path so Company Access saves no longer leave partially updated permissions. - Improved issue chat, inbox, assignee identity rendering, sidebar/account/company navigation, workspace routing, and execution workspace reuse behavior for multi-user operation. - Added and updated server/UI tests covering auth, invites, membership, issue workspace inheritance, plugin authz, inbox/chat behavior, and multi-user flows. - Merged current `public-gh/master` into this branch, resolved all conflicts, and verified no `pnpm-lock.yaml` change is included in this PR diff. ## Verification - `pnpm exec vitest run server/src/__tests__/issues-service.test.ts ui/src/components/IssueChatThread.test.tsx ui/src/pages/Inbox.test.tsx` - `pnpm run preflight:workspace-links && pnpm exec vitest run server/src/__tests__/plugin-routes-authz.test.ts` - `pnpm exec vitest run server/src/__tests__/plugin-routes-authz.test.ts server/src/__tests__/workspace-runtime-service-authz.test.ts server/src/__tests__/access-validators.test.ts` - `pnpm exec vitest run server/src/__tests__/authz-company-access.test.ts server/src/__tests__/routines-routes.test.ts server/src/__tests__/sidebar-preferences-routes.test.ts server/src/__tests__/approval-routes-idempotency.test.ts server/src/__tests__/openclaw-invite-prompt-route.test.ts server/src/__tests__/agent-cross-tenant-authz-routes.test.ts server/src/__tests__/routines-e2e.test.ts` - `pnpm exec vitest run server/src/__tests__/auth-routes.test.ts ui/src/pages/CompanyAccess.test.tsx` - `pnpm --filter @paperclipai/shared typecheck && pnpm --filter @paperclipai/db typecheck && pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/shared typecheck && pnpm --filter @paperclipai/server typecheck` - `pnpm --filter @paperclipai/ui typecheck` - `pnpm db:generate` - `npx playwright test --config tests/e2e/playwright.config.ts --list` - Confirmed branch has no uncommitted changes and is `0` commits behind `public-gh/master` before PR creation. - Confirmed no `pnpm-lock.yaml` change is staged or present in the PR diff. ## Risks - High review surface area: this PR contains the accumulated multi-user branch plus follow-up fixes, so reviewers should focus especially on company-boundary enforcement and authenticated-vs-local deployment behavior. - UI behavior changed across invites, inbox, issue chat, access settings, and sidebar navigation; no browser screenshots are included in this branch-consolidation PR. - Plugin install, upgrade, and lifecycle/config mutations now require instance-admin access, which is intentional but may change expectations for non-admin board users. - A join-request dedupe migration rejects duplicate pending human requests before creating unique indexes; deployments with unusual historical duplicates should review the migration behavior. - Company member role/status/grant saves now use a new combined endpoint; older separate endpoints remain for compatibility. - Full production build was not run locally in this heartbeat; CI should cover the full matrix. ## Model Used - OpenAI Codex coding agent, GPT-5-based model, CLI/tool-use environment. Exact deployed model identifier and context window were not exposed by the runtime. ## 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) - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] 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 Note on screenshots: this is a branch-consolidation PR for an already-developed multi-user branch, and no browser screenshots were captured during this heartbeat. --------- Co-authored-by: dotta <dotta@example.com> Co-authored-by: Paperclip <noreply@paperclip.ing> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
315 lines
14 KiB
TypeScript
315 lines
14 KiB
TypeScript
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
import type { ExecutionWorkspace } from "@paperclipai/shared";
|
|
import { Link } from "@/lib/router";
|
|
import { Loader2 } from "lucide-react";
|
|
import { executionWorkspacesApi } from "../api/execution-workspaces";
|
|
import { useToastActions } from "../context/ToastContext";
|
|
import { queryKeys } from "../lib/queryKeys";
|
|
import { formatDateTime, issueUrl } from "../lib/utils";
|
|
import { Button } from "./ui/button";
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from "./ui/dialog";
|
|
|
|
type ExecutionWorkspaceCloseDialogProps = {
|
|
workspaceId: string;
|
|
workspaceName: string;
|
|
currentStatus: ExecutionWorkspace["status"];
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
onClosed?: (workspace: ExecutionWorkspace) => void;
|
|
};
|
|
|
|
function readinessTone(state: "ready" | "ready_with_warnings" | "blocked") {
|
|
if (state === "blocked") {
|
|
return "border-destructive/30 bg-destructive/5 text-destructive";
|
|
}
|
|
if (state === "ready_with_warnings") {
|
|
return "border-amber-500/30 bg-amber-500/10 text-amber-800 dark:text-amber-300";
|
|
}
|
|
return "border-emerald-500/30 bg-emerald-500/10 text-emerald-700 dark:text-emerald-300";
|
|
}
|
|
|
|
export function ExecutionWorkspaceCloseDialog({
|
|
workspaceId,
|
|
workspaceName,
|
|
currentStatus,
|
|
open,
|
|
onOpenChange,
|
|
onClosed,
|
|
}: ExecutionWorkspaceCloseDialogProps) {
|
|
const queryClient = useQueryClient();
|
|
const { pushToast } = useToastActions();
|
|
const actionLabel = currentStatus === "cleanup_failed" ? "Retry close" : "Close workspace";
|
|
|
|
const readinessQuery = useQuery({
|
|
queryKey: queryKeys.executionWorkspaces.closeReadiness(workspaceId),
|
|
queryFn: () => executionWorkspacesApi.getCloseReadiness(workspaceId),
|
|
enabled: open,
|
|
});
|
|
|
|
const closeWorkspace = useMutation({
|
|
mutationFn: () => executionWorkspacesApi.update(workspaceId, { status: "archived" }),
|
|
onSuccess: (workspace) => {
|
|
queryClient.setQueryData(queryKeys.executionWorkspaces.detail(workspace.id), workspace);
|
|
queryClient.invalidateQueries({ queryKey: queryKeys.executionWorkspaces.closeReadiness(workspace.id) });
|
|
pushToast({
|
|
title: currentStatus === "cleanup_failed" ? "Workspace close retried" : "Workspace closed",
|
|
tone: "success",
|
|
});
|
|
onOpenChange(false);
|
|
onClosed?.(workspace);
|
|
},
|
|
onError: (error) => {
|
|
pushToast({
|
|
title: "Failed to close workspace",
|
|
body: error instanceof Error ? error.message : "Unknown error",
|
|
tone: "error",
|
|
});
|
|
},
|
|
});
|
|
|
|
const readiness = readinessQuery.data ?? null;
|
|
const blockingIssues = readiness?.linkedIssues.filter((issue) => !issue.isTerminal) ?? [];
|
|
const otherLinkedIssues = readiness?.linkedIssues.filter((issue) => issue.isTerminal) ?? [];
|
|
const confirmDisabled =
|
|
currentStatus === "archived" ||
|
|
closeWorkspace.isPending ||
|
|
readinessQuery.isLoading ||
|
|
readiness == null ||
|
|
readiness.state === "blocked";
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={(nextOpen) => {
|
|
if (!closeWorkspace.isPending) onOpenChange(nextOpen);
|
|
}}>
|
|
<DialogContent className="max-h-[85vh] overflow-y-auto sm:max-w-2xl">
|
|
<DialogHeader>
|
|
<DialogTitle>{actionLabel}</DialogTitle>
|
|
<DialogDescription className="break-words">
|
|
Archive <span className="font-medium text-foreground">{workspaceName}</span> and clean up any owned workspace
|
|
artifacts. Paperclip keeps the workspace record and issue history, but removes it from active workspace views.
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
{readinessQuery.isLoading ? (
|
|
<div className="flex items-center gap-2 rounded-xl border border-border bg-muted/30 px-4 py-3 text-sm text-muted-foreground">
|
|
<Loader2 className="h-4 w-4 animate-spin" />
|
|
Checking whether this workspace is safe to close...
|
|
</div>
|
|
) : readinessQuery.error ? (
|
|
<div className="rounded-xl border border-destructive/30 bg-destructive/5 px-4 py-3 text-sm text-destructive">
|
|
{readinessQuery.error instanceof Error ? readinessQuery.error.message : "Failed to inspect workspace close readiness."}
|
|
</div>
|
|
) : readiness ? (
|
|
<div className="space-y-4">
|
|
<div className={`rounded-xl border px-4 py-3 text-sm ${readinessTone(readiness.state)}`}>
|
|
<div className="font-medium">
|
|
{readiness.state === "blocked"
|
|
? "Close is blocked"
|
|
: readiness.state === "ready_with_warnings"
|
|
? "Close is allowed with warnings"
|
|
: "Close is ready"}
|
|
</div>
|
|
<div className="mt-1 text-xs opacity-80">
|
|
{readiness.isSharedWorkspace
|
|
? "This is a shared workspace session. Archiving it removes this session record but keeps the underlying project workspace."
|
|
: readiness.git?.workspacePath && readiness.git.repoRoot && readiness.git.workspacePath !== readiness.git.repoRoot
|
|
? "This execution workspace has its own checkout path and can be archived independently."
|
|
: readiness.isProjectPrimaryWorkspace
|
|
? "This execution workspace currently points at the project's primary workspace path."
|
|
: "This workspace is disposable and can be archived."}
|
|
</div>
|
|
</div>
|
|
|
|
{blockingIssues.length > 0 ? (
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Blocking issues</h3>
|
|
<div className="space-y-2">
|
|
{blockingIssues.map((issue) => (
|
|
<div key={issue.id} className="rounded-xl border border-destructive/20 bg-destructive/5 px-4 py-3 text-sm">
|
|
<div className="flex min-w-0 flex-wrap items-center justify-between gap-2">
|
|
<Link to={issueUrl(issue)} className="min-w-0 break-words font-medium hover:underline">
|
|
{issue.identifier ?? issue.id} · {issue.title}
|
|
</Link>
|
|
<span className="text-xs text-muted-foreground">{issue.status}</span>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</section>
|
|
) : null}
|
|
|
|
{readiness.blockingReasons.length > 0 ? (
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Blocking reasons</h3>
|
|
<ul className="space-y-2 text-sm text-muted-foreground">
|
|
{readiness.blockingReasons.map((reason) => (
|
|
<li key={reason} className="break-words rounded-lg border border-destructive/20 bg-destructive/5 px-3 py-2 text-destructive">
|
|
{reason}
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</section>
|
|
) : null}
|
|
|
|
{readiness.warnings.length > 0 ? (
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Warnings</h3>
|
|
<ul className="space-y-2 text-sm text-muted-foreground">
|
|
{readiness.warnings.map((warning) => (
|
|
<li key={warning} className="break-words rounded-lg border border-amber-500/20 bg-amber-500/5 px-3 py-2">
|
|
{warning}
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</section>
|
|
) : null}
|
|
|
|
{readiness.git ? (
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Git status</h3>
|
|
<div className="rounded-xl border border-border bg-muted/20 px-4 py-3 text-sm">
|
|
<div className="grid gap-2 sm:grid-cols-2">
|
|
<div>
|
|
<div className="text-xs uppercase tracking-[0.16em] text-muted-foreground">Branch</div>
|
|
<div className="font-mono text-xs">{readiness.git.branchName ?? "Unknown"}</div>
|
|
</div>
|
|
<div>
|
|
<div className="text-xs uppercase tracking-[0.16em] text-muted-foreground">Base ref</div>
|
|
<div className="font-mono text-xs">{readiness.git.baseRef ?? "Not set"}</div>
|
|
</div>
|
|
<div>
|
|
<div className="text-xs uppercase tracking-[0.16em] text-muted-foreground">Merged into base</div>
|
|
<div>{readiness.git.isMergedIntoBase == null ? "Unknown" : readiness.git.isMergedIntoBase ? "Yes" : "No"}</div>
|
|
</div>
|
|
<div>
|
|
<div className="text-xs uppercase tracking-[0.16em] text-muted-foreground">Ahead / behind</div>
|
|
<div>
|
|
{(readiness.git.aheadCount ?? 0).toString()} / {(readiness.git.behindCount ?? 0).toString()}
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div className="text-xs uppercase tracking-[0.16em] text-muted-foreground">Dirty tracked files</div>
|
|
<div>{readiness.git.dirtyEntryCount}</div>
|
|
</div>
|
|
<div>
|
|
<div className="text-xs uppercase tracking-[0.16em] text-muted-foreground">Untracked files</div>
|
|
<div>{readiness.git.untrackedEntryCount}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</section>
|
|
) : null}
|
|
|
|
{otherLinkedIssues.length > 0 ? (
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Other linked issues</h3>
|
|
<div className="space-y-2">
|
|
{otherLinkedIssues.map((issue) => (
|
|
<div key={issue.id} className="rounded-xl border border-border bg-muted/20 px-4 py-3 text-sm">
|
|
<div className="flex min-w-0 flex-wrap items-center justify-between gap-2">
|
|
<Link to={issueUrl(issue)} className="min-w-0 break-words font-medium hover:underline">
|
|
{issue.identifier ?? issue.id} · {issue.title}
|
|
</Link>
|
|
<span className="text-xs text-muted-foreground">{issue.status}</span>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</section>
|
|
) : null}
|
|
|
|
{readiness.runtimeServices.length > 0 ? (
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Attached runtime services</h3>
|
|
<div className="space-y-2">
|
|
{readiness.runtimeServices.map((service) => (
|
|
<div key={service.id} className="rounded-xl border border-border bg-muted/20 px-4 py-3 text-sm">
|
|
<div className="flex min-w-0 flex-wrap items-center justify-between gap-2">
|
|
<span className="font-medium">{service.serviceName}</span>
|
|
<span className="text-xs text-muted-foreground">{service.status} · {service.lifecycle}</span>
|
|
</div>
|
|
<div className="mt-1 break-words text-xs text-muted-foreground">
|
|
{service.url ?? service.command ?? service.cwd ?? "No additional details"}
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</section>
|
|
) : null}
|
|
|
|
<section className="space-y-2">
|
|
<h3 className="text-sm font-medium">Cleanup actions</h3>
|
|
<div className="space-y-2">
|
|
{readiness.plannedActions.map((action, index) => (
|
|
<div key={`${action.kind}-${index}`} className="rounded-xl border border-border bg-muted/20 px-4 py-3 text-sm">
|
|
<div className="font-medium">{action.label}</div>
|
|
<div className="mt-1 break-words text-muted-foreground">{action.description}</div>
|
|
{action.command ? (
|
|
<pre className="mt-2 whitespace-pre-wrap break-all rounded-lg bg-background px-3 py-2 font-mono text-xs text-foreground">
|
|
{action.command}
|
|
</pre>
|
|
) : null}
|
|
</div>
|
|
))}
|
|
</div>
|
|
</section>
|
|
|
|
{currentStatus === "cleanup_failed" ? (
|
|
<div className="rounded-xl border border-amber-500/20 bg-amber-500/5 px-4 py-3 text-sm text-muted-foreground">
|
|
Cleanup previously failed on this workspace. Retrying close will rerun the cleanup flow and update the
|
|
workspace status if it succeeds.
|
|
</div>
|
|
) : null}
|
|
|
|
{currentStatus === "archived" ? (
|
|
<div className="rounded-xl border border-border bg-muted/20 px-4 py-3 text-sm text-muted-foreground">
|
|
This workspace is already archived.
|
|
</div>
|
|
) : null}
|
|
|
|
{readiness.git?.repoRoot ? (
|
|
<div className="break-words text-xs text-muted-foreground">
|
|
Repo root: <span className="font-mono break-all">{readiness.git.repoRoot}</span>
|
|
{readiness.git.workspacePath ? (
|
|
<>
|
|
{" · "}Workspace path: <span className="font-mono break-all">{readiness.git.workspacePath}</span>
|
|
</>
|
|
) : null}
|
|
</div>
|
|
) : null}
|
|
|
|
<div className="text-xs text-muted-foreground">
|
|
Last checked {formatDateTime(new Date())}
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
<DialogFooter>
|
|
<Button
|
|
variant="outline"
|
|
onClick={() => onOpenChange(false)}
|
|
disabled={closeWorkspace.isPending}
|
|
>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
variant={currentStatus === "cleanup_failed" ? "default" : "destructive"}
|
|
onClick={() => closeWorkspace.mutate()}
|
|
disabled={confirmDisabled}
|
|
>
|
|
{closeWorkspace.isPending ? <Loader2 className="mr-2 h-4 w-4 animate-spin" /> : null}
|
|
{actionLabel}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|