dsh-skill-hub 0.3.20 → 0.3.21

package/src/store/store.ts

@@ -13,7 +13,7 @@ export class SkillHubStore {
   private tagsById = new Map<string, SkillTag>()
   private sourcesByRepo = new Map<string, SourceRecord>()
   private marketSources: MarketSourceRecord[] = []
-  private trashByName = new Map<string, TrashEntry>()
+  private trashByPath = new Map<string, TrashEntry>()
   private skillStats: SkillStatsCheckpoint | undefined = undefined
   private marketStats: MarketStatsSnapshot | undefined = undefined
   private collectionOrder: string[] = []
@@ -41,7 +41,7 @@ export class SkillHubStore {
         this.tagsById = state.tagsById
         this.sourcesByRepo = state.sourcesByRepo
         this.marketSources = state.marketSources
-        this.trashByName = state.trashByName
+        this.trashByPath = state.trashByPath
         this.skillStats = state.skillStats
         this.marketStats = state.marketStats
         this.collectionOrder = state.collectionOrder
@@ -444,26 +444,36 @@ export class SkillHubStore {
   /** All trashed skills, newest first. */
   async listTrash(): Promise<TrashEntry[]> {
     await this.ensureLoaded()
-    return [...this.trashByName.values()].sort((a, b) => b.movedAt - a.movedAt)
+    return [...this.trashByPath.values()].sort((a, b) => b.movedAt - a.movedAt)
   }
 
-  /** One trash entry by skill name (undefined when absent). */
+  /** One trash entry by skill name — the newest when a name has several. */
   async getTrash(name: string): Promise<TrashEntry | undefined> {
     await this.ensureLoaded()
-    return this.trashByName.get(name)
+    let newest: TrashEntry | undefined
+    for (const entry of this.trashByPath.values()) {
+      if (entry.name !== name) continue
+      if (newest === undefined || entry.movedAt > newest.movedAt) newest = entry
+    }
+    return newest
   }
 
-  /** Record a trashed skill. */
+  /**
+   * Record a trashed skill, keyed by its trashed path. Keying by name used to
+   * silently drop the previous record when the same name landed in the trash
+   * twice (a re-delete, or the two on-disk discovery forms), orphaning its
+   * directory with nothing left pointing at it.
+   */
   async addTrash(entry: TrashEntry): Promise<void> {
     await this.ensureLoaded()
-    this.trashByName.set(entry.name, entry)
+    this.trashByPath.set(entry.path, entry)
     await this.persist()
   }
 
-  /** Remove a trash record (after restore). */
-  async removeTrash(name: string): Promise<void> {
+  /** Remove a trash record by its trashed path (after restore or permanent clear). */
+  async removeTrash(path: string): Promise<void> {
     await this.ensureLoaded()
-    if (!this.trashByName.delete(name)) return
+    if (!this.trashByPath.delete(path)) return
     await this.persist()
   }
 
@@ -521,7 +531,7 @@ export class SkillHubStore {
         ...(this.tagsById.size > 0 ? { tags: [...this.tagsById.values()] } : {}),
         ...(this.sourcesByRepo.size > 0 ? { sources: [...this.sourcesByRepo.values()] } : {}),
         ...(this.marketSources.length > 0 ? { marketSources: [...this.marketSources] } : {}),
-        ...(this.trashByName.size > 0 ? { trash: [...this.trashByName.values()] } : {}),
+        ...(this.trashByPath.size > 0 ? { trash: [...this.trashByPath.values()] } : {}),
         ...(this.skillStats !== undefined ? { skillStats: this.skillStats } : {}),
         ...(this.marketStats !== undefined ? { marketStats: this.marketStats } : {}),
         ...(this.collectionOrder.length > 0 ? { collectionOrder: [...this.collectionOrder] } : {}),

package/src/store.test.ts

@@ -206,12 +206,28 @@ describe('SkillHubStore', () => {
     await store.addTrash({ name: 'older', path: '/tmp/.trash/older-1', movedAt: 10 })
     const trash = await store.listTrash()
     expect(trash.map((entry) => entry.name)).toEqual(['gone-skill', 'older']) // newest first
-    await store.removeTrash('gone-skill')
+    await store.removeTrash('/tmp/.trash/gone-skill-123')
     const reloaded = new SkillHubStore(file)
     expect(await reloaded.listTrash()).toHaveLength(1)
     expect(await reloaded.getTrash('older')).toMatchObject({ name: 'older' })
   })
 
+  it('keeps several trash entries sharing one skill name (no silent overwrite)', async () => {
+    // 同一个名字先后入站两次（重复删除，或磁盘上两种发现形态各进一次）：
+    // 按名字索引会让后一条覆盖前一条，前一份目录就成了谁都指不到的孤儿。
+    await store.addTrash({ name: 'dup', path: '/tmp/.trash/dup-1', movedAt: 1, sourcePath: '/tmp/skills/dup' })
+    await store.addTrash({ name: 'dup', path: '/tmp/.trash/dup.md.disabled-2', movedAt: 2, sourcePath: '/tmp/skills/dup.md.disabled' })
+    const reloaded = new SkillHubStore(file)
+    expect((await reloaded.listTrash()).map((entry) => entry.path).sort()).toEqual([
+      '/tmp/.trash/dup-1',
+      '/tmp/.trash/dup.md.disabled-2',
+    ])
+    // getTrash 按名字取最新的一条（恢复入口用）。
+    expect(await reloaded.getTrash('dup')).toMatchObject({ path: '/tmp/.trash/dup.md.disabled-2' })
+    await reloaded.removeTrash('/tmp/.trash/dup.md.disabled-2')
+    expect(await reloaded.getTrash('dup')).toMatchObject({ path: '/tmp/.trash/dup-1' })
+  })
+
   it('persists the trash source path', async () => {
     await store.addTrash({ name: 'flat-gone', path: '/tmp/.trash/flat-gone.md-1', movedAt: 7, sourcePath: '/tmp/skills/flat-gone.md' })
     const reloaded = new SkillHubStore(file)