@agent-native/dispatch 0.5.1 → 0.6.0

package/src/routes/pages/integrations.tsx

@@ -1,277 +1,410 @@
+import { useMemo, useState } from "react";
 import { useActionMutation, useActionQuery } from "@agent-native/core/client";
+import { useQueryClient } from "@tanstack/react-query";
 import { toast } from "sonner";
 import {
   IconCheck,
+  IconChevronRight,
   IconCircleDashed,
   IconKey,
-  IconRefresh,
-  IconShieldCheck,
-  IconWifi,
-  IconWifiOff,
+  IconLink,
+  IconPlugConnected,
 } from "@tabler/icons-react";
 import { DispatchShell } from "@/components/dispatch-shell";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { Progress } from "@/components/ui/progress";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
 
 export function meta() {
-  return [{ title: "Integrations — Dispatch" }];
+  return [{ title: "Connections — Dispatch" }];
 }
 
-function StatusBadge({
-  configured,
-  vaultGranted,
-}: {
+interface AppRef {
+  appId: string;
+  appName: string;
+  color: string;
   configured: boolean;
   vaultGranted: boolean;
-}) {
-  if (configured && vaultGranted) {
-    return (
-      <Badge
-        variant="secondary"
-        className="bg-green-500/10 text-green-700 dark:text-green-400"
-      >
-        <IconShieldCheck size={12} className="mr-1" />
-        Vault
-      </Badge>
-    );
-  }
-  if (configured) {
-    return (
-      <Badge
-        variant="secondary"
-        className="bg-green-500/10 text-green-700 dark:text-green-400"
-      >
-        <IconCheck size={12} className="mr-1" />
-        Configured
-      </Badge>
-    );
-  }
-  if (vaultGranted) {
-    return (
-      <Badge
-        variant="secondary"
-        className="bg-blue-500/10 text-blue-700 dark:text-blue-400"
-      >
-        <IconKey size={12} className="mr-1" />
-        Granted (not synced)
-      </Badge>
-    );
+  vaultSecretId?: string;
+}
+
+interface Service {
+  /** Credential key shared across apps (e.g. `OPENAI_API_KEY`). */
+  key: string;
+  /** Human label from the first app that declares it (`"OpenAI"`, `"Stripe"`). */
+  label: string;
+  /** Apps in the workspace that declare this credential. */
+  apps: AppRef[];
+}
+
+interface CatalogApp {
+  appId: string;
+  appName: string;
+  color: string;
+  url: string;
+  reachable: boolean;
+  integrations?: Array<{
+    key: string;
+    label: string;
+    required: boolean;
+    configured: boolean;
+    vaultGranted: boolean;
+    vaultSecretId?: string;
+  }>;
+}
+
+function inferProviderFromKey(key: string, label: string): string {
+  const haystack = `${key} ${label}`.toLowerCase();
+  for (const provider of [
+    "google",
+    "slack",
+    "sendgrid",
+    "github",
+    "stripe",
+    "hubspot",
+    "jira",
+    "bigquery",
+    "anthropic",
+    "openai",
+  ]) {
+    if (haystack.includes(provider)) return provider;
   }
-  return (
-    <Badge
-      variant="secondary"
-      className="bg-amber-500/10 text-amber-700 dark:text-amber-400"
-    >
-      <IconCircleDashed size={12} className="mr-1" />
-      Missing
-    </Badge>
-  );
+  return "other";
 }
 
-function AppCard({ app }: { app: any }) {
-  const syncToApp = useActionMutation("sync-vault-to-app", {
-    onSuccess: (data: any) =>
-      toast.success(`Synced ${data.synced} key(s) to ${data.appId}`),
-    onError: (err) => toast.error(String(err)),
-  });
+function ConnectDialog({
+  service,
+  open,
+  onOpenChange,
+}: {
+  service: Service;
+  open: boolean;
+  onOpenChange: (next: boolean) => void;
+}) {
+  const [value, setValue] = useState("");
+  const qc = useQueryClient();
+
+  const createSecret = useActionMutation("create-vault-secret", {});
+  const createGrant = useActionMutation("create-vault-grant", {});
+  const syncToApp = useActionMutation("sync-vault-to-app", {});
+
+  function reset() {
+    setValue("");
+  }
+
+  async function handleSave() {
+    const trimmed = value.trim();
+    if (!trimmed) {
+      toast.error("Enter a value to save");
+      return;
+    }
+    try {
+      // 1. Create the secret (or get the existing one — server treats key as
+      // the unique identifier). The server returns { secret: { id, ... } }.
+      const created = await createSecret.mutateAsync({
+        credentialKey: service.key,
+        name: service.label,
+        value: trimmed,
+        provider: inferProviderFromKey(service.key, service.label),
+      });
+      const secretId =
+        (created as { secret?: { id?: string } })?.secret?.id ??
+        (created as { id?: string })?.id;
+      if (!secretId) {
+        throw new Error("Secret created but id missing");
+      }
 
-  const integrations = app.integrations || [];
-  const configuredCount = integrations.filter((i: any) => i.configured).length;
-  const total = integrations.length;
-  const coverage = total > 0 ? Math.round((configuredCount / total) * 100) : 0;
+      // 2. Grant + sync to every app that declared this credential.
+      const targets = service.apps.filter((a) => !a.vaultGranted);
+      for (const app of targets) {
+        try {
+          await createGrant.mutateAsync({
+            secretId,
+            appId: app.appId,
+          });
+        } catch (err) {
+          console.warn(`grant to ${app.appId} failed`, err);
+        }
+      }
+      for (const app of service.apps) {
+        try {
+          await syncToApp.mutateAsync({ appId: app.appId });
+        } catch (err) {
+          console.warn(`sync to ${app.appId} failed`, err);
+        }
+      }
+
+      qc.invalidateQueries({
+        queryKey: ["action", "list-integrations-catalog"],
+      });
+      toast.success(`Connected ${service.label}`);
+      onOpenChange(false);
+      reset();
+    } catch (err: any) {
+      toast.error(err?.message ?? "Failed to save credential");
+    }
+  }
+
+  const pending =
+    createSecret.isPending || createGrant.isPending || syncToApp.isPending;
 
   return (
-    <div className="rounded-2xl border bg-card">
-      <div className="flex items-center justify-between border-b px-5 py-4">
-        <div className="flex items-center gap-3">
-          <div
-            className="flex h-9 w-9 items-center justify-center rounded-xl text-white text-xs font-bold"
-            style={{ backgroundColor: app.color }}
-          >
-            {app.appName.charAt(0).toUpperCase()}
+    <Dialog
+      open={open}
+      onOpenChange={(next) => {
+        if (!next) reset();
+        onOpenChange(next);
+      }}
+    >
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Connect {service.label}</DialogTitle>
+          <DialogDescription>
+            Used by{" "}
+            {service.apps.length === 1
+              ? service.apps[0].appName
+              : `${service.apps.length} apps`}
+            . Saved to the workspace vault and synced to every app that needs
+            it.
+          </DialogDescription>
+        </DialogHeader>
+        <div className="space-y-3">
+          <div>
+            <Label className="text-xs text-muted-foreground">Key</Label>
+            <div className="font-mono text-sm">{service.key}</div>
           </div>
           <div>
-            <div className="flex items-center gap-2">
-              <h3 className="text-sm font-semibold text-foreground">
-                {app.appName}
-              </h3>
-              {app.reachable ? (
-                <IconWifi size={14} className="text-green-500" />
-              ) : (
-                <IconWifiOff size={14} className="text-muted-foreground/50" />
-              )}
-            </div>
-            <div className="text-xs text-muted-foreground">{app.appId}</div>
+            <Label htmlFor="connector-value">Value</Label>
+            <Input
+              id="connector-value"
+              type="password"
+              autoComplete="off"
+              value={value}
+              onChange={(e) => setValue(e.target.value)}
+              placeholder={`Paste your ${service.label} key…`}
+              autoFocus
+            />
           </div>
         </div>
-        <Button
-          variant="outline"
-          size="sm"
-          onClick={() => syncToApp.mutate({ appId: app.appId })}
-          disabled={syncToApp.isPending || !app.reachable}
-        >
-          <IconRefresh
-            size={14}
-            className={syncToApp.isPending ? "animate-spin" : ""}
-          />
-          <span className="ml-1.5">Sync</span>
-        </Button>
-      </div>
+        <DialogFooter>
+          <Button
+            variant="outline"
+            onClick={() => onOpenChange(false)}
+            disabled={pending}
+          >
+            Cancel
+          </Button>
+          <Button onClick={handleSave} disabled={pending || !value.trim()}>
+            {pending ? "Saving…" : "Connect"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
 
-      <div className="px-5 py-4">
-        {total > 0 ? (
-          <>
-            <div className="flex items-center justify-between text-xs text-muted-foreground">
-              <span>
-                {configuredCount}/{total} configured
-              </span>
-              <span>{coverage}%</span>
-            </div>
-            <Progress value={coverage} className="mt-2 h-1.5" />
+function ConnectorCard({ service }: { service: Service }) {
+  const [open, setOpen] = useState(false);
+  const isConnected = service.apps.some((a) => a.configured);
+  const appCount = service.apps.length;
 
-            <div className="mt-4 space-y-2">
-              {integrations.map((integration: any) => (
-                <div
-                  key={integration.key}
-                  className="flex items-center justify-between rounded-lg border px-3 py-2"
-                >
-                  <div className="min-w-0">
-                    <div className="flex items-center gap-2">
-                      <span className="text-sm text-foreground">
-                        {integration.label}
-                      </span>
-                      {integration.required && (
-                        <span className="text-xs text-red-500">required</span>
-                      )}
-                    </div>
-                    <div className="font-mono text-xs text-muted-foreground">
-                      {integration.key}
-                    </div>
-                  </div>
-                  <StatusBadge
-                    configured={integration.configured}
-                    vaultGranted={integration.vaultGranted}
-                  />
-                </div>
-              ))}
-            </div>
-          </>
-        ) : app.reachable ? (
-          <div className="py-4 text-center text-sm text-muted-foreground">
-            No declared integrations.
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => setOpen(true)}
+        className="group flex flex-col items-start gap-2 rounded-2xl border bg-card p-5 text-left transition hover:border-foreground/20 hover:bg-card/80 cursor-pointer"
+      >
+        <div className="flex w-full items-start justify-between gap-2">
+          <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-muted">
+            <IconKey size={16} className="text-muted-foreground" />
           </div>
-        ) : (
-          <div className="py-4 text-center text-sm text-muted-foreground">
-            App is not reachable. Start the app to see its integrations.
+          {isConnected ? (
+            <Badge
+              variant="secondary"
+              className="bg-green-500/10 text-green-700 dark:text-green-400 gap-1"
+            >
+              <IconCheck size={12} />
+              Connected
+            </Badge>
+          ) : (
+            <Badge
+              variant="secondary"
+              className="bg-amber-500/10 text-amber-700 dark:text-amber-400 gap-1"
+            >
+              <IconCircleDashed size={12} />
+              Connect
+            </Badge>
+          )}
+        </div>
+        <div className="min-w-0">
+          <div className="text-sm font-semibold text-foreground truncate">
+            {service.label}
+          </div>
+          <div className="font-mono text-xs text-muted-foreground/80 truncate">
+            {service.key}
           </div>
+        </div>
+        <div className="text-xs text-muted-foreground">
+          Used by {appCount} {appCount === 1 ? "app" : "apps"}
+        </div>
+      </button>
+      <ConnectDialog service={service} open={open} onOpenChange={setOpen} />
+    </>
+  );
+}
+
+function PerAppDetailRow({ app }: { app: CatalogApp }) {
+  const total = (app.integrations ?? []).length;
+  const ok = (app.integrations ?? []).filter((i) => i.configured).length;
+  return (
+    <div className="flex items-center justify-between border-t px-4 py-2.5 first:border-t-0">
+      <div className="flex items-center gap-2 min-w-0">
+        <div
+          className="h-5 w-5 rounded text-[10px] font-bold text-white flex items-center justify-center shrink-0"
+          style={{ backgroundColor: app.color }}
+        >
+          {app.appName.charAt(0).toUpperCase()}
+        </div>
+        <span className="text-sm truncate">{app.appName}</span>
+        {!app.reachable && (
+          <span className="text-xs text-muted-foreground">offline</span>
         )}
       </div>
+      <span className="text-xs text-muted-foreground">
+        {total === 0 ? "no integrations" : `${ok}/${total}`}
+      </span>
     </div>
   );
 }
 
-export default function IntegrationsRoute() {
+export default function ConnectionsRoute() {
   const { data: catalog, isLoading } = useActionQuery(
     "list-integrations-catalog",
     {},
   );
+  const apps = (catalog as CatalogApp[]) || [];
 
-  const apps = catalog || [];
-  const reachableApps = apps.filter((a: any) => a.reachable);
-  const unreachableApps = apps.filter((a: any) => !a.reachable);
+  const services = useMemo<Service[]>(() => {
+    const map = new Map<string, Service>();
+    for (const app of apps) {
+      for (const intg of app.integrations ?? []) {
+        if (!map.has(intg.key)) {
+          map.set(intg.key, {
+            key: intg.key,
+            label: intg.label,
+            apps: [],
+          });
+        }
+        map.get(intg.key)!.apps.push({
+          appId: app.appId,
+          appName: app.appName,
+          color: app.color,
+          configured: intg.configured,
+          vaultGranted: intg.vaultGranted,
+          vaultSecretId: intg.vaultSecretId,
+        });
+      }
+    }
+    return Array.from(map.values()).sort((a, b) =>
+      a.label.localeCompare(b.label),
+    );
+  }, [apps]);
 
-  const totalIntegrations = apps.reduce(
-    (sum: number, a: any) => sum + (a.integrations?.length || 0),
-    0,
-  );
-  const configuredIntegrations = apps.reduce(
-    (sum: number, a: any) =>
-      sum + (a.integrations?.filter((i: any) => i.configured)?.length || 0),
-    0,
-  );
+  const available = services.filter((s) => !s.apps.some((a) => a.configured));
+  const connected = services.filter((s) => s.apps.some((a) => a.configured));
 
   return (
     <DispatchShell
-      title="Integrations"
-      description="See what credentials each app needs and their configuration status across the workspace."
+      title="Connections"
+      description="Connect services once. Apps that need them pick up the key automatically."
     >
-      {!isLoading && apps.length > 0 && (
-        <div className="grid gap-4 md:grid-cols-3">
-          <div className="rounded-2xl border bg-card p-5">
-            <div className="text-sm font-medium text-muted-foreground">
-              Apps discovered
-            </div>
-            <div className="mt-2 text-3xl font-semibold text-foreground">
-              {apps.length}
-            </div>
-            <div className="mt-1 text-xs text-muted-foreground">
-              {reachableApps.length} reachable
-            </div>
-          </div>
-          <div className="rounded-2xl border bg-card p-5">
-            <div className="text-sm font-medium text-muted-foreground">
-              Total integrations
-            </div>
-            <div className="mt-2 text-3xl font-semibold text-foreground">
-              {totalIntegrations}
-            </div>
-            <div className="mt-1 text-xs text-muted-foreground">
-              across all apps
-            </div>
-          </div>
-          <div className="rounded-2xl border bg-card p-5">
-            <div className="text-sm font-medium text-muted-foreground">
-              Configured
-            </div>
-            <div className="mt-2 text-3xl font-semibold text-foreground">
-              {configuredIntegrations}/{totalIntegrations}
-            </div>
-            <Progress
-              value={
-                totalIntegrations > 0
-                  ? Math.round(
-                      (configuredIntegrations / totalIntegrations) * 100,
-                    )
-                  : 0
-              }
-              className="mt-2 h-1.5"
-            />
-          </div>
+      {isLoading && services.length === 0 && (
+        <div className="rounded-2xl border border-dashed px-6 py-12 text-center text-sm text-muted-foreground">
+          Discovering apps and credentials…
         </div>
       )}
 
-      {isLoading && (
+      {!isLoading && services.length === 0 && (
         <div className="rounded-2xl border border-dashed px-6 py-12 text-center text-sm text-muted-foreground">
-          Discovering apps and fetching integration status...
+          No apps with declared integrations are reachable yet.
         </div>
       )}
 
-      {reachableApps.length > 0 && (
-        <div className="grid gap-4 xl:grid-cols-2">
-          {reachableApps.map((app: any) => (
-            <AppCard key={app.appId} app={app} />
-          ))}
-        </div>
+      {available.length > 0 && (
+        <section>
+          <div className="mb-3 flex items-baseline justify-between">
+            <h2 className="text-sm font-medium text-foreground">
+              Available to connect
+            </h2>
+            <span className="text-xs text-muted-foreground">
+              {available.length}
+            </span>
+          </div>
+          <div className="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
+            {available.map((service) => (
+              <ConnectorCard key={service.key} service={service} />
+            ))}
+          </div>
+        </section>
       )}
 
-      {unreachableApps.length > 0 && (
-        <div>
-          <h2 className="mb-3 text-sm font-medium text-muted-foreground">
-            Offline apps
-          </h2>
-          <div className="grid gap-4 xl:grid-cols-2">
-            {unreachableApps.map((app: any) => (
-              <AppCard key={app.appId} app={app} />
+      {connected.length > 0 && (
+        <section>
+          <div className="mb-3 mt-2 flex items-baseline justify-between">
+            <h2 className="text-sm font-medium text-foreground">Connected</h2>
+            <span className="text-xs text-muted-foreground">
+              {connected.length}
+            </span>
+          </div>
+          <div className="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
+            {connected.map((service) => (
+              <ConnectorCard key={service.key} service={service} />
             ))}
           </div>
-        </div>
+        </section>
       )}
 
-      {!isLoading && apps.length === 0 && (
-        <div className="rounded-2xl border border-dashed px-6 py-12 text-center text-sm text-muted-foreground">
-          No workspace apps found.
-        </div>
+      {apps.length > 0 && (
+        <Collapsible className="mt-6 rounded-2xl border bg-card">
+          <CollapsibleTrigger className="flex w-full items-center justify-between px-4 py-3 text-sm">
+            <span className="flex items-center gap-2 text-muted-foreground">
+              <IconPlugConnected size={14} />
+              Per-app status
+            </span>
+            <IconChevronRight
+              size={14}
+              className="text-muted-foreground transition group-data-[state=open]:rotate-90"
+            />
+          </CollapsibleTrigger>
+          <CollapsibleContent>
+            <div className="border-t">
+              {apps.map((app) => (
+                <PerAppDetailRow key={app.appId} app={app} />
+              ))}
+            </div>
+            <div className="flex items-center justify-end gap-1.5 border-t px-4 py-2.5 text-xs text-muted-foreground">
+              <IconLink size={12} />
+              <a href="/vault" className="hover:underline">
+                Open vault for advanced sharing
+              </a>
+            </div>
+          </CollapsibleContent>
+        </Collapsible>
       )}
     </DispatchShell>
   );

package/src/server/plugins/integrations.ts

@@ -23,7 +23,7 @@ When a user asks for something:
 - Exception: if the downstream agent reports a missing model/provider credential, do not name exact env vars, Vault keys, tokens, or secrets. Say the target app needs an LLM connection and recommend connecting Builder/managed LLM for that app; keep bring-your-own provider keys as a secondary option only if the user asks.
 - If the user asks to create, build, make, scaffold, or generate an "agent" from Dispatch chat or by tagging @agent-native in Slack, email, or Telegram, first classify the ask. If it is a simple Dispatch-native behavior like a reminder, digest, monitor, routing rule, saved instruction, or recurring workflow, create or update the recurring job/resource/destination in Dispatch. If it is a robust unique product or teammate that needs its own UI, data model, actions, integrations, or domain workflow, treat it as a new workspace app and call start-workspace-app-creation.
 - If a new-app prompt asks for access to Mail, Calendar, Analytics, or similar first-party app data/agents, keep using the existing hosted/connected app and A2A path. Do not ask Builder to scaffold those apps as children of the new app unless the user explicitly asks for a customized fork/copy.
-- If the user explicitly asks for a new app or workspace app, call start-workspace-app-creation with their prompt. Do not satisfy a new-app request by adding a route, page, component, or file inside apps/starter or another existing app unless the user explicitly asks to modify that existing app. If the request is too vague to classify, ask one concise follow-up. If the action returns mode "builder", reply with the Builder branch URL; Builder is responsible for creating the separate workspace app under apps/<app-id>, mounting it at /<app-id>, ensuring apps/<app-id>/package.json exists so Dispatch discovers it, using relative /<app-id> links instead of hardcoded localhost/dev ports, and preserving APP_BASE_PATH/VITE_APP_BASE_PATH via appBasePath() in the React Router client entry. There is no separate workspace app registry to edit. If it returns mode "local-agent", tell the user it is ready for the local code agent and include the returned app path/prompt summary. If it returns mode "coming-soon" or "builder-unavailable", explain the missing Builder setup and ask them to connect/configure Builder.
+- If the user explicitly asks for a new app or workspace app, call start-workspace-app-creation with their prompt. Do not satisfy a new-app request by adding a route, page, component, or file inside apps/starter or another existing app unless the user explicitly asks to modify that existing app. If the request is too vague to classify, ask one concise follow-up. If the action returns mode "builder", reply with the Builder branch URL; Builder is responsible for creating the separate workspace app under apps/<app-id>, mounting it at /<app-id>, ensuring apps/<app-id>/package.json exists so Dispatch discovers it, using relative /<app-id> links instead of hardcoded localhost/dev ports, and preserving APP_BASE_PATH/VITE_APP_BASE_PATH via appBasePath() in the React Router client entry. The new app lives at the workspace root /<app-id>, NOT under /dispatch/<app-id>, /apps/<app-id>, or any other Dispatch tab — when telling the user where to find it, link to /<app-id> only. There is no separate workspace app registry to edit. If it returns mode "local-agent", tell the user it is ready for the local code agent and include the returned app path/prompt summary. If it returns mode "coming-soon" or "builder-unavailable", explain the missing Builder setup and ask them to connect/configure Builder.
 - For digests, reminders, or saved behavior, prefer recurring jobs, resources, or destinations over chat replies.
 - Keep responses concise and operational — messaging platforms have character limits.
 - Use markdown sparingly (bold and lists are fine, avoid complex formatting).