@nextclaw/ui 0.16.0 → 0.17.1

package/src/features/service-apps/components/service-app-list-item.tsx

@@ -2,10 +2,12 @@ import { useState } from "react";
 import type {
   ServiceActionGrantView,
   ServiceActionListView,
+  AppDataEntry,
   ServiceAppRecordView,
 } from "@nextclaw/client-sdk";
 import {
   AlertTriangle,
+  Boxes,
   CheckCircle2,
   ChevronDown,
   CircleDashed,
@@ -20,7 +22,7 @@ import {
   type LucideIcon,
   Wrench,
 } from "lucide-react";
-import { ConfirmDialog } from "@/shared/components/ui/confirm-dialog";
+import { ServiceAppDeleteDialog } from "@/features/service-apps/components/service-app-delete-dialog";
 import {
   Popover,
   PopoverContent,
@@ -44,10 +46,15 @@ export function ServiceAppListItem({
   actionsOpen,
   grants,
   deletePending,
+  deleteError,
+  dataEntry,
+  dataLoading,
   isDiscovering,
   onActionsOpenChange,
   onDiscover,
+  onManagePackage,
   onDelete,
+  onResetDelete,
   onRestart,
   onRevoke,
 }: {
@@ -56,26 +63,32 @@ export function ServiceAppListItem({
   actionsOpen: boolean;
   grants: ServiceActionGrantView[];
   deletePending: boolean;
+  deleteError: unknown;
+  dataEntry?: AppDataEntry;
+  dataLoading: boolean;
   isDiscovering: boolean;
   onActionsOpenChange: (open: boolean) => void;
   onDiscover: (appId: string) => void;
-  onDelete: (appId: string) => void;
+  onManagePackage: (packageId: string) => void;
+  onDelete: (appId: string, purgeData: boolean, onSuccess: () => void) => void;
+  onResetDelete: () => void;
   onRestart: (appId: string) => void;
   onRevoke: (grant: ServiceActionGrantView) => void;
 }) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
   const [isDiagnosticsOpen, setIsDiagnosticsOpen] = useState(false);
-  const canConnectAndDiscover =
-    app.status !== "starting" && app.status !== "stopped";
-  const canDisconnectRuntime =
-    app.status === "running" || app.status === "failed";
+  const [purgeData, setPurgeData] = useState(false);
+  const canConnectAndDiscover = app.status !== "starting" && app.status !== "stopped";
+  const canDisconnectRuntime = app.status === "running" || app.status === "failed";
+  const managedPackageId = app.sourceKind === "package" ? app.packageId : undefined;
   const diagnostics = getServiceAppDiagnostics(app);
   const openDeleteDialog = () => {
     setIsMenuOpen(false);
+    setPurgeData(false);
+    onResetDelete();
     setIsDeleteDialogOpen(true);
   };
-
   return (
     <TooltipProvider delayDuration={250}>
       <section className="group bg-card transition-colors hover:bg-muted/25">
@@ -156,13 +169,24 @@ export function ServiceAppListItem({
                     onRestart(app.id);
                   }}
                 />
-                <ServiceAppMenuItem
-                  destructive
-                  disabled={deletePending}
-                  icon={Trash2}
-                  label={t("serviceAppsDelete")}
-                  onClick={openDeleteDialog}
-                />
+                {managedPackageId ? (
+                  <ServiceAppMenuItem
+                    icon={Boxes}
+                    label={t("serviceAppsManagePackage")}
+                    onClick={() => {
+                      setIsMenuOpen(false);
+                      onManagePackage(managedPackageId);
+                    }}
+                  />
+                ) : (
+                  <ServiceAppMenuItem
+                    destructive
+                    disabled={deletePending}
+                    icon={Trash2}
+                    label={t("serviceAppsDelete")}
+                    onClick={openDeleteDialog}
+                  />
+                )}
               </PopoverContent>
             </Popover>
           </div>
@@ -233,16 +257,21 @@ export function ServiceAppListItem({
           ) : null}
         </div>
 
-        <ConfirmDialog
+      {app.sourceKind !== "package" ? (
+        <ServiceAppDeleteDialog
+          appId={app.id}
+          appTitle={app.title}
+          dataEntry={dataEntry}
+          dataLoading={dataLoading}
+          deleteError={deleteError}
+          deletePending={deletePending}
           open={isDeleteDialogOpen}
+          purgeData={purgeData}
+          onDelete={onDelete}
           onOpenChange={setIsDeleteDialogOpen}
-          title={t("serviceAppsDeleteConfirmTitle")}
-          description={`${t("serviceAppsDeleteConfirmDescription")} ${app.title}`}
-          confirmLabel={t("delete")}
-          variant="destructive"
-          onConfirm={() => onDelete(app.id)}
-          onCancel={() => undefined}
+          onPurgeDataChange={setPurgeData}
         />
+      ) : null}
       </section>
     </TooltipProvider>
   );

package/src/features/service-apps/components/service-apps-panel.tsx

@@ -2,9 +2,11 @@ import { useState } from "react";
 import type {
   ServiceActionGrantView,
   ServiceActionListView,
+  AppDataEntry,
   ServiceAppRecordView,
 } from "@nextclaw/client-sdk";
 import { RefreshCw, Server } from "lucide-react";
+import { useAppData } from "@/features/app-data";
 import { ServiceAppListItem } from "@/features/service-apps/components/service-app-list-item";
 import {
   useDeleteServiceApp,
@@ -25,8 +27,13 @@ import { t } from "@/shared/lib/i18n";
 
 type ServiceActionView = ServiceActionListView["actions"][number];
 
-export function ServiceAppsPanel() {
+export function ServiceAppsPanel({
+  onManagePackage,
+}: {
+  onManagePackage: (packageId: string) => void;
+}) {
   const serviceApps = useServiceApps();
+  const appData = useAppData();
   const serviceActions = useServiceActions();
   const serviceActionGrants = useServiceActionGrants();
   const deleteServiceApp = useDeleteServiceApp();
@@ -44,6 +51,7 @@ export function ServiceAppsPanel() {
     void serviceApps.refetch();
     void serviceActions.refetch();
     void serviceActionGrants.refetch();
+    void appData.refetch();
   };
 
   if (
@@ -73,6 +81,7 @@ export function ServiceAppsPanel() {
   }
 
   const apps: ServiceAppRecordView[] = serviceApps.data?.entries ?? [];
+  const diagnostics = serviceApps.data?.diagnostics ?? [];
   const actions: ServiceActionView[] = serviceActions.data?.actions ?? [];
   const grants: ServiceActionGrantView[] =
     serviceActionGrants.data?.grants ?? [];
@@ -85,6 +94,9 @@ export function ServiceAppsPanel() {
       setExpandedActionsByApp((current) => ({ ...current, [appId]: true }));
     });
   };
+  const workspaceDataEntries = (appData.data?.entries ?? [])
+    .filter((entry): entry is AppDataEntry =>
+      entry.source === "workspace-service" && entry.lifecycle === "active");
 
   return (
     <div className="flex h-full min-h-0 flex-col bg-card text-card-foreground">
@@ -108,6 +120,22 @@ export function ServiceAppsPanel() {
         </TooltipProvider>
       </div>
 
+      {diagnostics.length > 0 ? (
+        <div
+          role="alert"
+          className="mx-3 mt-3 rounded-xl border border-destructive/20 bg-destructive/5 px-3 py-2.5 text-xs text-destructive sm:mx-4"
+        >
+          <div className="font-medium">{t("serviceAppsLoadFailed")}</div>
+          <ul className="mt-1 space-y-1">
+            {diagnostics.map((diagnostic) => (
+              <li key={diagnostic.stagedPath} className="break-words">
+                {diagnostic.appId}: {diagnostic.message}
+              </li>
+            ))}
+          </ul>
+        </div>
+      ) : null}
+
       {apps.length === 0 ? (
         <div className="flex flex-1 items-center justify-center px-6 py-8 text-center">
           <div className="w-full max-w-xs">
@@ -136,6 +164,9 @@ export function ServiceAppsPanel() {
                 actionsOpen={Boolean(expandedActionsByApp[app.id])}
                 grants={grants}
                 deletePending={deleteServiceApp.isPending}
+                deleteError={deleteServiceApp.error}
+                dataEntry={workspaceDataEntries.find((entry) => entry.appId === app.id)}
+                dataLoading={appData.isLoading}
                 isDiscovering={discoverServiceAppActions.isPending}
                 onActionsOpenChange={(open) =>
                   setExpandedActionsByApp((current) => ({
@@ -144,7 +175,12 @@ export function ServiceAppsPanel() {
                   }))
                 }
                 onDiscover={discover}
-                onDelete={(appId) => void deleteServiceApp.mutate(appId)}
+                onManagePackage={onManagePackage}
+                onDelete={(appId, purgeData, onSuccess) => void deleteServiceApp.mutate(
+                  { appId, purgeData },
+                  { onSuccess },
+                )}
+                onResetDelete={deleteServiceApp.reset}
                 onRestart={(appId) => void restartServiceApp.mutate(appId)}
                 onRevoke={(grant) =>
                   void revokeServiceActionGrant.mutate({

package/src/features/service-apps/hooks/use-service-apps.ts

@@ -4,6 +4,7 @@ import { nextclawClient } from '@/shared/lib/api';
 const SERVICE_APPS_QUERY_KEY = ['service-apps'] as const;
 const SERVICE_ACTIONS_QUERY_KEY = ['service-actions'] as const;
 const SERVICE_ACTION_GRANTS_QUERY_KEY = ['service-action-grants'] as const;
+const APP_DATA_QUERY_KEY = ['app-data'] as const;
 
 export function useServiceApps() {
   return useQuery({
@@ -42,12 +43,14 @@ export function useRestartServiceApp() {
 export function useDeleteServiceApp() {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: (appId: string) => nextclawClient.serviceApps.deleteServiceApp(appId),
+    mutationFn: (input: { appId: string; purgeData: boolean }) =>
+      nextclawClient.serviceApps.deleteServiceApp(input.appId, input.purgeData),
     onSuccess: async () => {
       await Promise.all([
         queryClient.invalidateQueries({ queryKey: SERVICE_APPS_QUERY_KEY }),
         queryClient.invalidateQueries({ queryKey: SERVICE_ACTIONS_QUERY_KEY }),
         queryClient.invalidateQueries({ queryKey: SERVICE_ACTION_GRANTS_QUERY_KEY }),
+        queryClient.invalidateQueries({ queryKey: APP_DATA_QUERY_KEY }),
       ]);
     },
   });

package/src/shared/lib/i18n/locales/en-US/doc-browser.json

@@ -34,6 +34,8 @@
   "appPackagesLibraryTitle": "Your apps",
   "appPackagesLibraryDescription": "Open and manage the apps in NextClaw. Installs continue in the background, and personal data stays local.",
   "appPackagesLoading": "Loading apps…",
+  "appPackagesDataUsageUnavailable": "Size unavailable",
+  "appPackagesNoDataYet": "No data yet",
   "appPackagesLoadFailed": "Failed to load apps",
   "appPackagesRefresh": "Refresh apps",
   "appPackagesBrowse": "Add apps",
@@ -117,6 +119,25 @@
   "appPackagesRollbackCompleted": "App version switched",
   "appPackagesUninstallCompleted": "App uninstalled",
   "appPackagesNextClawRequirement": "Requires NextClaw",
+  "appDataRetainedTitle": "Saved app data",
+  "appDataRetainedDescription": "Data kept after an app was removed stays here until you reinstall the app or delete the data.",
+  "appDataLoadFailed": "Failed to load saved app data",
+  "appDataDiagnosticsTitle": "Some app data needs attention",
+  "appDataDeleteAction": "Delete data",
+  "appDataDeleteTitle": "Permanently delete this app data?",
+  "appDataDeleteDescription": "This removes the app's private data from this device. Files you exported or saved outside the app remain untouched.",
+  "appDataDeletePermanently": "Permanently delete data",
+  "appDataDeleting": "Deleting data…",
+  "appDataDeleteCompleted": "App data deleted",
+  "appDataDeleteFailed": "Failed to delete app data",
+  "appDataStorageTotal": "Total app data",
+  "appDataStoragePath": "Managed instance path",
+  "appDataClassData": "Personal data",
+  "appDataClassConfig": "Settings",
+  "appDataClassState": "State",
+  "appDataClassCache": "Cache",
+  "appDataClassTemporary": "Temporary",
+  "appDataClassLogs": "Logs",
   "panelAppsTitle": "Panel Apps",
   "panelAppsLoading": "Loading panel apps...",
   "panelAppsLoadFailed": "Failed to load panel apps",
@@ -163,8 +184,12 @@
   "serviceAppsDisconnectRuntimeHint": "Close the current runtime connection and return the service app to not connected.",
   "serviceAppsMoreActions": "More actions",
   "serviceAppsDelete": "Delete service app",
+  "serviceAppsManagePackage": "Manage in Apps",
   "serviceAppsDeleteConfirmTitle": "Delete service app?",
-  "serviceAppsDeleteConfirmDescription": "This will delete the service app directory and cannot be undone.",
+  "serviceAppsDeleteConfirmDescription": "The service source will be deleted. Its private data is kept by default.",
+  "serviceAppsKeepDataDescription": "Delete the service source but keep its private data for a future copy of the same service.",
+  "serviceAppsDeleteDataDescription": "Permanently delete the service source and its managed private data.",
+  "serviceAppsDataUnavailable": "Storage details are unavailable. Keep data selected or refresh before deleting.",
   "serviceAppsStatus_idle": "Not connected",
   "serviceAppsStatus_starting": "Connecting",
   "serviceAppsStatus_running": "Connected",

package/src/shared/lib/i18n/locales/zh-CN/doc-browser.json

@@ -34,6 +34,8 @@
   "appPackagesLibraryTitle": "你的应用",
   "appPackagesLibraryDescription": "打开和管理装进 NextClaw 的应用。安装会在后台继续，个人数据保存在本机。",
   "appPackagesLoading": "加载应用中…",
+  "appPackagesDataUsageUnavailable": "大小不可用",
+  "appPackagesNoDataYet": "尚无数据",
   "appPackagesLoadFailed": "应用加载失败",
   "appPackagesRefresh": "刷新应用",
   "appPackagesBrowse": "添加应用",
@@ -117,6 +119,25 @@
   "appPackagesRollbackCompleted": "应用版本已切换",
   "appPackagesUninstallCompleted": "应用已卸载",
   "appPackagesNextClawRequirement": "需要 NextClaw",
+  "appDataRetainedTitle": "已保留的应用数据",
+  "appDataRetainedDescription": "卸载应用时保留的数据会留在这里。重新安装可以继续使用，也可以单独永久删除。",
+  "appDataLoadFailed": "已保留的应用数据加载失败",
+  "appDataDiagnosticsTitle": "部分应用数据需要处理",
+  "appDataDeleteAction": "删除数据",
+  "appDataDeleteTitle": "永久删除这些应用数据？",
+  "appDataDeleteDescription": "这会从本机移除该应用的私有数据。已导出或保存在应用目录之外的文件不会被删除。",
+  "appDataDeletePermanently": "永久删除数据",
+  "appDataDeleting": "正在删除数据…",
+  "appDataDeleteCompleted": "应用数据已删除",
+  "appDataDeleteFailed": "应用数据删除失败",
+  "appDataStorageTotal": "应用数据总量",
+  "appDataStoragePath": "受管实例路径",
+  "appDataClassData": "个人数据",
+  "appDataClassConfig": "设置",
+  "appDataClassState": "状态",
+  "appDataClassCache": "缓存",
+  "appDataClassTemporary": "临时文件",
+  "appDataClassLogs": "日志",
   "panelAppsTitle": "面板应用",
   "panelAppsLoading": "加载面板应用中...",
   "panelAppsLoadFailed": "面板应用加载失败",
@@ -163,8 +184,12 @@
   "serviceAppsDisconnectRuntimeHint": "断开当前运行时连接，并将服务应用恢复为未连接状态。",
   "serviceAppsMoreActions": "更多操作",
   "serviceAppsDelete": "删除服务应用",
+  "serviceAppsManagePackage": "在应用中管理",
   "serviceAppsDeleteConfirmTitle": "删除服务应用？",
-  "serviceAppsDeleteConfirmDescription": "这会删除服务应用目录，且无法撤销。",
+  "serviceAppsDeleteConfirmDescription": "服务源码会被删除，私有数据默认保留。",
+  "serviceAppsKeepDataDescription": "删除服务源码，但保留私有数据，之后放回同一服务仍可继续使用。",
+  "serviceAppsDeleteDataDescription": "永久删除服务源码及其受管私有数据。",
+  "serviceAppsDataUnavailable": "暂时无法读取存储详情。请保留数据，或刷新后再删除。",
   "serviceAppsStatus_idle": "未连接",
   "serviceAppsStatus_starting": "连接中",
   "serviceAppsStatus_running": "已连接",