dsh-archived-chats 1.3.2 → 1.3.3

package/lib/index.js

@@ -88,14 +88,6 @@ import { createRetentionStore } from './retention.js';
 import { startRetentionScheduler } from './auto-retention.js';
 import { createRetentionService } from './retention-service.js';
 import { projectLineage } from './lineage.js';
-import { createHistoryService } from './history.js';
-import { createHistoryRestoreService } from './history-restore.js';
-import {
-    createLegacyRecycleService,
-    createLegacyRecycleStore,
-    createRecycleHub,
-    createUnifiedTrashStore,
-} from './legacy-recycle.js';
 import { createWorkspaceBulkArchiveService } from './workspace-bulk-archive.js';
 import { resolvePersistenceCompat } from './persistence-compat.js';
 import { atomicWriteFile } from './durable.js';
@@ -820,7 +812,7 @@ async function deleteSession(ctx, registry, persistence, id, titleCache, statsSe
 //#endregion
 
 //#region routes
-function registerRoutes(ctx, webServer, registry, persistence, titleCache, metadataStore, statsService, pendingStore, trashStore, snapshotStore, retentionStore, legacyRecycleStore, lifecycle, importTokens, restoreAdapter) {
+function registerRoutes(ctx, webServer, registry, persistence, titleCache, metadataStore, statsService, pendingStore, trashStore, snapshotStore, retentionStore, lifecycle, importTokens, restoreAdapter) {
     const projectedMessages = createProjectedMessageCache((id) => persistence.inspect(id));
     const listInsightSessions = async () => {
         const pending = await pendingStore.load();
@@ -849,15 +841,6 @@ function registerRoutes(ctx, webServer, registry, persistence, titleCache, metad
         snapshotStore,
         listSessions: listInsightSessions,
     });
-    const historyService = createHistoryService({
-        registry,
-        persistence,
-        sessions: ctx.get('sessions'),
-        metadataStore,
-        trashStore,
-        snapshotStore,
-        lifecycle,
-    });
     let workspaceBulkArchiveService = null;
     let workspaceArchiveUnavailableLogged = false;
     const workspaceArchiveSecret = randomUUID();
@@ -899,9 +882,8 @@ function registerRoutes(ctx, webServer, registry, persistence, titleCache, metad
         statsService.invalidate(ids);
         projectedMessages.invalidate(ids);
         insightsService.invalidate();
-        historyService.invalidate();
     };
-    const regularRecycleService = createRecycleService({
+    const recycleService = createRecycleService({
         registry,
         persistence,
         attachments: ctx.get('attachments'),
@@ -935,50 +917,15 @@ function registerRoutes(ctx, webServer, registry, persistence, titleCache, metad
         invalidate: invalidateRecycleCaches,
         logger: ctx.logger,
     });
-    const historyRestoreService = createHistoryRestoreService({
-        snapshotStore,
-        persistence,
-        attachments: ctx.get('attachments'),
-        registry,
-        metadataStore,
-        lifecycle,
-        invalidate: (restoredId, sourceId) => {
-            titleCache.delete(restoredId);
-            statsService.invalidate([restoredId]);
-            projectedMessages.invalidate([restoredId, sourceId]);
-            insightsService.invalidate();
-            historyService.invalidate();
-        },
-        logger: ctx.logger,
-    });
-    const legacyRecycleService = createLegacyRecycleService({
-        store: legacyRecycleStore,
-        historyService,
-        historyRestoreService,
-        snapshotStore,
-        trashStore,
-        lifecycle,
-        logger: ctx.logger,
-    });
-    const recycleService = createRecycleHub({
-        recycleService: regularRecycleService,
-        legacyRecycleService,
-    });
-    const unifiedTrashStore = createUnifiedTrashStore({ trashStore, legacyRecycleService });
     const retentionService = createRetentionService({
         insightsService,
         retentionStore,
-        trashStore: unifiedTrashStore,
+        trashStore,
         snapshotStore,
         recycleService,
         lifecycle,
     });
 
-    const historyError = (res, error, fallback) => {
-        const status = error?.status ?? (error instanceof SyntaxError || error instanceof TypeError ? 400 : 500);
-        send(res, status, { ok: false, error: error?.code ?? fallback });
-    };
-
     const workspaceArchiveError = (res, error, fallback) => {
         const status = error?.status ?? (error instanceof SyntaxError || error instanceof TypeError ? 400 : 500);
         send(res, status, { ok: false, error: error?.code ?? fallback });
@@ -1036,130 +983,6 @@ function registerRoutes(ctx, webServer, registry, persistence, titleCache, metad
         },
     }), 'archived-chats: workspace archive apply route');
 
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/capture`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            send(res, 410, { ok: false, error: 'history-capture-retired' });
-        },
-    }), 'archived-chats: history capture route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history`,
-        handler: async (req, res) => {
-            if (req.method !== 'GET') { send(res, 405, { ok: false, error: 'method-not-allowed' }); return; }
-            try { send(res, 200, { ok: true, ...(await historyService.list()) }); }
-            catch (error) { historyError(res, error, 'history-list-failed'); }
-        },
-    }), 'archived-chats: history route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/delete`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            try {
-                const body = await readBody(req, 64 * 1024);
-                if (!exactBody(body, ['snapshotId']) || typeof body.snapshotId !== 'string' || body.snapshotId === '') {
-                    send(res, 400, { ok: false, error: 'history-delete-invalid' });
-                    return;
-                }
-                const result = await historyService.deleteVersion(body.snapshotId);
-                insightsService.invalidate();
-                send(res, 200, { ok: true, ...result });
-            } catch (error) { historyError(res, error, 'history-delete-failed'); }
-        },
-    }), 'archived-chats: history delete route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/delete-all`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            try {
-                const body = await readBody(req, 64 * 1024);
-                if (!exactBody(body, [])) {
-                    send(res, 400, { ok: false, error: 'history-delete-all-invalid' });
-                    return;
-                }
-                const result = await historyService.clear();
-                if (result.deleted.length > 0) insightsService.invalidate();
-                const status = result.failed.length > 0 && result.deleted.length === 0 ? 409 : 200;
-                send(res, status, { ok: result.failed.length === 0, ...result });
-            } catch (error) { historyError(res, error, 'history-delete-all-failed'); }
-        },
-    }), 'archived-chats: history delete all route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/preview`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            try {
-                const body = await readBody(req, 64 * 1024);
-                if (!exactBody(body, ['snapshotId', 'offset', 'limit']) || typeof body.snapshotId !== 'string') {
-                    send(res, 400, { ok: false, error: 'history-preview-invalid' });
-                    return;
-                }
-                send(res, 200, { ok: true, ...(await historyService.preview(body.snapshotId, { offset: body.offset, limit: body.limit })) });
-            } catch (error) { historyError(res, error, 'history-preview-failed'); }
-        },
-    }), 'archived-chats: history preview route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/preview/image`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            const request = requestAbort(req);
-            try {
-                const body = await readBody(req, 64 * 1024);
-                if (!exactBody(body, ['snapshotId', 'attachment']) || typeof body.snapshotId !== 'string'
-                    || body.attachment === null || typeof body.attachment !== 'object' || Array.isArray(body.attachment)) {
-                    send(res, 400, { ok: false, error: 'history-preview-image-invalid' });
-                    return;
-                }
-                const image = await historyService.readImage(body.snapshotId, body.attachment, request.signal);
-                sendImage(res, { data: image.data, ref: { mediaType: image.mediaType } });
-            } catch (error) {
-                if (!request.signal.aborted) historyError(res, error, 'history-preview-image-failed');
-            } finally { request.dispose(); }
-        },
-    }), 'archived-chats: history preview image route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/restore/preview`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            try {
-                const body = await readBody(req, 64 * 1024);
-                if (!exactBody(body, ['snapshotId']) || typeof body.snapshotId !== 'string' || body.snapshotId === '') {
-                    send(res, 400, { ok: false, error: 'history-restore-preview-invalid' });
-                    return;
-                }
-                send(res, 200, { ok: true, ...(await historyRestoreService.prepare(body.snapshotId)) });
-            } catch (error) { historyError(res, error, 'history-restore-preview-failed'); }
-        },
-    }), 'archived-chats: history restore preview route');
-
-    ctx.effect(() => webServer.register({
-        kind: 'exact',
-        path: `${ROUTE_PREFIX}/history/restore`,
-        handler: async (req, res) => {
-            if (!guard(req, res)) return;
-            try {
-                const body = await readBody(req, 64 * 1024);
-                if (!exactBody(body, ['token', 'nonce']) || typeof body.token !== 'string' || typeof body.nonce !== 'string') {
-                    send(res, 400, { ok: false, error: 'history-restore-confirmation-invalid' });
-                    return;
-                }
-                send(res, 200, { ok: true, ...(await historyRestoreService.restore(body.token, body.nonce)) });
-            } catch (error) { historyError(res, error, 'history-restore-failed'); }
-        },
-    }), 'archived-chats: history restore route');
     ctx.effect(() => webServer.register({
         kind: 'exact',
         path: `${ROUTE_PREFIX}/state`,
@@ -1805,7 +1628,6 @@ export function apply(ctx) {
     const pendingStore = createPendingStore();
     const trashStore = createTrashStore({ path: join(pluginDataRoot, 'trash.json') });
     const retentionStore = createRetentionStore({ path: join(pluginDataRoot, 'retention.json') });
-    const legacyRecycleStore = createLegacyRecycleStore({ path: join(pluginDataRoot, 'legacy-recycle.json') });
     const importTokens = createImportTokenStore();
     const lifecycle = createLifecycleQueue();
     let statsService;
@@ -1830,7 +1652,7 @@ export function apply(ctx) {
             metadataStore,
             tempRoot: join(process.env.DSH_HOME ?? join(homedir(), '.dsh'), 'plugin-data', 'archived-chats', 'imports'),
         });
-        const { recycleService, retentionService } = registerRoutes(ctx, webServer, registry, persistence, titleCache, metadataStore, statsService, pendingStore, trashStore, snapshotStore, retentionStore, legacyRecycleStore, lifecycle, importTokens, restoreAdapter);
+        const { recycleService, retentionService } = registerRoutes(ctx, webServer, registry, persistence, titleCache, metadataStore, statsService, pendingStore, trashStore, snapshotStore, retentionStore, lifecycle, importTokens, restoreAdapter);
         ctx.effect(() => startRetentionScheduler({
             recover: () => recycleService.recoverStartup({ legacyPendingPath: pendingFilePath() }),
             run: (options) => retentionService.runAutomatic(options),

package/lib/insights.js

@@ -102,7 +102,9 @@ export function createInsightsService({
     const snapshots = [];
     for (const item of inventory.valid) {
       if (item === null || typeof item !== 'object'
-        || typeof item.snapshotId !== 'string' || item.snapshotId === ''
+        || typeof item.snapshotId !== 'string' || item.snapshotId === '') throw authorityUnavailable();
+      if (!activeSnapshotIds.has(item.snapshotId)) continue;
+      if (item === null || typeof item !== 'object'
         || typeof item.sessionId !== 'string' || item.sessionId === ''
         || typeof item.createdAt !== 'string'
         || !Number.isSafeInteger(item.totalBytes) || item.totalBytes < 0
@@ -125,18 +127,19 @@ export function createInsightsService({
         sessionBytes: item.sessionBytes,
         attachmentCount: item.attachmentCount,
         status: 'ready',
-        active: activeSnapshotIds.has(item.snapshotId),
+        active: true,
       });
     }
     for (const item of inventory.degraded) {
       if (item === null || typeof item !== 'object'
-        || typeof item.snapshotId !== 'string' || item.snapshotId === ''
-        || typeof item.code !== 'string' || item.code === '') throw authorityUnavailable();
+        || typeof item.snapshotId !== 'string' || item.snapshotId === '') throw authorityUnavailable();
+      if (!activeSnapshotIds.has(item.snapshotId)) continue;
+      if (typeof item.code !== 'string' || item.code === '') throw authorityUnavailable();
       snapshots.push({
         snapshotId: item.snapshotId,
         status: 'degraded',
         code: item.code,
-        active: activeSnapshotIds.has(item.snapshotId),
+        active: true,
       });
     }
 
@@ -152,7 +155,7 @@ export function createInsightsService({
         totalMeasuredBytes: sessionBytes + snapshotBytes,
         duplicateSnapshotBytes,
         sessionUnavailableCount: sessions.filter((row) => row.status === 'unavailable').length,
-        degradedSnapshotCount: inventory.degraded.length,
+        degradedSnapshotCount: snapshots.filter((row) => row.status === 'degraded').length,
       },
       sessions,
       snapshots,

package/lib/recycle.js

@@ -544,6 +544,32 @@ export function createRecycleService({
         }
       }
     }
+
+    // Historical versions could leave published snapshots that were never
+    // referenced by the durable recycle catalog. Re-read both authorities
+    // after pending migration because migration may create a protection
+    // snapshot which must survive this startup pass.
+    if (typeof snapshotStore.inventory === 'function') {
+      await lifecycle.run(async () => {
+        const currentRecords = await loadedTrash();
+        const protectedIds = new Set(
+          [...currentRecords.values()]
+            .map((record) => record?.snapshotId)
+            .filter((snapshotId) => typeof snapshotId === 'string' && snapshotId !== ''),
+        );
+        const inventory = await snapshotStore.inventory();
+        const candidates = [...(inventory?.valid ?? []), ...(inventory?.degraded ?? [])]
+          .map((item) => item?.snapshotId)
+          .filter((snapshotId) => typeof snapshotId === 'string' && snapshotId !== '' && !protectedIds.has(snapshotId));
+        for (const snapshotId of new Set(candidates)) {
+          try {
+            await snapshotStore.remove(snapshotId);
+          } catch (cause) {
+            logger?.warn?.('archived-chats: legacy snapshot cleanup failed: ' + stableCode(cause, 'snapshot-cleanup-failed'));
+          }
+        }
+      });
+    }
     return { status: 'ready' };
   }
 

package/lib/types/client/index.d.ts

@@ -3,10 +3,9 @@
  * chooser and one-confirmation bulk archive flow. The flow stays inside the
  * plugin-owned Settings surface and requires no workspace-row extension slot.
  * The searchable manager includes Archived, Recycle Bin, Storage & Retention,
- * and Origins & Branches views. Existing legacy snapshots appear in the
- * Recycle Bin and restore only as new archived copies. Removing an archived
- * chat moves it to recoverable trash and exposes immediate Undo. The recycle
- * view provides scoped read-only previews, original/snapshot restore, guarded
+ * and Origins & Branches views. Removing an archived chat moves it to
+ * recoverable trash and exposes immediate Undo. The recycle view provides
+ * scoped read-only previews, original/snapshot restore, guarded
  * permanent purge and empty operations, degraded-state warnings, responsive
  * rows, and accessible confirmation dialogs, all localized in English and 中文.
  */
@@ -15,10 +14,6 @@ export type RecycleLiveDisposition = 'cold' | 'disposed' | 'parked';
 
 export interface RecycleSessionRow {
   sessionId: string;
-  sourceKind?: 'legacy-snapshot';
-  legacySnapshotId?: string;
-  sourceSessionId?: string | null;
-  restorable?: boolean;
   state: RecycleRecordState;
   trashedAt: string;
   purgeRequestedAt: string | null;
@@ -52,45 +47,6 @@ export interface RetentionPolicy {
   recycleAutoDelete: boolean;
 }
 
-export type HistoryScope = 'archived' | 'recycled' | 'history-only';
-export type HistoryVersionState = 'history' | 'recycle-protection';
-
-export interface HistoryVersion {
-  snapshotId: string;
-  createdAt: string;
-  totalBytes: number;
-  attachmentCount: number;
-  state: HistoryVersionState;
-}
-
-export interface HistorySession {
-  sessionId: string;
-  title: string | null;
-  workspace: { id: string | null; title: string | null } | null;
-  scope: HistoryScope;
-  versions: HistoryVersion[];
-}
-
-export interface HistoryResponse {
-  generatedAt: string;
-  sessions: HistorySession[];
-  degraded: Array<{ snapshotId: string; code: string }>;
-}
-
-export interface HistoryRestoreResult {
-  restored: string[];
-  sourceSessionId: string;
-  snapshotId: string;
-  warnings: Array<{ id: string; reason: string }>;
-}
-
-export interface HistoryDeleteResult {
-  deleted: string[];
-  freedBytes: number;
-  skipped?: Array<{ snapshotId: string; reason: string }>;
-  failed?: Array<{ snapshotId: string; reason: string }>;
-}
-
 export interface StorageInsightsSummary {
   sessionBytes: number;
   snapshotBytes: number;
@@ -140,15 +96,6 @@ export interface StorageInsights {
 }
 
 export type RetentionCandidate =
-  | {
-    key: string;
-    action: 'delete-snapshot';
-    reason: 'history-count' | 'snapshot-age' | 'snapshot-quota';
-    snapshotId: string;
-    sessionId: string;
-    createdAt: string;
-    bytes: number;
-  }
   | {
     key: string;
     action: 'purge-trash';

package/lib/types/index.d.ts

@@ -1,8 +1,7 @@
 /**
  * Host loader entry — registers the `/plugins/dsh-archived-chats/*` routes
  * (state, stats, insights, retention/policy, retention/preview, retention/apply,
- * lineage, history, history/capture, history/preview, history/preview/image,
- * history/restore/preview, history/restore, history/delete, history/delete-all,
+ * lineage,
  * workspace-archive/workspaces, workspace-archive/preview,
  * workspace-archive/apply,
  * preview, preview/image, search,
@@ -38,10 +37,6 @@ export type RecycleLiveDisposition = 'cold' | 'disposed' | 'parked';
 
 export interface RecycleSessionRow {
   sessionId: string;
-  sourceKind?: 'legacy-snapshot';
-  legacySnapshotId?: string;
-  sourceSessionId?: string | null;
-  restorable?: boolean;
   state: RecycleRecordState;
   trashedAt: string;
   purgeRequestedAt: string | null;
@@ -75,46 +70,6 @@ export interface RetentionPolicy {
   recycleAutoDelete: boolean;
 }
 
-export type HistoryScope = 'archived' | 'recycled' | 'history-only';
-export type HistoryVersionState = 'history' | 'recycle-protection';
-
-export interface HistoryVersion {
-  snapshotId: string;
-  createdAt: string;
-  totalBytes: number;
-  attachmentCount: number;
-  state: HistoryVersionState;
-}
-
-export interface HistorySession {
-  sessionId: string;
-  title: string | null;
-  workspace: { id: string | null; title: string | null } | null;
-  scope: HistoryScope;
-  versions: HistoryVersion[];
-}
-
-export interface HistoryResponse {
-  generatedAt: string;
-  sessions: HistorySession[];
-  degraded: Array<{ snapshotId: string; code: string }>;
-}
-
-export interface HistoryRestoreResult {
-  restored: string[];
-  sourceSessionId: string;
-  snapshotId: string;
-  warnings: Array<{ id: string; reason: string }>;
-}
-
-/** A degraded version carries no readable bytes but can still be reclaimed. */
-export interface HistoryDeleteResult {
-  deleted: string[];
-  freedBytes: number;
-  skipped?: Array<{ snapshotId: string; reason: string }>;
-  failed?: Array<{ snapshotId: string; reason: string }>;
-}
-
 export interface StorageInsightsSummary {
   sessionBytes: number;
   snapshotBytes: number;
@@ -164,15 +119,6 @@ export interface StorageInsights {
 }
 
 export type RetentionCandidate =
-  | {
-    key: string;
-    action: 'delete-snapshot';
-    reason: 'history-count' | 'snapshot-age' | 'snapshot-quota';
-    snapshotId: string;
-    sessionId: string;
-    createdAt: string;
-    bytes: number;
-  }
   | {
     key: string;
     action: 'purge-trash';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-archived-chats",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "DeepSeek Harness 会话档案：从设置中安全归档工作区会话，按工作区浏览和全文搜索归档聊天，原生只读预览对话、工具活动和已存储图片，管理标签备注与 ZIP 备份恢复；提供统一回收站、可选自动清理、空间分账和来源与分支，已有快照直接进入回收站。所有数据留在本机。 Session Archive for DeepSeek Harness: safely archive workspace chats from Settings; browse and full-text search archived chats; preview conversations, tool activity, and stored images read-only; manage tags, notes, and ZIP backup restore; provide a unified Recycle Bin, optional automatic cleanup, storage accounting, and Origins & Branches, with existing snapshots shown directly in the Recycle Bin. All data stays local.",
   "license": "MIT",
   "author": "Ultronen",
@@ -63,9 +63,6 @@
     "lib/auto-retention.js",
     "lib/retention-service.js",
     "lib/lineage.js",
-    "lib/history.js",
-    "lib/history-restore.js",
-    "lib/legacy-recycle.js",
     "lib/workspace-bulk-archive.js",
     "lib/persistence-compat.js",
     "lib/search.js",