@chance722/dsh-inbox 0.2.4 → 0.2.5

package/README.md

@@ -173,6 +173,14 @@ pnpm test         # vitest
 
 Client-side changes need `pnpm build` and a page reload (dsh's client-hmr reloads it for you); host-side changes need a restart. Details in [docs/help/dev-setup.md](docs/help/dev-setup.md); milestones and acceptance records in the [development bus](docs/feature/dev-bus.md).
 
+To switch the profile you actually run between the **published package** and **this checkout** (default profile `web`; set `DSH_PROFILE` for another):
+
+```powershell
+pnpm dev:status    # which one is in use right now
+pnpm dev:npm       # point it at the published version
+pnpm dev:local     # point it back here (builds first, then links)
+```
+
 ## License
 
 MIT

package/README.zh.md

@@ -172,6 +172,14 @@ pnpm test         # vitest
 
 改客户端代码：`pnpm build` 后刷新页面即可（dsh 的 client-hmr 会自己重载）；改宿主代码要重启服务。细节见 [docs/help/dev-setup.md](docs/help/dev-setup.md)，阶段与验收记录在[开发总线](docs/feature/dev-bus.md)。
 
+日常想在**线上发布版**和**本地改动**之间切换（默认 profile 是 `web`，换 profile 加 `DSH_PROFILE`）：
+
+```powershell
+pnpm dev:status    # 现在用的是哪一个：本仓库 / 线上包
+pnpm dev:npm       # 切到 npm 上发布的版本（体验发布版）
+pnpm dev:local     # 切回当前仓库（会先 pnpm build 再链接）
+```
+
 ## 许可
 
 MIT

package/lib/client.js

@@ -868,11 +868,14 @@ window.__ModuleLoader__.load({
 		  "sync.pullFailed": "\u62C9\u53D6\u5931\u8D25\uFF1A{reason}",
 		  // The refresh button's tooltip: counts first, reasons only when something was
 		  // skipped. The toast carries the two numbers alone.
-		  "sync.detailPushedIdle": "\u63A8\u9001 0 \u6761\uFF08{count} \u6761\u5DF2\u662F\u6700\u65B0\uFF09",
+		  // No number here on purpose: the push considers every row it has, tombstones
+		  // included, so "26 条已是最新" next to a header saying "共 13 条" is a
+		  // mismatch the reader has to resolve for themselves (2026-09-21).
+		  "sync.detailPushedIdle": "\u63A8\u9001 0 \u6761\uFF08\u6CA1\u6709\u65B0\u6539\u52A8\uFF09",
 		  "sync.detailPushed": "\u63A8\u9001 {records} \u6761 / {attachments} \u4E2A\u9644\u4EF6",
 		  "sync.detailPulled": "\u62C9\u53D6 {count} \u6761 \xB7 \u4E91\u7AEF {records} \u6761\u8BB0\u5F55 / {files} \u4E2A\u9644\u4EF6",
 		  "sync.detailAdded": "\uFF08\u5176\u4E2D {count} \u6761\u662F\u65B0\u8BB0\u5F55\uFF09",
-		  "sync.detailSkip": "\uFF08\u8DF3\u8FC7 {skipped}\uFF1A\u81EA\u5DF1\u7684 {sync}\u3001\u66F4\u65E7 {older}\uFF09",
+		  "sync.detailDeleted": "\uFF08\u5176\u4E2D {count} \u6761\u662F\u5220\u9664\uFF0C\u4F1A\u8FDB\u56DE\u6536\u7AD9\uFF09",
 		  "sync.pullForeignSync": " \xB7 \u26A0\uFE0F \u53E6\u6709 {records} \u6761\u8BB0\u5F55\u5728\u522B\u7684\u540C\u6B65\u76EE\u5F55\uFF1A{roots}",
 		  "sync.detailForeign": " \xB7 \u26A0\uFE0F \u522B\u7684\u540C\u6B65\u76EE\u5F55\uFF1A{roots}\uFF08{records} \u6761\u8BB0\u5F55\uFF1B\u672C\u673A {ours}\uFF09",
 		  // The toast: two numbers, nothing else. Everything else about a sync is
@@ -1137,11 +1140,11 @@ window.__ModuleLoader__.load({
 		  "sync.pushPartial": "{head} \xB7 partly failed: {reason}",
 		  "sync.pullNoAddress": "No address configured yet",
 		  "sync.pullFailed": "Pull failed: {reason}",
-		  "sync.detailPushedIdle": "pushed 0 ({count} already up to date)",
+		  "sync.detailPushedIdle": "pushed 0 (nothing new)",
 		  "sync.detailPushed": "pushed {records} / {attachments} attachments",
 		  "sync.detailPulled": "pulled {count} \xB7 the cloud holds {records} records / {files} attachments",
 		  "sync.detailAdded": " ({count} of them new)",
-		  "sync.detailSkip": " ({skipped} skipped: {sync} ours, {older} older)",
+		  "sync.detailDeleted": " ({count} of them deletions \u2014 they land in the recycle bin)",
 		  "sync.pullForeignSync": " \xB7 \u26A0\uFE0F {records} records live in another sync directory: {roots}",
 		  "sync.detailForeign": " \xB7 \u26A0\uFE0F another sync directory: {roots} ({records} records; ours is {ours})",
 		  "sync.shortPushed": "pushed {count}",
@@ -3316,12 +3319,8 @@ window.__ModuleLoader__.load({
 		    files: result.remoteAttachments ?? 0
 		  });
 		  const gained = (result.added ?? 0) === 0 ? "" : t("sync.detailAdded", { count: result.added ?? 0 });
-		  const skipped = result.skipped === 0 ? "" : t("sync.detailSkip", {
-		    skipped: result.skipped,
-		    sync: result.skippedSync ?? 0,
-		    older: result.skippedOlder ?? 0
-		  });
-		  return `${head}${gained}${skipped}${warningsOf(result, true)}`;
+		  const deleted = (result.deletions ?? 0) === 0 ? "" : t("sync.detailDeleted", { count: result.deletions ?? 0 });
+		  return `${head}${gained}${deleted}${warningsOf(result, true)}`;
 		}
 		function EncryptionSettings({ call }) {
 		  const [status, setStatus] = import_react8.default.useState();

package/lib/index.js

@@ -3,7 +3,7 @@ import { defineTool as defineTool2 } from "@deepseek-ai/dsh-tools";
 
 // src/shared/constants.ts
 var PACKAGE_NAME = "@chance722/dsh-inbox";
-var VERSION = true ? "0.2.4" : "0.0.0-dev";
+var VERSION = true ? "0.2.5" : "0.0.0-dev";
 var DEFAULT_USER_AGENT = "dsh-inbox";
 
 // src/shared/vocabulary.ts
@@ -1404,13 +1404,14 @@ async function mergeOnce(vault, tree, prefix, admit) {
   const failures = [];
   let merged = 0;
   let added = 0;
+  let deletions = 0;
   let kept = 0;
   let attachments = 0;
   let objects;
   try {
     objects = await tree.list(`${prefix}/items/`);
   } catch (error) {
-    return { merged: 0, added: 0, kept: 0, attachments: 0, failures: [`\u5217\u8FDC\u7AEF\u540C\u6B65\u76EE\u5F55\u5931\u8D25\uFF1A${reasonOf(error)}`] };
+    return { merged: 0, added: 0, deletions: 0, kept: 0, attachments: 0, failures: [`\u5217\u8FDC\u7AEF\u540C\u6B65\u76EE\u5F55\u5931\u8D25\uFF1A${reasonOf(error)}`] };
   }
   const wanted = /* @__PURE__ */ new Map();
   const bytesAt = /* @__PURE__ */ new Map();
@@ -1441,6 +1442,7 @@ async function mergeOnce(vault, tree, prefix, admit) {
       await vault.import(remote);
       merged += 1;
       if (local === void 0) added += 1;
+      if (remote.deletedAt !== void 0) deletions += 1;
       for (const attachmentId of remote.attachmentIds) {
         if (vault.getAttachment(attachmentId) === void 0) {
           wanted.set(attachmentId, remote.id);
@@ -1475,7 +1477,7 @@ async function mergeOnce(vault, tree, prefix, admit) {
       failures.push(`\u9644\u4EF6 ${attachmentId}\uFF1A${reasonOf(error)}`);
     }
   }
-  return { merged, added, kept, attachments, failures };
+  return { merged, added, deletions, kept, attachments, failures };
 }
 function extensionOfName(path) {
   return /\.([A-Za-z0-9]{1,8})$/.exec(nameOf2(path))?.[1]?.toLowerCase() ?? "bin";
@@ -1488,7 +1490,7 @@ async function mergeRemote(ctx, vault, attachments, extraRoots = []) {
   const prefix = syncRoot(settings);
   try {
     const tree = settings.protocol === "s3" ? await s3Tree(ctx, settings) : await webdavTree(ctx, settings);
-    if (tree === void 0) return { merged: 0, added: 0, kept: 0, attachments: 0, failures: [] };
+    if (tree === void 0) return { merged: 0, added: 0, deletions: 0, kept: 0, attachments: 0, failures: [] };
     const admit = admitWith(attachments);
     const outcome = await mergeOnce(vault, tree, prefix, admit);
     for (const root of extraRoots) {
@@ -1496,13 +1498,14 @@ async function mergeRemote(ctx, vault, attachments, extraRoots = []) {
       const extra = await mergeOnce(vault, tree, root, admit);
       outcome.merged += extra.merged;
       outcome.added += extra.added;
+      outcome.deletions += extra.deletions;
       outcome.kept += extra.kept;
       outcome.attachments += extra.attachments;
       outcome.failures.push(...extra.failures);
     }
     return outcome;
   } catch (error) {
-    return { merged: 0, added: 0, kept: 0, attachments: 0, failures: [reasonOf(error)] };
+    return { merged: 0, added: 0, deletions: 0, kept: 0, attachments: 0, failures: [reasonOf(error)] };
   }
 }
 function admitWith(store) {
@@ -1609,6 +1612,7 @@ async function withMerge(ctx, vault, attachments, pulled) {
     ...pulled,
     merged: outcome.merged,
     added: outcome.added,
+    deletions: outcome.deletions,
     kept: outcome.kept,
     attachments: outcome.attachments,
     failed: pulled.failed + outcome.failures.length,

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

@@ -186,7 +186,7 @@ export declare const zh: {
     'sync.detailPushed': string;
     'sync.detailPulled': string;
     'sync.detailAdded': string;
-    'sync.detailSkip': string;
+    'sync.detailDeleted': string;
     'sync.pullForeignSync': string;
     'sync.detailForeign': string;
     'sync.shortPushed': string;
@@ -455,7 +455,7 @@ export declare const MESSAGES: {
         'sync.detailPushed': string;
         'sync.detailPulled': string;
         'sync.detailAdded': string;
-        'sync.detailSkip': string;
+        'sync.detailDeleted': string;
         'sync.pullForeignSync': string;
         'sync.detailForeign': string;
         'sync.shortPushed': string;

package/lib/types/host/remote/merge.d.ts

@@ -42,6 +42,15 @@ export interface SyncTree {
 export interface MergeOutcome {
     /** Records that were new here, or overwritten because the remote was newer. */
     merged: number;
+    /**
+     * How many of {@link merged} arrived as deletions.
+     *
+     * A deleted record travels as an ordinary record with deletedAt set, so a
+     * merge that brings deletions looks exactly like one that brings updates until
+     * somebody opens the recycle bin (measured 2026-09-21: 19 merged — 6 new
+     * records and 13 tombstones, and the bin went from empty to thirteen).
+     */
+    deletions: number;
     /**
      * How many of {@link merged} were ids this vault did not have at all.
      *

package/lib/types/shared/panel-wire.d.ts

@@ -175,6 +175,8 @@ export interface PullResult {
     merged?: number;
     /** How many of {@link merged} were ids this vault did not have at all. */
     added?: number;
+    /** How many of {@link merged} were deletions (they land in the recycle bin). */
+    deletions?: number;
     /** Attachment objects the merge had to fetch and admit locally. */
     attachments?: number;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chance722/dsh-inbox",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "private": false,
   "description": "Personal paste inbox for DeepSeek Harness (dsh): capture, classify, browse and retrieve.",
   "keywords": [
@@ -64,7 +64,10 @@
     "build": "node scripts/build.mjs && tsc -p tsconfig.build.json",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "dev:status": "node scripts/dev.mjs status",
+    "dev:local": "node scripts/dev.mjs local",
+    "dev:npm": "node scripts/dev.mjs npm"
   },
   "dependencies": {
     "lucide-react": "^1.47.0",