nolo-cli 0.1.41 → 0.1.42

package/app/hooks/deleteDbKey.ts

@@ -13,6 +13,8 @@ import { deleteDialog } from "../../chat/dialog/dialogSlice";
 import { deleteTable } from "../../render/table/tableSlice";
 import { deleteContentFromSpace } from "../../create/space/spaceSlice";
 import { remove } from "../../database/dbSlice";
+import { removeFavoriteLocally } from "../favorite/favoriteSlice";
+import { resolveDeletedFavoriteProjectionRemoval } from "../favorite/deletedFavoriteProjection";
 import type { AppDispatch } from "../store";
 import type { RootState } from "../store";
 
@@ -25,21 +27,26 @@ type DeleteDbKeyInput =
         serverOrigin?: unknown;
         preferredServerOrigin?: unknown;
         spaceId?: unknown;
+        includeAttachments?: unknown;
     };
 
 type ResolvedDeleteInput = {
     contentKey: string;
     preferredServerOrigin?: string;
     inputSpaceId?: string | null;
+    includeAttachments?: boolean;
 };
 
 const performDirectDelete = async (
     dispatch: AppDispatch,
     contentKey: string,
-    preferredServerOrigin?: string
+    preferredServerOrigin?: string,
+    includeAttachments?: boolean
 ): Promise<void> => {
     if (isDialogKey(contentKey)) {
-        await (dispatch as any)(deleteDialog(contentKey)).unwrap();
+        await (dispatch as any)(
+            deleteDialog({ dialogKey: contentKey, includeAttachments })
+        ).unwrap();
         return;
     }
 
@@ -80,12 +87,14 @@ const resolveDeleteInput = (input: DeleteDbKeyInput): ResolvedDeleteInput => {
             typeof input.spaceId === "string" && input.spaceId.trim().length > 0
                 ? input.spaceId
                 : null;
+        const includeAttachments = input.includeAttachments === true;
         for (const candidate of candidates) {
             if (typeof candidate === "string" && candidate.trim()) {
                 return {
                     contentKey: candidate,
                     preferredServerOrigin,
                     inputSpaceId,
+                    includeAttachments,
                 };
             }
         }
@@ -185,6 +194,7 @@ export const deleteDbKey =
                     contentKey,
                     preferredServerOrigin,
                     inputSpaceId,
+                    includeAttachments,
                 } = resolveDeleteInput(input);
                 const effectiveSpaceId =
                     typeof spaceId === "string" && spaceId.trim().length > 0
@@ -200,7 +210,12 @@ export const deleteDbKey =
                 // 无论 space 操作结果如何，实体都必须被标记为已删除，
                 // 否则 deleteContentFromSpace 成功但跳过实体删除时，
                 // 远端活记录会在下一次 merge 时回流。
-                await performDirectDelete(dispatch, contentKey, preferredServerOrigin);
+                await performDirectDelete(
+                    dispatch,
+                    contentKey,
+                    preferredServerOrigin,
+                    includeAttachments
+                );
 
                 // 2. 如果有 spaceId，先完成本地 space 引用清理，再返回给 UI。
                 // 这仍然是 local-first 语义：
@@ -221,6 +236,12 @@ export const deleteDbKey =
                     });
                 }
 
+                const favoriteProjectionRemoval =
+                    resolveDeletedFavoriteProjectionRemoval(contentKey);
+                if (favoriteProjectionRemoval) {
+                    dispatch(removeFavoriteLocally(favoriteProjectionRemoval));
+                }
+
                 if (typeof window !== "undefined") {
                     window.dispatchEvent(new Event("nolo-user-data-updated"));
                 }

package/app/i18n/translations/interface.locale.ts

@@ -471,10 +471,18 @@ export default {
       tableShareLinkCopied: "Table share link copied",
       tableShareLinkGenerated: "Table share link generated",
       tableShareOpen: "Open share page",
-      tableShareLoadFailed: "Failed to load table share status",
-      tableShareReplicationIssue: "Replication needs attention",
-      tableShareReplicationLag: "Replication is still catching up",
-      myShares: {
+      tableShareLoadFailed: "Failed to load table share status",
+      tableShareReplicationIssue: "Replication needs attention",
+      tableShareReplicationLag: "Replication is still catching up",
+      contentIcon: {
+        change: "Change icon",
+        searchPlaceholder: "Search icons, plants, tables, code...",
+        emojiSection: "Emoji",
+        iconsSection: "Icons",
+        empty: "No matching icons",
+        clear: "Clear icon",
+      },
+      myShares: {
         title: "My Shares",
         subtitle: "Pages, conversations, tables, and apps you've published and shared.",
         browseCommunity: "Browse Community",
@@ -1008,10 +1016,18 @@ export default {
       tableShareLinkCopied: "表格分享链接已复制",
       tableShareLinkGenerated: "表格分享链接已生成",
       tableShareOpen: "打开分享页",
-      tableShareLoadFailed: "读取表格分享状态失败",
-      tableShareReplicationIssue: "跨服务器同步需要处理",
-      tableShareReplicationLag: "跨服务器同步仍在进行中",
-      myShares: {
+      tableShareLoadFailed: "读取表格分享状态失败",
+      tableShareReplicationIssue: "跨服务器同步需要处理",
+      tableShareReplicationLag: "跨服务器同步仍在进行中",
+      contentIcon: {
+        change: "更改图标",
+        searchPlaceholder: "搜索图标、花草、表格、代码...",
+        emojiSection: "Emoji",
+        iconsSection: "图标",
+        empty: "没有找到匹配的图标",
+        clear: "清除图标",
+      },
+      myShares: {
         title: "我的分享",
         subtitle: "你发布和分享出去的页面、对话、表格与应用。",
         browseCommunity: "浏览社区",
@@ -1545,10 +1561,18 @@ export default {
       tableShareLinkCopied: "表格分享連結已複製",
       tableShareLinkGenerated: "表格分享連結已生成",
       tableShareOpen: "開啟分享頁",
-      tableShareLoadFailed: "讀取表格分享狀態失敗",
-      tableShareReplicationIssue: "跨伺服器同步需要處理",
-      tableShareReplicationLag: "跨伺服器同步仍在進行中",
-      myShares: {
+      tableShareLoadFailed: "讀取表格分享狀態失敗",
+      tableShareReplicationIssue: "跨伺服器同步需要處理",
+      tableShareReplicationLag: "跨伺服器同步仍在進行中",
+      contentIcon: {
+        change: "更改圖示",
+        searchPlaceholder: "搜尋圖示、花草、表格、程式碼...",
+        emojiSection: "Emoji",
+        iconsSection: "圖示",
+        empty: "沒有找到符合的圖示",
+        clear: "清除圖示",
+      },
+      myShares: {
         title: "我的分享",
         subtitle: "你發布和分享出去的頁面、對話、表格與應用。",
         browseCommunity: "瀏覽社群",
@@ -2090,10 +2114,18 @@ export default {
       tableShareLinkCopied: "テーブル共有リンクをコピーしました",
       tableShareLinkGenerated: "テーブル共有リンクを生成しました",
       tableShareOpen: "共有ページを開く",
-      tableShareLoadFailed: "テーブル共有状態の読み込みに失敗しました",
-      tableShareReplicationIssue: "レプリケーションに対応が必要です",
-      tableShareReplicationLag: "レプリケーションはまだ反映中です",
-      myShares: {
+      tableShareLoadFailed: "テーブル共有状態の読み込みに失敗しました",
+      tableShareReplicationIssue: "レプリケーションに対応が必要です",
+      tableShareReplicationLag: "レプリケーションはまだ反映中です",
+      contentIcon: {
+        change: "アイコンを変更",
+        searchPlaceholder: "アイコン、植物、表、コードを検索...",
+        emojiSection: "Emoji",
+        iconsSection: "アイコン",
+        empty: "一致するアイコンがありません",
+        clear: "アイコンをクリア",
+      },
+      myShares: {
         title: "マイ共有",
         subtitle: "公開・共有したページ、会話、テーブル、アプリの一覧です。",
         browseCommunity: "コミュニティを見る",

package/app/types/appSummary.ts

@@ -1,4 +1,5 @@
 import { deriveAppIdFromRouteKey, isAppRouteKey, resolveAppRouteKey } from "../utils/appKeys";
+import type { ContentIcon } from "../../render/contentIcon/types";
 
 export type AppVisibility = "private" | "unlisted" | "public";
 export type AppDeployMode = "platform";
@@ -24,6 +25,7 @@ export interface AppSummary {
   modifiedOn?: string;
   visibility?: AppVisibility;
   deployMode?: AppDeployMode;
+  icon?: ContentIcon | null;
 }
 
 export interface AppSummaryRecord {
@@ -39,6 +41,7 @@ export interface AppSummaryRecord {
   updatedAt?: string | number;
   createdAt?: string | number;
   serverOrigin?: string;
+  icon?: ContentIcon | null;
 }
 
 const toTimestamp = (value: unknown): number => {
@@ -110,5 +113,6 @@ export function toAppSummary(
     modifiedOn: toIsoString(record.updatedAt ?? record.createdAt),
     visibility: record.visibility ?? "private",
     deployMode: record.deployMode ?? "platform",
+    icon: record.icon ?? null,
   };
 }

package/app/utils/desktopAgentRuntimeTurnClient.ts

@@ -16,6 +16,7 @@ export type DesktopAgentRuntimeTurnResult =
 type RunDesktopAgentRuntimeTurnArgs = {
   agentRef: string;
   input: AgentRuntimeMessageContent;
+  runtimeContext?: Record<string, any> | null;
   continueDialogId?: string;
   cwd?: string;
   fetchImpl?: typeof fetch;
@@ -30,6 +31,7 @@ function buildDesktopAgentRuntimeTurnBody(args: RunDesktopAgentRuntimeTurnArgs)
   return {
     agentRef: args.agentRef,
     input: args.input,
+    ...(args.runtimeContext ? { runtimeContext: args.runtimeContext } : {}),
     ...(continueDialogId ? { continueDialogId } : {}),
     ...(args.cwd ? { cwd: args.cwd } : {}),
   };

package/auth/adminPermissions.ts

@@ -1,12 +1,45 @@
-export type AdminPermissions = {
-  usageManagement?: boolean;
-};
+export const ADMIN_PERMISSION_DEFINITIONS = [
+  {
+    key: "usageManagement",
+    label: "用量管理",
+    shortLabel: "用量",
+    description: "查看用量报表、模型与提供商用量相关数据",
+  },
+  {
+    key: "growthStats",
+    label: "增长统计",
+    shortLabel: "增长",
+    description: "查看 7 天/30 天活跃、新增用户与增长趋势",
+  },
+] as const;
+
+export type AdminPermissionKey = (typeof ADMIN_PERMISSION_DEFINITIONS)[number]["key"];
+
+export type AdminPermissions = Partial<Record<AdminPermissionKey, boolean>>;
+
+const ADMIN_PERMISSION_KEYS = new Set<AdminPermissionKey>(
+  ADMIN_PERMISSION_DEFINITIONS.map((definition) => definition.key)
+);
+
+export const isAdminPermissionKey = (value: string): value is AdminPermissionKey =>
+  ADMIN_PERMISSION_KEYS.has(value as AdminPermissionKey);
 
 export const hasUsageManagementPermission = (value: unknown): boolean => {
+  return hasAdminPermission(value, "usageManagement");
+};
+
+export const hasGrowthStatsPermission = (value: unknown): boolean => {
+  return hasAdminPermission(value, "growthStats");
+};
+
+export const hasAdminPermission = (
+  value: unknown,
+  permissionKey: AdminPermissionKey
+): boolean => {
   if (!value || typeof value !== "object") return false;
   const permissions = (value as { adminPermissions?: AdminPermissions | null })
     .adminPermissions;
-  return permissions?.usageManagement === true;
+  return permissions?.[permissionKey] === true;
 };
 
 export const mergeAdminPermissions = (
@@ -16,3 +49,30 @@ export const mergeAdminPermissions = (
   ...(current && typeof current === "object" ? (current as AdminPermissions) : {}),
   ...patch,
 });
+
+export const parseAdminPermissionsPatch = (
+  value: unknown
+):
+  | { ok: true; patch: Partial<AdminPermissions> }
+  | { ok: false; error: string } => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return { ok: false, error: "admin permissions patch must be an object" };
+  }
+
+  const patch: Partial<AdminPermissions> = {};
+  for (const [key, rawValue] of Object.entries(value)) {
+    if (!isAdminPermissionKey(key)) {
+      return { ok: false, error: `Unsupported admin permission: ${key}` };
+    }
+    if (typeof rawValue !== "boolean") {
+      return { ok: false, error: `${key} must be boolean` };
+    }
+    patch[key] = rawValue;
+  }
+
+  if (Object.keys(patch).length === 0) {
+    return { ok: false, error: "admin permissions patch cannot be empty" };
+  }
+
+  return { ok: true, patch };
+};

package/auth/routes.ts

@@ -42,6 +42,11 @@ export const authRoutes = {
       method: "GET" as const,
       createPath: () => `${API_VERSION}/users/usage-report`,
     },
+    growthReport: {
+      path: `${API_VERSION}/users/growth-report`,
+      method: "GET" as const,
+      createPath: () => `${API_VERSION}/users/growth-report`,
+    },
     providerBillingHealth: {
       path: `${API_VERSION}/users/provider-billing-health`,
       method: "GET" as const,

package/chat/chat.locale.ts

@@ -16,6 +16,7 @@ export default {
       compressionError: "Image compression failed. Sending original images.",
       compressingImages: "Compressing images...",
       copyContent: "Copy Content",
+      copyDiagnostics: "Copy diagnostics",
       copyFailed: "Copy failed",
       copySuccess: "Copied successfully",
       createDialog: "Create Dialog",
@@ -230,6 +231,7 @@ export default {
       compressionError: "图片压缩失败，将发送原始图片",
       compressingImages: "正在压缩图片...",
       copyContent: "复制内容",
+      copyDiagnostics: "复制诊断信息",
       copyFailed: "复制失败",
       copySuccess: "复制成功",
       createDialog: "创建对话",
@@ -432,6 +434,7 @@ export default {
       compressionError: "圖片壓縮失敗，將發送原始圖片",
       compressingImages: "正在壓縮圖片...",
       copyContent: "複製內容",
+      copyDiagnostics: "複製診斷資訊",
       copyFailed: "複製失敗",
       copySuccess: "複製成功",
       createDialog: "創建對話",
@@ -623,6 +626,7 @@ export default {
       compressionError: "画像圧縮に失敗しました。元の画像を送信します。",
       compressingImages: "画像を圧縮中...",
       copyContent: "コンテンツをコピー",
+      copyDiagnostics: "診断情報をコピー",
       copyFailed: "コピーに失敗しました",
       copySuccess: "コピーに成功しました",
       createDialog: "対話を作成",

package/chat/dialog/actions/handleSendMessageAction.ts

@@ -190,8 +190,13 @@ export const handleSendMessageAction = async (
         });
 
         return;
-    } catch (error) {
+    } catch (error: any) {
         console.error("handleSendMessage failed:", error);
-        return rejectWithValue((error as Error).message);
+        const errorMessage = error instanceof Error
+            ? error.message
+            : typeof error === "string"
+            ? error
+            : error?.message || error?.error || String(error);
+        return rejectWithValue(errorMessage);
     }
 };

package/chat/dialog/dialogAttachmentCleanup.ts

@@ -0,0 +1,135 @@
+const FILE_CONTENT_RE = /(?:https?:\/\/[^/"'\s]+)?\/api\/v1\/db\/file\/content\/([^?#"'\s)]+)/g;
+
+export type DialogAttachmentMessage = {
+  id?: string;
+  dbKey?: string;
+  content?: unknown;
+  [key: string]: unknown;
+};
+
+export type DialogAttachmentCandidate = {
+  fileId: string;
+  fileDbKey: string | null;
+  size: number | null;
+  ownerType: string | null;
+  ownerId: string | null;
+  ownerDbKey: string | null;
+  source: string | null;
+  status: "delete" | "retain";
+  reason: string;
+};
+
+export type DialogAttachmentPlan = {
+  dialogId: string;
+  messageCount: number;
+  referencedFileIds: string[];
+  candidates: DialogAttachmentCandidate[];
+  deleteCandidates: DialogAttachmentCandidate[];
+  retainedCandidates: DialogAttachmentCandidate[];
+  bytesToDelete: number;
+  metadataReadFailures: Array<{ fileId: string; error: string }>;
+};
+
+export function extractFileContentIds(value: unknown): string[] {
+  const ids = new Set<string>();
+  const visit = (input: unknown) => {
+    if (typeof input === "string") {
+      for (const match of input.matchAll(FILE_CONTENT_RE)) {
+        const fileId = decodeURIComponent(match[1] ?? "").trim();
+        if (fileId) ids.add(fileId);
+      }
+      return;
+    }
+    if (Array.isArray(input)) {
+      for (const item of input) visit(item);
+      return;
+    }
+    if (input && typeof input === "object") {
+      for (const item of Object.values(input as Record<string, unknown>)) visit(item);
+    }
+  };
+  visit(value);
+  return [...ids];
+}
+
+function messageDbKey(dialogId: string, message: DialogAttachmentMessage) {
+  if (typeof message.dbKey === "string" && message.dbKey.trim()) {
+    return message.dbKey.trim();
+  }
+  if (typeof message.id === "string" && message.id.trim()) {
+    return `dialog-${dialogId}-msg-${message.id.trim()}`;
+  }
+  return null;
+}
+
+function asText(value: unknown) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+
+export function buildDialogAttachmentPlan(args: {
+  dialogId: string;
+  ownerId?: string | null;
+  includeUserOwnedReferenced?: boolean;
+  messages: DialogAttachmentMessage[];
+  metadataByFileId: Record<string, any>;
+  metadataReadFailures?: Array<{ fileId: string; error: string }>;
+}): DialogAttachmentPlan {
+  const messageKeys = new Set(
+    args.messages
+      .map((message) => messageDbKey(args.dialogId, message))
+      .filter((key): key is string => Boolean(key))
+  );
+  const referencedFileIds = [
+    ...new Set(args.messages.flatMap((message) => extractFileContentIds(message))),
+  ];
+
+  const candidates = referencedFileIds.map<DialogAttachmentCandidate>((fileId) => {
+    const metadata = args.metadataByFileId[fileId];
+    const ownerType = asText(metadata?.ownerType);
+    const ownerId = asText(metadata?.ownerId);
+    const ownerDbKey = asText(metadata?.ownerDbKey);
+    const fileDbKey = asText(metadata?.dbKey);
+    const source = asText(metadata?.source);
+    const ownedByDialog = ownerType === "dialog" && ownerId === args.dialogId;
+    const ownedByMessage = Boolean(ownerDbKey && messageKeys.has(ownerDbKey));
+    const userOwnedReferenced =
+      args.includeUserOwnedReferenced === true &&
+      Boolean(args.ownerId) &&
+      ownerType === "user" &&
+      ownerId === args.ownerId;
+    const canDelete = Boolean(fileDbKey && (ownedByDialog || ownedByMessage || userOwnedReferenced));
+
+    return {
+      fileId,
+      fileDbKey,
+      size: typeof metadata?.size === "number" && Number.isFinite(metadata.size) ? metadata.size : null,
+      ownerType,
+      ownerId,
+      ownerDbKey,
+      source,
+      status: canDelete ? "delete" : "retain",
+      reason: canDelete
+        ? ownedByMessage
+          ? "ownerDbKey matches a message in this dialog"
+          : userOwnedReferenced
+            ? "user-owned file is referenced by this dialog and explicit referenced-attachment deletion is enabled"
+            : "ownerType/ownerId matches this dialog"
+        : fileDbKey
+          ? "file ownership is not exclusive to this dialog"
+          : "file metadata not found",
+    };
+  });
+
+  const deleteCandidates = candidates.filter((candidate) => candidate.status === "delete");
+  const retainedCandidates = candidates.filter((candidate) => candidate.status === "retain");
+  return {
+    dialogId: args.dialogId,
+    messageCount: args.messages.length,
+    referencedFileIds,
+    candidates,
+    deleteCandidates,
+    retainedCandidates,
+    bytesToDelete: deleteCandidates.reduce((sum, candidate) => sum + (candidate.size ?? 0), 0),
+    metadataReadFailures: args.metadataReadFailures ?? [],
+  };
+}

package/chat/dialog/dialogSlice.ts

@@ -18,6 +18,11 @@ import { clearPlan } from "../../ai/agent/planSlice";
 import { clearWorkflow } from "../../ai/workflow/workflowSlice";
 
 import { scheduleDeleteReplication } from "../../database/actions/replication";
+import {
+  buildDialogAttachmentPlan,
+  extractFileContentIds,
+  type DialogAttachmentMessage,
+} from "./dialogAttachmentCleanup";
 
 // 外部 Actions
 import { updateTokensAction } from "./actions/updateTokensAction";
@@ -46,6 +51,99 @@ const collectKeys = async (prefix: string, db: any): Promise<string[]> => {
   return keys;
 };
 
+const collectEntries = async (prefix: string, db: any): Promise<Array<[string, any]>> => {
+  const entries: Array<[string, any]> = [];
+  let iterator = db.iterator({
+    gte: prefix,
+    lte: prefix + "\uffff",
+  });
+
+  if (iterator && typeof iterator.then === "function") {
+    iterator = await iterator;
+  }
+
+  for await (const [key, value] of iterator) {
+    entries.push([key as string, value]);
+  }
+
+  return entries;
+};
+
+const dbGetOrNull = async (db: any, key: string) => {
+  if (!db || typeof db.get !== "function") return null;
+  try {
+    return await db.get(key);
+  } catch {
+    return null;
+  }
+};
+
+const readLocalFileMetadata = async (db: any, fileId: string) => {
+  const direct = await dbGetOrNull(db, fileId);
+  if (direct) return direct;
+  const index = await dbGetOrNull(db, createKey("file", "id", fileId));
+  const mainKey =
+    typeof index?.mainKey === "string" && index.mainKey.trim()
+      ? index.mainKey.trim()
+      : null;
+  return mainKey ? await dbGetOrNull(db, mainKey) : null;
+};
+
+type DeleteDialogPayload =
+  | string
+  | {
+      dialogKey: string;
+      includeAttachments?: boolean;
+    };
+
+const normalizeDeleteDialogPayload = (payload: DeleteDialogPayload) =>
+  typeof payload === "string"
+    ? { dialogKey: payload, includeAttachments: false }
+    : {
+        dialogKey: payload.dialogKey,
+        includeAttachments: payload.includeAttachments === true,
+      };
+
+const deleteOwnedDialogAttachments = async (args: {
+  db: any;
+  dialogId: string;
+  entries: Array<[string, any]>;
+  thunkApi: any;
+}) => {
+  const messages: DialogAttachmentMessage[] = args.entries.map(([dbKey, value]) => ({
+    ...(value && typeof value === "object" ? value : {}),
+    dbKey,
+  }));
+  const fileIds = [...new Set(messages.flatMap((message) => extractFileContentIds(message)))];
+  const metadataByFileId: Record<string, any> = {};
+  const metadataReadFailures: Array<{ fileId: string; error: string }> = [];
+
+  for (const fileId of fileIds) {
+    const metadata = await readLocalFileMetadata(args.db, fileId);
+    if (metadata) {
+      metadataByFileId[fileId] = metadata;
+    } else {
+      metadataReadFailures.push({ fileId, error: "local file metadata not found" });
+    }
+  }
+
+  const plan = buildDialogAttachmentPlan({
+    dialogId: args.dialogId,
+    messages,
+    metadataByFileId,
+    metadataReadFailures,
+  });
+  if (!plan.deleteCandidates.length) return plan;
+
+  const { deleteFileAction } = await import("../../database/actions/deleteFile");
+  for (const candidate of plan.deleteCandidates) {
+    if (candidate.fileDbKey) {
+      await deleteFileAction(candidate.fileDbKey, args.thunkApi);
+    }
+  }
+  return plan;
+};
+
 const createSliceWithThunks = buildCreateSlice({
   creators: { asyncThunk: asyncThunkCreator },
 });
@@ -301,7 +399,8 @@ const dialogSlice = createSliceWithThunks({
     ),
 
     deleteDialog: create.asyncThunk(
-      async (dialogKey: string, thunkApi) => {
+      async (payload: DeleteDialogPayload, thunkApi) => {
+        const { dialogKey, includeAttachments } = normalizeDeleteDialogPayload(payload);
         const { dispatch, getState, extra } = thunkApi;
         const { db } = extra;
         const state = getState() as RootState;
@@ -319,8 +418,22 @@ const dialogSlice = createSliceWithThunks({
         // --- 无论是否是当前对话，都从当前空间删除该内容 ---
         await (dispatch as any)(remove(dialogKey));
         const prefix = createKey("dialog", targetDialogId, "msg");
-        const deletedIds = await collectKeys(prefix, db);
-        if (!deletedIds.length) return { ids: [] };
+        const deletedEntries = includeAttachments
+          ? await collectEntries(prefix, db)
+          : [];
+        const attachmentPlan =
+          includeAttachments && targetDialogId
+            ? await deleteOwnedDialogAttachments({
+                db,
+                dialogId: targetDialogId,
+                entries: deletedEntries,
+                thunkApi,
+              })
+            : null;
+        const deletedIds = includeAttachments
+          ? deletedEntries.map(([key]) => key)
+          : await collectKeys(prefix, db);
+        if (!deletedIds.length) return { dialogKey, isCurrentDialog, attachmentPlan };
 
         const ops = deletedIds.map((key) => ({ type: "del" as const, key }));
 
@@ -341,7 +454,7 @@ const dialogSlice = createSliceWithThunks({
           dispatch(clearWorkflow());
         }
 
-        return { dialogKey, isCurrentDialog };
+        return { dialogKey, isCurrentDialog, attachmentPlan };
       },
       {
         fulfilled: (state, action) => {