feat: wire OpenCode process control UI
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -1,14 +1,22 @@
|
|||||||
|
import { useMemo } from "react";
|
||||||
import { Panel, PanelGroup, PanelResizeHandle } from "react-resizable-panels";
|
import { Panel, PanelGroup, PanelResizeHandle } from "react-resizable-panels";
|
||||||
import { PanelLeftClose, PanelLeftOpen, Terminal } from "lucide-react";
|
import { PanelLeftClose, PanelLeftOpen, Play, RotateCw, Square, Terminal } from "lucide-react";
|
||||||
|
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Separator } from "@/components/ui/separator";
|
import { Separator } from "@/components/ui/separator";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
import { EditorPanel } from "@/components/editor/EditorPanel";
|
import { EditorPanel } from "@/components/editor/EditorPanel";
|
||||||
import { TerminalPanel } from "@/components/terminal/TerminalPanel";
|
import { TerminalPanel } from "@/components/terminal/TerminalPanel";
|
||||||
import { FileExplorerPanel } from "@/components/workspace/FileExplorerPanel";
|
import { FileExplorerPanel } from "@/components/workspace/FileExplorerPanel";
|
||||||
import { StatusBar } from "@/components/workspace/StatusBar";
|
import { StatusBar } from "@/components/workspace/StatusBar";
|
||||||
import { WorkspaceSelector } from "@/components/workspace/WorkspaceSelector";
|
import { WorkspaceSelector } from "@/components/workspace/WorkspaceSelector";
|
||||||
import { useWorkspaceUiStore } from "@/lib/store/workspace-ui-store";
|
import { useWorkspaceUiStore } from "@/lib/store/workspace-ui-store";
|
||||||
|
import {
|
||||||
|
useProcessRestart,
|
||||||
|
useProcessStart,
|
||||||
|
useProcessStatus,
|
||||||
|
useProcessStop,
|
||||||
|
} from "@/lib/api/process";
|
||||||
|
|
||||||
interface WorkspaceShellProps {
|
interface WorkspaceShellProps {
|
||||||
workspaceId: string;
|
workspaceId: string;
|
||||||
@@ -21,6 +29,19 @@ export function WorkspaceShell({ workspaceId }: WorkspaceShellProps) {
|
|||||||
const toggleSidebar = useWorkspaceUiStore((s) => s.toggleSidebar);
|
const toggleSidebar = useWorkspaceUiStore((s) => s.toggleSidebar);
|
||||||
const toggleTerminal = useWorkspaceUiStore((s) => s.toggleTerminal);
|
const toggleTerminal = useWorkspaceUiStore((s) => s.toggleTerminal);
|
||||||
|
|
||||||
|
const status = useProcessStatus(workspaceId);
|
||||||
|
const start = useProcessStart();
|
||||||
|
const stop = useProcessStop();
|
||||||
|
const restart = useProcessRestart();
|
||||||
|
|
||||||
|
const isRunning = status.data?.running ?? false;
|
||||||
|
const statusUnknown = status.isPending || status.isError;
|
||||||
|
|
||||||
|
const mutationError = useMemo(
|
||||||
|
() => start.error ?? stop.error ?? restart.error,
|
||||||
|
[start.error, stop.error, restart.error],
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full w-full flex-col bg-background text-foreground">
|
<div className="flex h-full w-full flex-col bg-background text-foreground">
|
||||||
{/* Toolbar */}
|
{/* Toolbar */}
|
||||||
@@ -50,6 +71,41 @@ export function WorkspaceShell({ workspaceId }: WorkspaceShellProps) {
|
|||||||
>
|
>
|
||||||
<Terminal className="size-4" aria-hidden="true" />
|
<Terminal className="size-4" aria-hidden="true" />
|
||||||
</Button>
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="h-7 px-2 text-xs"
|
||||||
|
onClick={() => start.mutate(workspaceId)}
|
||||||
|
disabled={!workspaceId || statusUnknown || isRunning || start.isPending}
|
||||||
|
>
|
||||||
|
<Play className="size-4" aria-hidden="true" />
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="h-7 px-2 text-xs"
|
||||||
|
onClick={() => stop.mutate(workspaceId)}
|
||||||
|
disabled={!workspaceId || statusUnknown || !isRunning || stop.isPending}
|
||||||
|
>
|
||||||
|
<Square className="size-4" aria-hidden="true" />
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="h-7 px-2 text-xs"
|
||||||
|
onClick={() => restart.mutate(workspaceId)}
|
||||||
|
disabled={!workspaceId || statusUnknown || !isRunning || restart.isPending}
|
||||||
|
>
|
||||||
|
<RotateCw
|
||||||
|
className={cn("size-4", restart.isPending && "animate-spin")}
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
</Button>
|
||||||
|
{mutationError && (
|
||||||
|
<span className="ml-1 text-[11px] text-destructive">
|
||||||
|
{mutationError.message}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
@@ -89,7 +145,7 @@ export function WorkspaceShell({ workspaceId }: WorkspaceShellProps) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Status bar */}
|
{/* Status bar */}
|
||||||
<StatusBar activeFilePath={activeFilePath} />
|
<StatusBar activeFilePath={activeFilePath} workspaceId={workspaceId} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,15 +3,19 @@ import { Terminal, FileCode2 } from "lucide-react";
|
|||||||
import { Separator } from "@/components/ui/separator";
|
import { Separator } from "@/components/ui/separator";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { useWorkspaceUiStore } from "@/lib/store/workspace-ui-store";
|
import { useWorkspaceUiStore } from "@/lib/store/workspace-ui-store";
|
||||||
|
import { useProcessStatus } from "@/lib/api/process";
|
||||||
|
|
||||||
interface StatusBarProps {
|
interface StatusBarProps {
|
||||||
activeFilePath: string;
|
activeFilePath: string;
|
||||||
|
workspaceId: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function StatusBar({ activeFilePath }: StatusBarProps) {
|
export function StatusBar({ activeFilePath, workspaceId }: StatusBarProps) {
|
||||||
const terminalVisible = useWorkspaceUiStore((s) => s.terminalVisible);
|
const terminalVisible = useWorkspaceUiStore((s) => s.terminalVisible);
|
||||||
const toggleTerminal = useWorkspaceUiStore((s) => s.toggleTerminal);
|
const toggleTerminal = useWorkspaceUiStore((s) => s.toggleTerminal);
|
||||||
|
|
||||||
|
const status = useProcessStatus(workspaceId);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<footer className="flex h-6 shrink-0 items-center border-t border-border bg-sidebar px-3 text-[11px] text-muted-foreground">
|
<footer className="flex h-6 shrink-0 items-center border-t border-border bg-sidebar px-3 text-[11px] text-muted-foreground">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
@@ -19,6 +23,37 @@ export function StatusBar({ activeFilePath }: StatusBarProps) {
|
|||||||
<span className="truncate max-w-48">{activeFilePath}</span>
|
<span className="truncate max-w-48">{activeFilePath}</span>
|
||||||
</div>
|
</div>
|
||||||
<Separator orientation="vertical" className="mx-2 h-3" />
|
<Separator orientation="vertical" className="mx-2 h-3" />
|
||||||
|
{workspaceId && (
|
||||||
|
<>
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<span
|
||||||
|
className={cn(
|
||||||
|
"h-2 w-2 shrink-0 rounded-full",
|
||||||
|
status.isPending && "bg-muted-foreground/50 animate-pulse",
|
||||||
|
status.isError && "bg-destructive",
|
||||||
|
status.isSuccess && status.data.running && "bg-green-500",
|
||||||
|
status.isSuccess && !status.data.running && "bg-red-500",
|
||||||
|
)}
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
className={cn(
|
||||||
|
status.isPending && "text-muted-foreground/70",
|
||||||
|
status.isError && "text-destructive",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{status.isPending
|
||||||
|
? "checking…"
|
||||||
|
: status.isError
|
||||||
|
? "opencode: error"
|
||||||
|
: status.data?.running
|
||||||
|
? `opencode: running${status.data.pid !== undefined ? ` (PID ${status.data.pid})` : ""}`
|
||||||
|
: "opencode: stopped"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<Separator orientation="vertical" className="mx-2 h-3" />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
<span className="font-medium">codespace</span>
|
<span className="font-medium">codespace</span>
|
||||||
<div className="ml-auto flex items-center gap-1">
|
<div className="ml-auto flex items-center gap-1">
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
|
||||||
|
import {
|
||||||
|
useMutation,
|
||||||
|
useQuery,
|
||||||
|
useQueryClient,
|
||||||
|
type UseMutationResult,
|
||||||
|
type UseQueryResult,
|
||||||
|
} from "@tanstack/react-query";
|
||||||
|
|
||||||
|
import { apiClient } from "@/lib/api/client";
|
||||||
|
|
||||||
|
export interface ProcessStatus {
|
||||||
|
workspaceId: string;
|
||||||
|
running: boolean;
|
||||||
|
pid?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function processStatusQueryKey(workspaceId: string) {
|
||||||
|
return ["workspaces", workspaceId, "process", "status"] as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchProcessStatus(workspaceId: string): Promise<ProcessStatus> {
|
||||||
|
const res = await apiClient(
|
||||||
|
`/api/workspaces/${encodeURIComponent(workspaceId)}/process/status`,
|
||||||
|
);
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new Error(`Failed to fetch process status: ${res.status}`);
|
||||||
|
}
|
||||||
|
return (await res.json()) as ProcessStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useProcessStatus(
|
||||||
|
workspaceId: string | null,
|
||||||
|
): UseQueryResult<ProcessStatus, Error> {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: processStatusQueryKey(workspaceId ?? ""),
|
||||||
|
queryFn: () => fetchProcessStatus(workspaceId!),
|
||||||
|
enabled: !!workspaceId,
|
||||||
|
refetchInterval: 5000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function postProcessAction(
|
||||||
|
workspaceId: string,
|
||||||
|
action: "start" | "stop" | "restart",
|
||||||
|
): Promise<void> {
|
||||||
|
const res = await apiClient(
|
||||||
|
`/api/workspaces/${encodeURIComponent(workspaceId)}/process/${action}`,
|
||||||
|
{ method: "POST" },
|
||||||
|
);
|
||||||
|
if (!res.ok) {
|
||||||
|
throw new Error(`Failed to ${action} process: ${res.status}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function useProcessActionMutation(
|
||||||
|
action: "start" | "stop" | "restart",
|
||||||
|
): UseMutationResult<void, Error, string> {
|
||||||
|
const queryClient = useQueryClient();
|
||||||
|
return useMutation({
|
||||||
|
mutationFn: (workspaceId: string) => postProcessAction(workspaceId, action),
|
||||||
|
onSuccess: (_, workspaceId) => {
|
||||||
|
queryClient.invalidateQueries({
|
||||||
|
queryKey: processStatusQueryKey(workspaceId),
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useProcessStart(): UseMutationResult<void, Error, string> {
|
||||||
|
return useProcessActionMutation("start");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useProcessStop(): UseMutationResult<void, Error, string> {
|
||||||
|
return useProcessActionMutation("stop");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useProcessRestart(): UseMutationResult<void, Error, string> {
|
||||||
|
return useProcessActionMutation("restart");
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user