Allow guest session bootstrap and source removal

Rhys Sullivan committed 9 months ago

Commit 34a8eeb1 parent 4f58fef6 files · +132 −59Browse files

Unified · Split

6 files

executor/apps/web/src/components/tools/add/source-dialog.tsx +47 −2
executor/apps/web/src/components/tools/explorer-groups.tsx +3 −0
executor/apps/web/src/components/tools/explorer.tsx +3 −0
executor/apps/web/src/components/tools/view.tsx +6 −1
executor/packages/convex/workspace.ts +13 −19
executor/scripts/e2e/install.sandbox.e2e.test.ts +60 −37

executor/apps/web/src/components/tools/add/source-dialog.tsx+47−2

 "use client";
 import { useState, type ReactNode } from "react";
-import { AlertTriangle, Plus } from "lucide-react";
+import { AlertTriangle, Plus, Trash2 } from "lucide-react";
 import { useAction, useMutation, useQuery } from "convex/react";
 import { Result } from "better-result";
 import { toast } from "sonner";
 export function AddSourceDialog({
   existingSourceNames,
   onSourceAdded,
+  onSourceDeleted,
   sourceToEdit,
   sourceDialogMeta,
   sourceAuthProfiles,
 }: {
   existingSourceNames: Set<string>;
   onSourceAdded?: (source: ToolSourceRecord, options?: { connected?: boolean }) => void;
+  onSourceDeleted?: (sourceName: string) => void;
   sourceToEdit?: ToolSourceRecord;
   sourceDialogMeta?: SourceDialogMeta;
   sourceAuthProfiles?: Record<string, SourceAuthProfile>;
 }) {
   const { context } = useSession();
   const upsertToolSource = useMutation(convexApi.workspace.upsertToolSource);
+  const deleteToolSource = useMutation(convexApi.workspace.deleteToolSource);
   const upsertCredential = useAction(convexApi.credentialsNode.upsertCredential);
   const credentials = useQuery(
     convexApi.workspace.listCredentials,
   const [open, setOpen] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const [mcpOAuthBusy, setMcpOAuthBusy] = useState(false);
+  const [deleting, setDeleting] = useState(false);
   const sourceDialogHeader = sourceToEdit ? "Edit Tool Source" : "Add Tool Source";
   const sourceDialogDescription = sourceToEdit
       ? "Add Source + Save Credentials"
       : "Add Source";
+  const handleDeleteSource = async () => {
+    if (!sourceToEdit || !context) {
+      return;
+    }
+    const confirmed = window.confirm(`Remove source "${sourceToEdit.name}" and all related tools from this workspace?`);
+    if (!confirmed) {
+      return;
+    }
+    setDeleting(true);
+    try {
+      await deleteToolSource({
+        workspaceId: context.workspaceId,
+        sessionId: context.sessionId,
+        sourceId: sourceToEdit.id,
+      });
+      toast.success(`Removed "${sourceToEdit.name}"`);
+      onSourceDeleted?.(sourceToEdit.name);
+      setOpen(false);
+    } catch (err) {
+      toast.error(err instanceof Error ? err.message : "Failed to remove source");
+    } finally {
+      setDeleting(false);
+    }
+  };
   return (
     <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogTrigger asChild>
               {editSourceWarnings.length > 0 ? (
                 <div className="mt-2 rounded-sm border border-terminal-amber/30 bg-terminal-amber/5 px-2 py-1.5">
-                    {editSourceWarnings.map((warning: string, index: number) => (
+                  {editSourceWarnings.map((warning: string, index: number) => (
                     <p key={`${sourceToEdit.name}-warning-${index}`} className="text-[10px] text-terminal-amber/90">
                       {warning}
                     </p>
                   ))}
                 </div>
               ) : null}
+              <div className="mt-3 flex justify-end">
+                <Button
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  className="h-7 text-[11px] border-terminal-red/40 text-terminal-red hover:bg-terminal-red/10"
+                  onClick={handleDeleteSource}
+                  disabled={deleting}
+                >
+                  <Trash2 className="h-3.5 w-3.5 mr-1.5" />
+                  {deleting ? "Removing..." : "Remove source"}
+                </Button>
+              </div>
             </div>
           </div>
         ) : null}

executor/apps/web/src/components/tools/explorer-groups.tsx+3−0

   sourceDialogMeta,
   existingSourceNames,
   sourceAuthProfiles,
+  onSourceDeleted,
 }: {
   sources: ToolSourceRecord[];
   sourceCounts: Record<string, number>;
   sourceDialogMeta?: Record<string, SourceDialogMeta>;
   existingSourceNames: Set<string>;
   sourceAuthProfiles?: Record<string, SourceAuthProfile>;
+  onSourceDeleted?: (sourceName: string) => void;
 }) {
   const warningCountsBySource = useMemo(() => {
     const counts: Record<string, number> = {};
                   sourceToEdit={g.source}
                   sourceDialogMeta={editMeta}
                   sourceAuthProfiles={sourceAuthProfiles}
+                  onSourceDeleted={onSourceDeleted}
                   trigger={
                     <Button
                       variant="ghost"

executor/apps/web/src/components/tools/explorer.tsx+3−0

   sourceDialogMeta?: Record<string, SourceDialogMeta>;
   sourceAuthProfiles?: Record<string, SourceAuthProfile>;
   existingSourceNames?: Set<string>;
+  onSourceDeleted?: (sourceName: string) => void;
 }
 export function ToolExplorer({
   sourceDialogMeta,
   sourceAuthProfiles,
   existingSourceNames,
+  onSourceDeleted,
 }: ToolExplorerProps) {
   const [searchInput, setSearchInput] = useState("");
   const search = useDeferredValue(searchInput);
           sourceDialogMeta={sourceDialogMeta}
           sourceAuthProfiles={sourceAuthProfiles}
           existingSourceNames={sidebarExistingSourceNames}
+          onSourceDeleted={onSourceDeleted}
         />
       ) : null}

executor/apps/web/src/components/tools/view.tsx+6−1

 "use client";
-import { useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import {
   Plus,
 } from "lucide-react";
     && (sourceItems.some((source) => source.name === selectedSource) || toolSourceNames.has(selectedSource))
     ? selectedSource
     : null;
+  const handleSourceDeleted = useCallback((sourceName: string) => {
+    setSelectedSource((current) => (current === sourceName ? null : current));
+  }, []);
   const openConnectionCreate = (sourceKey?: string) => {
     setConnectionDialogEditing(null);
     setConnectionDialogSourceKey(sourceKey ?? null);
                   sourceDialogMeta={sourceDialogMeta}
                   sourceAuthProfiles={sourceAuthProfiles}
                   existingSourceNames={existingSourceNames}
+                  onSourceDeleted={handleSourceDeleted}
                   onLoadToolDetails={loadToolDetails}
                   warnings={warnings}
                   initialSource={initialSource}

executor/packages/convex/workspace.ts+13−19

     actorId: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
-    const identity = await ctx.auth.getUserIdentity();
+    const identity = await ctx.auth.getUserIdentity().catch(() => null);
-    const requestedSessionId = args.sessionId?.trim();
+    const requestedSessionId = args.sessionId?.trim() || undefined;
-    const requestedActorId = args.actorId?.trim();
+    const requestedActorId = args.actorId?.trim() || undefined;
-    const isAnonymousIdentityRequest = Boolean(identity && isAnonymousIdentity(identity));
-    if (!isAnonymousIdentityRequest && identity) {
+    if (identity && !isAnonymousIdentity(identity)) {
-      throw new Error("Anonymous auth token is required");
+      throw new Error("Cannot bootstrap an anonymous session while authenticated");
     }
-    const actorId = isAnonymousIdentityRequest
+    const actorId = identity ? identity.subject : requestedActorId;
-      ? identity!.subject
-      : requestedActorId;
     if (actorId && !actorId.startsWith("anon_")) {
-      throw new Error("Anonymous token subject must use anon_* actor ids");
+      throw new Error("actorId must be an anonymous actor (anon_*)");
-    }
-    if (!actorId && !requestedSessionId) {
-      throw new Error("Anonymous auth token is required");
     }
-    const sessionId = actorId
+    // Allow unauthenticated callers to bootstrap a fresh anonymous session.
-      ? `anon_session_${actorId}`
+    // The internal mutation will generate ids when not provided.
+    const sessionId = identity
+      ? (requestedSessionId ?? `anon_session_${actorId}`)
       : requestedSessionId;
     return await ctx.runMutation(internal.database.bootstrapAnonymousSession, {
-      sessionId,
+      ...(sessionId ? { sessionId } : {}),
-      actorId,
+      ...(actorId ? { actorId } : {}),
       clientId: "web",
     });
   },

executor/scripts/e2e/install.sandbox.e2e.test.ts+60−37

@@ -35,6 +35,16 @@ async function runSandboxBash( · 34 unmodified lines
35	}	35	}
36	}	36	}
37		37
		38	function isSandboxStoppedError(error: unknown): boolean {
		39	if (!error) return false;
		40	const anyErr = error as any;
		41	const status = typeof anyErr?.response?.status === "number" ? anyErr.response.status : null;
		42	if (status === 410) return true;
		43
		44	const message = error instanceof Error ? error.message : String(error);
		45	return message.includes("sandbox_stopped") \|\| message.includes("Status code 410");
		46	}
		47
38	function assertSuccess(result: CommandResult, label: string): void {	48	function assertSuccess(result: CommandResult, label: string): void {
39	if (result.exitCode === 0) {	49	if (result.exitCode === 0) {
40	return;	50	return;
@@ -59,52 +69,65 @@ test("installer works in fresh Vercel sandbox", async () => { · 18 unmodified lines
59	}	69	}
60	: {};	70	: {};
61		71
62	let sandbox: Sandbox \| null = null;	72	const createSandbox = async () => {
		73	try {
		74	return await Sandbox.create({
		75	runtime: "node22",
		76	timeout: 30 * 60 * 1000,
		77	...credentials,
		78	});
		79	} catch (error) {
		80	const message = error instanceof Error ? error.message : String(error);
		81	throw new Error(
		82	`Could not create Vercel sandbox. Configure auth via VERCEL_TOKEN/VERCEL_TEAM_ID/VERCEL_PROJECT_ID or VERCEL_OIDC_TOKEN.\n\n${message}`,
		83	);
		84	}
		85	};
63		86
64	try {	87	let sandbox: Sandbox \| null = await createSandbox();
65	sandbox = await Sandbox.create({
66	runtime: "node22",
67	timeout: 30 * 60 * 1000,
68	...credentials,
69	});
70	} catch (error) {
71	const message = error instanceof Error ? error.message : String(error);
72	throw new Error(
73	`Could not create Vercel sandbox. Configure auth via VERCEL_TOKEN/VERCEL_TEAM_ID/VERCEL_PROJECT_ID or VERCEL_OIDC_TOKEN.\n\n${message}`,
74	);
75	}
76		88
77	try {	89	try {
78	const install = await runSandboxBash(	90	const installScript = [
79	sandbox,	91	"set -euo pipefail",
80	[	92	"cd ~",
81	"set -euo pipefail",	93	"if [ -x ~/.executor/bin/executor ]; then ~/.executor/bin/executor uninstall --yes \|\| true; fi",
82	"cd ~",	94	"rm -rf ~/.executor",
83	"if [ -x ~/.executor/bin/executor ]; then ~/.executor/bin/executor uninstall --yes \|\| true; fi",	95	"start=$(date +%s)",
84	"rm -rf ~/.executor",	96	"curl -fsSL https://executor.sh/install \| bash",
85	"start=$(date +%s)",	97	"end=$(date +%s)",
86	"curl -fsSL https://executor.sh/install \| bash",	98	"echo INSTALL_SECONDS=$((end-start))",
87	"end=$(date +%s)",	99	"~/.executor/bin/executor doctor --verbose",
88	"echo INSTALL_SECONDS=$((end-start))",	100	].join("; ");
89	"~/.executor/bin/executor doctor --verbose",	101
90	].join("; "),	102	let install: CommandResult;
91	900_000,	103	try {
92	);	104	install = await runSandboxBash(sandbox, installScript, 900_000);
		105	} catch (error) {
		106	if (!isSandboxStoppedError(error)) {
		107	throw error;
		108	}
		109	// Vercel sandboxes can stop unexpectedly; recreate once and retry.
		110	try {
		111	await sandbox.stop();
		112	} catch {
		113	// ignore
		114	}
		115	sandbox = await createSandbox();
		116	install = await runSandboxBash(sandbox, installScript, 900_000);
		117	}
93	assertSuccess(install, "sandbox install + doctor");	118	assertSuccess(install, "sandbox install + doctor");
94		119
95	const output = `${install.stdout}\n${install.stderr}`;	120	const output = `${install.stdout}\n${install.stderr}`;
96	expect(output).toContain("Executor status: ready");	121	expect(output).toContain("Executor status: ready");
97	expect(output).toContain("Functions: bootstrapped");	122	expect(output).toContain("Functions: bootstrapped");
98		123
99	const uninstall = await runSandboxBash(	124	const uninstallScript = [
100	sandbox,	125	"set -euo pipefail",
101	[	126	"~/.executor/bin/executor uninstall --yes",
102	"set -euo pipefail",	127	"test ! -e ~/.executor/runtime/convex-data/convex_local_backend.sqlite3",
103	"~/.executor/bin/executor uninstall --yes",	128	].join("; ");
104	"test ! -e ~/.executor/runtime/convex-data/convex_local_backend.sqlite3",	129
105	].join("; "),	130	const uninstall = await runSandboxBash(sandbox, uninstallScript, 300_000);
106	300_000,
107	);
108	assertSuccess(uninstall, "sandbox uninstall validation");	131	assertSuccess(uninstall, "sandbox uninstall validation");
109	} finally {	132	} finally {
110	await sandbox.stop();	133	await sandbox.stop();

Allow guest session bootstrap and source removal

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code