@chance722/dsh-inbox 0.2.2 → 0.2.4

package/lib/types/host/webdav/config.d.ts

@@ -28,6 +28,7 @@ export declare const WebdavSettingsSchema: z<Schemastery.ObjectS<{
     protocol: z<"webdav" | "s3", "webdav" | "s3">;
     baseUrl: z<string, string>;
     directory: z<string, string>;
+    adoptForeignRoots: z<boolean, boolean>;
     username: z<string, string>;
     endpoint: z<string, string>;
     bucket: z<string, string>;
@@ -40,6 +41,7 @@ export declare const WebdavSettingsSchema: z<Schemastery.ObjectS<{
     protocol: z<"webdav" | "s3", "webdav" | "s3">;
     baseUrl: z<string, string>;
     directory: z<string, string>;
+    adoptForeignRoots: z<boolean, boolean>;
     username: z<string, string>;
     endpoint: z<string, string>;
     bucket: z<string, string>;
@@ -75,6 +77,8 @@ export interface WebdavPatch {
     protocol?: string;
     baseUrl?: string;
     directory?: string;
+    /** Merge other sync trees in the same bucket, not just this directory's. */
+    adoptForeignRoots?: boolean;
     username?: string;
     /** Empty string clears the stored password; undefined leaves it. */
     password?: string;

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

@@ -48,6 +48,8 @@ export interface WebdavRequest {
     protocol?: RemoteProtocol;
     baseUrl?: string;
     directory?: string;
+    /** Merge other sync trees in the same bucket, not just this directory's. */
+    adoptForeignRoots?: boolean;
     username?: string;
     /** Empty string clears the stored password; absent leaves it alone. */
     password?: string;
@@ -82,6 +84,18 @@ export interface WebdavSettings {
     baseUrl: string;
     /** Folder under the base URL; the convention every device drops into. */
     directory: string;
+    /**
+     * Also merge `…/sync` trees found **outside** the configured directory.
+     *
+     * Off by default, because the directory is what tells two vaults apart and a
+     * bucket can be shared. On, this is what a person means by "it is all my
+     * cloud drive": a machine that used to sync somewhere else leaves its records
+     * behind, and they come back (asked 2026-09-21, 19 records). Merging settles
+     * per record by `id` + `updatedAt`, so an older tree cannot overwrite a newer
+     * copy — but it *can* bring back a record that was purged here, because a
+     * purge leaves nothing local to outrank it.
+     */
+    adoptForeignRoots: boolean;
     username: string;
     /** S3: endpoint host, e.g. `https://s3.cstcloud.cn`. */
     endpoint: string;
@@ -123,6 +137,33 @@ export interface WebdavStatus {
     credentialsAvailable: boolean;
 }
 /** What one pull did, for the panel and for the log. */
+/** The directory a sync uses when the user never named one. */
+export declare const DEFAULT_SYNC_DIRECTORY = "inbox";
+/**
+ * The directory a sync actually uses, decided in one place.
+ *
+ * `/`, an empty string and "never named one" all mean the default. They used to
+ * mean different things depending on which path read them: `syncRoot()` turned a
+ * stripped-empty directory into the *bucket root* (`sync/`) while the
+ * drop-folder ingest defaulted to `/inbox`, so two machines set up through the
+ * same dialog could write to `sync/` and `inbox/sync/` respectively — and the
+ * merge, which reads its own prefix, then found nothing and reported nothing new
+ * (measured 2026-09-20).
+ *
+ * @param raw - whatever the settings hold, if anything.
+ * @returns the directory without leading or trailing slashes; never empty.
+ */
+export declare function syncDirectory(raw: string | undefined): string;
+/**
+ * Where the vault's own objects live: `<directory>/sync`.
+ *
+ * Shared by the writer, the drop-folder ingest and the display, so "which
+ * prefix is mine" has one answer on both sides of the wire.
+ *
+ * @param raw - the configured directory, if any.
+ * @returns the sync root, e.g. `inbox/sync`.
+ */
+export declare function syncRootFor(raw: string | undefined): string;
 export interface PullResult {
     status: 'ok' | 'unconfigured' | 'failed';
     reason?: string;
@@ -132,11 +173,49 @@ export interface PullResult {
      * than the local copy). Only the merge half of a pull can produce these.
      */
     merged?: number;
+    /** How many of {@link merged} were ids this vault did not have at all. */
+    added?: number;
     /** Attachment objects the merge had to fetch and admit locally. */
     attachments?: number;
+    /**
+     * Records the cloud holds that this vault **already had** (same id, not older).
+     *
+     * This is the answer to "why is the cloud's copy not coming over?": it is the
+     * same record, and the merge settles per record by `id` + `updatedAt` rather
+     * than by which machine uploaded it — a record this machine pushed comes back
+     * with the timestamp it left with, so it is kept, not re-filed.
+     */
+    kept?: number;
     failed: number;
     /** Files the server listed but we skipped as already-seen. */
     skipped: number;
+    /**
+     * How many of {@link skipped} were the vault's own upload queue (`sync/…`).
+     *
+     * Optional because the older shape of this result (and every test that builds
+     * one by hand) predates the split.
+     */
+    skippedSync?: number;
+    /** How many of {@link skipped} were older than the last pull's cursor. */
+    skippedOlder?: number;
+    /**
+     * How many of {@link skipped} sat under a `…/sync/` prefix that is **not**
+     * ours — another machine syncing under a different directory.
+     */
+    skippedForeign?: number;
+    /** Those other prefixes, e.g. `['inbox/sync']`; the panel warns about them. */
+    foreignSyncRoots?: string[];
+    /** How many `items/*.json` records those other prefixes hold together. */
+    foreignRecords?: number;
+    /** This machine's own sync root, so the warning can name both sides. */
+    syncRoot?: string;
+    /**
+     * How many **records** the cloud holds, as opposed to how many objects that
+     * takes: `items/<id>.json` files under this machine's own sync root.
+     */
+    remoteRecords?: number;
+    /** How many attachments the cloud holds (`attachments/<id>.<ext>`, no descriptors). */
+    remoteAttachments?: number;
     /** How many entries the remote listed at all: distinguishes "empty folder"
      * from "everything already ingested". */
     listed: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chance722/dsh-inbox",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "private": false,
   "description": "Personal paste inbox for DeepSeek Harness (dsh): capture, classify, browse and retrieve.",
   "keywords": [