forked from farhoodlabs/paperclip
549ef11c14
## Thinking Path > - Paperclip orchestrates AI agents inside execution and project workspaces > - Workspace runtime services can be controlled manually by operators and reused by agent runs > - Manual start/stop state was not preserved consistently across workspace policies and routine launches > - Routine launches also needed branch/workspace variables to default from the selected workspace context > - This pull request makes runtime policy state explicit, preserves manual control, and auto-fills routine branch variables from workspace data > - The benefit is less surprising workspace service behavior and fewer manual inputs when running workspace-scoped routines ## What Changed - Added runtime-state handling for manual workspace control across execution and project workspace validators, routes, and services. - Updated heartbeat/runtime startup behavior so manually stopped services are respected. - Auto-filled routine workspace branch variables from available workspace context. - Added focused server and UI tests for workspace runtime and routine variable behavior. - Removed muted gray background styling from workspace pages and cards for a cleaner workspace UI. ## Verification - `pnpm install --frozen-lockfile --ignore-scripts` - `pnpm exec vitest run server/src/__tests__/routines-service.test.ts server/src/__tests__/workspace-runtime.test.ts ui/src/components/RoutineRunVariablesDialog.test.tsx` - Result: 55 tests passed, 21 skipped. The embedded Postgres routines tests skipped on this host with the existing PGlite/Postgres init warning; workspace-runtime and UI tests passed. ## Risks - Medium risk: this touches runtime service start/stop policy and heartbeat launch behavior. - The focused tests cover manual runtime state, routine variables, and workspace runtime reuse paths. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex coding agent based on GPT-5, tool-enabled local shell and GitHub workflow, exact runtime context window not exposed in this session. ## 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 checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [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, or documented why targeted component/service verification is sufficient here - [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>
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-background 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-background 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-background 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-background 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-background 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-background 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>
|
|
);
|
|
}
|