@chance722/dsh-inbox 0.2.2 → 0.2.4

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.2" : "0.0.0-dev";
+var VERSION = true ? "0.2.4" : "0.0.0-dev";
 var DEFAULT_USER_AGENT = "dsh-inbox";
 
 // src/shared/vocabulary.ts
@@ -749,6 +749,7 @@ var KEY_BLOCK = /<Key>([\s\S]*?)<\/Key>/i;
 var LAST_MODIFIED = /<LastModified>([\s\S]*?)<\/LastModified>/i;
 var SIZE = /<Size>([\s\S]*?)<\/Size>/i;
 var CONTENTS = /<Contents>[\s\S]*?<\/Contents>/gi;
+var COMMON_PREFIX = /<CommonPrefixes>[\s\S]*?<Prefix>([\s\S]*?)<\/Prefix>[\s\S]*?<\/CommonPrefixes>/gi;
 function decode(value) {
   return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&").trim();
 }
@@ -768,15 +769,15 @@ function parseListing(xml) {
   }
   return objects;
 }
-async function listPrefix(config, prefix, deps) {
+async function listPrefix(config, prefix, deps, extra = {}) {
   const sign = signer(config);
-  const v2 = sign(config, deps, "GET", "", { "list-type": "2", prefix });
+  const v2 = sign(config, deps, "GET", "", { "list-type": "2", prefix, ...extra });
   const first = await deps.fetch(v2.url, { method: "GET", headers: v2.headers });
   if (first.ok) return parseListing(await first.text());
   const refusal2 = await refused(first, "\u5217\u5BF9\u8C61");
   if (first.status < 500) {
     if (config.signatureVersion?.toLowerCase() !== "v2" && first.status === 401) {
-      const minimal = signRequestV4Minimal(config, deps, "GET", "", { "list-type": "2", prefix });
+      const minimal = signRequestV4Minimal(config, deps, "GET", "", { "list-type": "2", prefix, ...extra });
       const retry = await deps.fetch(minimal.url, { method: "GET", headers: minimal.headers });
       if (retry.ok) return parseListing(await retry.text());
       throw new Error(
@@ -786,7 +787,7 @@ async function listPrefix(config, prefix, deps) {
     }
     throw refusal2;
   }
-  const v1 = sign(config, deps, "GET", "", { prefix });
+  const v1 = sign(config, deps, "GET", "", { prefix, ...extra });
   const second = await deps.fetch(v1.url, { method: "GET", headers: v1.headers });
   if (!second.ok) {
     throw new Error(`${await refused(second, "\u5217\u5BF9\u8C61\uFF08V1 \u56DE\u9000\uFF09").then((e) => e.message)}
@@ -794,6 +795,27 @@ async function listPrefix(config, prefix, deps) {
   }
   return parseListing(await second.text());
 }
+async function listTopLevel(config, deps) {
+  const sign = signer(config);
+  const v2 = sign(config, deps, "GET", "", { "list-type": "2", delimiter: "/", "max-keys": "100" });
+  const first = await deps.fetch(v2.url, { method: "GET", headers: v2.headers });
+  if (first.ok) return parsePrefixes(await first.text());
+  if (first.status >= 500) {
+    const v1 = sign(config, deps, "GET", "", { delimiter: "/", "max-keys": "100" });
+    const second = await deps.fetch(v1.url, { method: "GET", headers: v1.headers });
+    if (second.ok) return parsePrefixes(await second.text());
+  }
+  return [];
+}
+function parsePrefixes(xml) {
+  const prefixes = [];
+  for (const match of xml.matchAll(COMMON_PREFIX)) {
+    const value = decode(match[1] ?? "");
+    if (value.length === 0) continue;
+    prefixes.push(value.replace(/\/$/, ""));
+  }
+  return prefixes;
+}
 async function readObject(config, key, deps) {
   const signed = signer(config)(config, deps, "GET", key);
   const response = await deps.fetch(signed.url, { method: "GET", headers: signed.headers });
@@ -933,6 +955,42 @@ async function readFile(path, deps, absoluteUrl) {
   return { bytes, contentType: declared.split(";")[0] ?? "application/octet-stream" };
 }
 
+// src/shared/panel-wire.ts
+var INBOX_API_PREFIX = "/api/inbox";
+var INBOX_ENDPOINT_CAPTURE = "capture";
+var INBOX_ENDPOINT_LIST = "list";
+var INBOX_ENDPOINT_DETAIL = "detail";
+var INBOX_ENDPOINT_UPDATE = "update";
+var INBOX_ENDPOINT_DELETE = "delete";
+var INBOX_ENDPOINT_RESTORE = "restore";
+var INBOX_ENDPOINT_PURGE = "purge";
+var INBOX_ENDPOINT_ATTACHMENT = "attachment";
+var INBOX_ENDPOINT_WEBDAV = "webdav";
+var INBOX_ENDPOINT_PULL = "pull";
+var INBOX_ENDPOINT_PROBE = "probe";
+var INBOX_ENDPOINT_UI = "ui";
+var INBOX_ENDPOINT_TAGS = "tags";
+var INBOX_ENDPOINT_SECRET = "secret";
+var INBOX_ENDPOINT_PUSH = "push";
+var DEFAULT_SYNC_DIRECTORY = "inbox";
+function syncDirectory(raw) {
+  const trimmed = (raw ?? "").trim().replace(/^\/+|\/+$/g, "");
+  return trimmed.length === 0 ? DEFAULT_SYNC_DIRECTORY : trimmed;
+}
+function syncRootFor(raw) {
+  return `${syncDirectory(raw)}/sync`;
+}
+var INBOX_IMAGE_TYPES = ["image/png", "image/jpeg", "image/webp", "image/gif"];
+var LIST_LIMIT = 50;
+var UI_LIST_MODES = ["grid", "compact"];
+var PREVIEW_CHARS = 140;
+var MAX_ATTACHMENTS_PER_SUBMISSION = 20;
+var MAX_NOTE_CHARS = 2e3;
+var MAX_TAGS = 20;
+var MAX_TAG_CHARS = 40;
+var MAX_FILTER_CHARS = 200;
+var MAX_TITLE_CHARS = 300;
+
 // src/host/webdav/config.ts
 import z from "@deepseek-ai/schemastery";
 var SETTINGS_NAMESPACE = "dsh-inbox-webdav";
@@ -942,6 +1000,7 @@ var DEFAULT_SETTINGS = {
   protocol: "webdav",
   baseUrl: "",
   directory: "/inbox",
+  adoptForeignRoots: false,
   username: "",
   endpoint: "",
   bucket: "",
@@ -955,6 +1014,7 @@ var WebdavSettingsSchema = z.object({
   protocol: z.union(["webdav", "s3"]).default("webdav"),
   baseUrl: z.string().default(""),
   directory: z.string().default("/inbox"),
+  adoptForeignRoots: z.boolean().default(false),
   username: z.string().default(""),
   endpoint: z.string().default(""),
   bucket: z.string().default(""),
@@ -1026,6 +1086,7 @@ async function saveWebdav(ctx, vault, base, patch) {
     const directory = patch.directory.trim();
     config.directory = directory.startsWith("/") ? directory : `/${directory}`;
   }
+  if (patch.adoptForeignRoots !== void 0) config.adoptForeignRoots = patch.adoptForeignRoots;
   if (patch.username !== void 0) config.username = patch.username.trim();
   if (patch.endpoint !== void 0) config.endpoint = normalizeUrl(patch.endpoint);
   if (patch.bucket !== void 0) config.bucket = patch.bucket.trim();
@@ -1070,36 +1131,6 @@ async function saveWebdav(ctx, vault, base, patch) {
 
 // src/host/remote/pull.ts
 import { admitEncodedFile, admitEncodedImages } from "@deepseek-ai/dsh-attachment";
-
-// src/shared/panel-wire.ts
-var INBOX_API_PREFIX = "/api/inbox";
-var INBOX_ENDPOINT_CAPTURE = "capture";
-var INBOX_ENDPOINT_LIST = "list";
-var INBOX_ENDPOINT_DETAIL = "detail";
-var INBOX_ENDPOINT_UPDATE = "update";
-var INBOX_ENDPOINT_DELETE = "delete";
-var INBOX_ENDPOINT_RESTORE = "restore";
-var INBOX_ENDPOINT_PURGE = "purge";
-var INBOX_ENDPOINT_ATTACHMENT = "attachment";
-var INBOX_ENDPOINT_WEBDAV = "webdav";
-var INBOX_ENDPOINT_PULL = "pull";
-var INBOX_ENDPOINT_PROBE = "probe";
-var INBOX_ENDPOINT_UI = "ui";
-var INBOX_ENDPOINT_TAGS = "tags";
-var INBOX_ENDPOINT_SECRET = "secret";
-var INBOX_ENDPOINT_PUSH = "push";
-var INBOX_IMAGE_TYPES = ["image/png", "image/jpeg", "image/webp", "image/gif"];
-var LIST_LIMIT = 50;
-var UI_LIST_MODES = ["grid", "compact"];
-var PREVIEW_CHARS = 140;
-var MAX_ATTACHMENTS_PER_SUBMISSION = 20;
-var MAX_NOTE_CHARS = 2e3;
-var MAX_TAGS = 20;
-var MAX_TAG_CHARS = 40;
-var MAX_FILTER_CHARS = 200;
-var MAX_TITLE_CHARS = 300;
-
-// src/host/remote/pull.ts
 var DEFAULT_DIRECTORY = "/inbox";
 var TEXT_TYPES = ["text/", "application/json"];
 var TEXT_SUFFIXES = [".txt", ".md", ".url", ".json"];
@@ -1108,8 +1139,11 @@ function looksTextual(name2, contentType) {
   if (TEXT_SUFFIXES.some((suffix) => lower.endsWith(suffix))) return true;
   return contentType !== void 0 && TEXT_TYPES.some((prefix) => contentType.startsWith(prefix));
 }
-function isSyncObject(path) {
-  return path.split("/").some((part) => part === "sync");
+function syncPrefixOf(path) {
+  const parts = path.split("/").filter((part) => part.length > 0);
+  const at = parts.lastIndexOf("sync");
+  if (at === -1) return void 0;
+  return parts.slice(0, at + 1).slice(-2).join("/");
 }
 function laterOf(current, candidate) {
   if (candidate === void 0) return current;
@@ -1128,7 +1162,7 @@ function isNewer(entry, lastPullAt) {
   if (Number.isNaN(seen) || Number.isNaN(remote)) return true;
   return remote > seen;
 }
-async function ingestFrom(vault, source, attachments) {
+async function ingestFrom(vault, source, attachments, syncRoot3 = syncRootFor(void 0), elsewhere = { roots: [] }) {
   const lastPullAt = vault.global.sync.lastPullAt;
   let entries;
   try {
@@ -1141,15 +1175,40 @@ async function ingestFrom(vault, source, attachments) {
   let pulled = 0;
   let failed2 = 0;
   let skipped = 0;
+  let skippedSync = 0;
+  let skippedOlder = 0;
+  let skippedForeign = 0;
+  let remoteRecords = 0;
+  let remoteAttachments = 0;
+  const foreignSyncRoots = new Set(elsewhere.roots);
+  let foreignRecords = elsewhere.records ?? 0;
   let newestSuccess;
   const failures = [];
   for (const entry of entries) {
-    if (isSyncObject(entry.path)) {
+    const prefix = syncPrefixOf(entry.path);
+    if (prefix !== void 0 && prefix !== syncRoot3) {
+      skipped += 1;
+      skippedForeign += 1;
+      foreignSyncRoots.add(prefix);
+      const parts = entry.path.split("/").filter((part) => part.length > 0);
+      if ((parts[parts.length - 2] ?? "") === "items" && (parts[parts.length - 1] ?? "").endsWith(".json")) {
+        foreignRecords += 1;
+      }
+      continue;
+    }
+    if (prefix !== void 0) {
       skipped += 1;
+      skippedSync += 1;
+      const parts = entry.path.split("/").filter((part) => part.length > 0);
+      const folder = parts[parts.length - 2] ?? "";
+      const name3 = parts[parts.length - 1] ?? "";
+      if (folder === "items" && name3.endsWith(".json")) remoteRecords += 1;
+      else if (folder === "attachments" && !name3.endsWith(".meta.json")) remoteAttachments += 1;
       continue;
     }
     if (!isNewer(entry, lastPullAt)) {
       skipped += 1;
+      skippedOlder += 1;
       continue;
     }
     const name2 = nameOf(entry.path);
@@ -1207,6 +1266,14 @@ async function ingestFrom(vault, source, attachments) {
     pulled,
     failed: failed2,
     skipped,
+    skippedSync,
+    skippedOlder,
+    skippedForeign,
+    remoteRecords,
+    remoteAttachments,
+    syncRoot: syncRoot3,
+    ...foreignSyncRoots.size === 0 ? {} : { foreignSyncRoots: [...foreignSyncRoots] },
+    ...foreignRecords === 0 ? {} : { foreignRecords },
     listed,
     lastPullAt: cursor,
     ...failures.length === 0 ? {} : { reason: failures.slice(0, 3).join("\uFF1B") }
@@ -1224,7 +1291,7 @@ async function pullRemote(vault, config, deps) {
       listed: 0
     };
   }
-  const directory = config.directory ?? DEFAULT_DIRECTORY;
+  const directory = `/${syncDirectory(config.directory ?? DEFAULT_DIRECTORY)}`;
   return ingestFrom(
     vault,
     {
@@ -1235,10 +1302,12 @@ async function pullRemote(vault, config, deps) {
       })),
       read: async (entry) => readFile(entry.path, deps, entry.path.startsWith("http") ? entry.path : void 0)
     },
-    deps.attachments
+    deps.attachments,
+    // WebDAV resolves the sync root from the same directory rule the writer uses.
+    syncRootFor(config.directory)
   );
 }
-async function pullS3(vault, config, prefix, deps) {
+async function pullS3(vault, config, directory, deps) {
   if (config.endpoint.trim().length === 0 || config.bucket.trim().length === 0) {
     return {
       status: "unconfigured",
@@ -1249,18 +1318,44 @@ async function pullS3(vault, config, prefix, deps) {
       listed: 0
     };
   }
+  const scope = syncDirectory(directory);
   return ingestFrom(
     vault,
     {
-      list: async () => (await listPrefix(config, prefix, deps)).map((object) => ({
+      list: async () => (await listPrefix(config, `${scope}/`, deps)).map((object) => ({
         path: object.key,
         ...object.lastModified === void 0 ? {} : { lastModified: object.lastModified }
       })),
       read: async (entry) => readObject(config, entry.path, deps)
     },
-    deps.attachments
+    deps.attachments,
+    // The vault's own tree, resolved by the same rule the writer uses.
+    syncRootFor(directory),
+    await s3RootsElsewhere(config, deps, scope)
   );
 }
+var PROBE_CANDIDATES = 5;
+async function s3RootsElsewhere(config, deps, scope) {
+  try {
+    const tops = await listTopLevel(config, deps);
+    const found = [];
+    let records = 0;
+    for (const top of tops.slice(0, PROBE_CANDIDATES)) {
+      if (top === scope || top.startsWith(`${scope}/`)) continue;
+      for (const probe2 of [`${top}/sync/items/`, `${top}/items/`]) {
+        const inside = await listPrefix(config, probe2, deps, { "max-keys": "1000" });
+        if (inside.length > 0) {
+          found.push(probe2.replace(/\/items\/$/, ""));
+          records += inside.filter((object) => object.key.endsWith(".json")).length;
+          break;
+        }
+      }
+    }
+    return found.length === 0 ? { roots: [] } : { roots: found, records };
+  } catch {
+    return { roots: [] };
+  }
+}
 
 // src/host/remote/merge.ts
 import { admitEncodedFile as admitEncodedFile2, admitEncodedImages as admitEncodedImages2 } from "@deepseek-ai/dsh-attachment";
@@ -1308,13 +1403,14 @@ function wins(remote, local) {
 async function mergeOnce(vault, tree, prefix, admit) {
   const failures = [];
   let merged = 0;
+  let added = 0;
   let kept = 0;
   let attachments = 0;
   let objects;
   try {
     objects = await tree.list(`${prefix}/items/`);
   } catch (error) {
-    return { merged: 0, kept: 0, attachments: 0, failures: [`\u5217\u8FDC\u7AEF\u540C\u6B65\u76EE\u5F55\u5931\u8D25\uFF1A${reasonOf(error)}`] };
+    return { merged: 0, added: 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();
@@ -1344,6 +1440,7 @@ async function mergeOnce(vault, tree, prefix, admit) {
       }
       await vault.import(remote);
       merged += 1;
+      if (local === void 0) added += 1;
       for (const attachmentId of remote.attachmentIds) {
         if (vault.getAttachment(attachmentId) === void 0) {
           wanted.set(attachmentId, remote.id);
@@ -1378,7 +1475,7 @@ async function mergeOnce(vault, tree, prefix, admit) {
       failures.push(`\u9644\u4EF6 ${attachmentId}\uFF1A${reasonOf(error)}`);
     }
   }
-  return { merged, kept, attachments, failures };
+  return { merged, added, kept, attachments, failures };
 }
 function extensionOfName(path) {
   return /\.([A-Za-z0-9]{1,8})$/.exec(nameOf2(path))?.[1]?.toLowerCase() ?? "bin";
@@ -1386,15 +1483,26 @@ function extensionOfName(path) {
 function reasonOf(error) {
   return error instanceof Error ? error.message : String(error);
 }
-async function mergeRemote(ctx, vault, attachments) {
+async function mergeRemote(ctx, vault, attachments, extraRoots = []) {
   const settings = readSettings(ctx);
   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, kept: 0, attachments: 0, failures: [] };
-    return await mergeOnce(vault, tree, prefix, admitWith(attachments));
+    if (tree === void 0) return { merged: 0, added: 0, kept: 0, attachments: 0, failures: [] };
+    const admit = admitWith(attachments);
+    const outcome = await mergeOnce(vault, tree, prefix, admit);
+    for (const root of extraRoots) {
+      if (root === prefix) continue;
+      const extra = await mergeOnce(vault, tree, root, admit);
+      outcome.merged += extra.merged;
+      outcome.added += extra.added;
+      outcome.kept += extra.kept;
+      outcome.attachments += extra.attachments;
+      outcome.failures.push(...extra.failures);
+    }
+    return outcome;
   } catch (error) {
-    return { merged: 0, kept: 0, attachments: 0, failures: [reasonOf(error)] };
+    return { merged: 0, added: 0, kept: 0, attachments: 0, failures: [reasonOf(error)] };
   }
 }
 function admitWith(store) {
@@ -1493,11 +1601,15 @@ async function runPull(ctx, vault, attachments) {
 }
 async function withMerge(ctx, vault, attachments, pulled) {
   if (pulled.status !== "ok" || attachments === void 0) return pulled;
-  const outcome = await mergeRemote(ctx, vault, attachments);
+  const settings = readSettings(ctx);
+  const extraRoots = settings.adoptForeignRoots ? pulled.foreignSyncRoots ?? [] : [];
+  const outcome = await mergeRemote(ctx, vault, attachments, extraRoots);
   const troubles = [...pulled.failed > 0 && pulled.reason !== void 0 ? [pulled.reason] : [], ...outcome.failures];
   return {
     ...pulled,
     merged: outcome.merged,
+    added: outcome.added,
+    kept: outcome.kept,
     attachments: outcome.attachments,
     failed: pulled.failed + outcome.failures.length,
     ...troubles.length === 0 ? {} : { reason: troubles.slice(0, 3).join("\uFF1B") }
@@ -1546,7 +1658,10 @@ async function pullDropFolder(ctx, vault, attachments) {
         signatureVersion: settings.signatureVersion,
         userAgent: activeUserAgent(settings)
       },
-      settings.directory.replace(/^\//, ""),
+      // The configured directory, not a pre-trimmed string: `/`, `''` and
+      // "unset" all mean the default, and the ingest resolves the vault's own
+      // root from the same rule the writer uses.
+      settings.directory,
       {
         fetch: s3Fetch,
         accessKeyId: settings.accessKeyId,
@@ -1570,8 +1685,7 @@ async function pullDropFolder(ctx, vault, attachments) {
 
 // src/host/remote/writer.ts
 function syncRoot(settings) {
-  const prefix = settings.directory.replace(/^\/+|\/+$/g, "");
-  return prefix.length === 0 ? "sync" : `${prefix}/sync`;
+  return syncRootFor(settings.directory);
 }
 async function remoteWriter(ctx) {
   const settings = readSettings(ctx);
@@ -3072,6 +3186,9 @@ async function handleWebdav(ctx, vault, payload) {
     if (typeof request.protocol === "string") patch.protocol = request.protocol;
     if (typeof request.baseUrl === "string") patch.baseUrl = request.baseUrl;
     if (typeof request.directory === "string") patch.directory = request.directory;
+    if (typeof request.adoptForeignRoots === "boolean") {
+      patch.adoptForeignRoots = request.adoptForeignRoots;
+    }
     if (typeof request.username === "string") patch.username = request.username;
     if (typeof request.password === "string") patch.password = request.password;
     if (typeof request.endpoint === "string") patch.endpoint = request.endpoint;

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

@@ -129,6 +129,9 @@ export declare const zh: {
     'settings.region': string;
     'settings.bucketAddress': string;
     'settings.bucketDir': string;
+    'settings.adoptForeign': string;
+    'settings.adoptForeignHint': string;
+    'settings.directoryPlaceholder': string;
     'settings.dirS3.lead': string;
     'settings.dirS3.mid': string;
     'settings.dirS3.tail': string;
@@ -144,6 +147,7 @@ export declare const zh: {
     'settings.save': string;
     'settings.probe': string;
     'settings.details': string;
+    'settings.syncRootNow': string;
     'settings.noServiceBody': string;
     'settings.bucketHint': string;
     'notice.listFailed': string;
@@ -175,16 +179,20 @@ export declare const zh: {
     'sync.pushUnconfigured': string;
     'sync.pushFailed': string;
     'sync.pushUnknown': string;
-    'sync.pushUpToDate': string;
-    'sync.pushDone': string;
     'sync.pushPartial': string;
     'sync.pullNoAddress': string;
     'sync.pullFailed': string;
-    'sync.pullNothingNew': string;
-    'sync.pullMerged': string;
-    'sync.pullAttachments': string;
-    'sync.pullDone': string;
-    'sync.pullFailedCount': string;
+    'sync.detailPushedIdle': string;
+    'sync.detailPushed': string;
+    'sync.detailPulled': string;
+    'sync.detailAdded': string;
+    'sync.detailSkip': string;
+    'sync.pullForeignSync': string;
+    'sync.detailForeign': string;
+    'sync.shortPushed': string;
+    'sync.shortPulled': string;
+    'sync.shortIdle': string;
+    'sync.pullFailures': string;
     'sync.thisPage': string;
     'settings.status': string;
     'settings.statusOn': string;
@@ -250,10 +258,14 @@ export declare const zh: {
     'manual.5.auto.body': string;
     'manual.5.manual.label': string;
     'manual.5.manual.body': string;
+    'manual.5.twoMachines.label': string;
+    'manual.5.twoMachines.body': string;
     'manual.5.delete.label': string;
     'manual.5.delete.body': string;
-    'manual.5.conflict.label': string;
-    'manual.5.conflict.body': string;
+    'manual.5.merge.label': string;
+    'manual.5.merge.body': string;
+    'manual.5.cloud.label': string;
+    'manual.5.cloud.body': string;
     'manual.6.title': string;
     'manual.6.query.label': string;
     'manual.6.query.body': string;
@@ -386,6 +398,9 @@ export declare const MESSAGES: {
         'settings.region': string;
         'settings.bucketAddress': string;
         'settings.bucketDir': string;
+        'settings.adoptForeign': string;
+        'settings.adoptForeignHint': string;
+        'settings.directoryPlaceholder': string;
         'settings.dirS3.lead': string;
         'settings.dirS3.mid': string;
         'settings.dirS3.tail': string;
@@ -401,6 +416,7 @@ export declare const MESSAGES: {
         'settings.save': string;
         'settings.probe': string;
         'settings.details': string;
+        'settings.syncRootNow': string;
         'settings.noServiceBody': string;
         'settings.bucketHint': string;
         'notice.listFailed': string;
@@ -432,16 +448,20 @@ export declare const MESSAGES: {
         'sync.pushUnconfigured': string;
         'sync.pushFailed': string;
         'sync.pushUnknown': string;
-        'sync.pushUpToDate': string;
-        'sync.pushDone': string;
         'sync.pushPartial': string;
         'sync.pullNoAddress': string;
         'sync.pullFailed': string;
-        'sync.pullNothingNew': string;
-        'sync.pullMerged': string;
-        'sync.pullAttachments': string;
-        'sync.pullDone': string;
-        'sync.pullFailedCount': string;
+        'sync.detailPushedIdle': string;
+        'sync.detailPushed': string;
+        'sync.detailPulled': string;
+        'sync.detailAdded': string;
+        'sync.detailSkip': string;
+        'sync.pullForeignSync': string;
+        'sync.detailForeign': string;
+        'sync.shortPushed': string;
+        'sync.shortPulled': string;
+        'sync.shortIdle': string;
+        'sync.pullFailures': string;
         'sync.thisPage': string;
         'settings.status': string;
         'settings.statusOn': string;
@@ -507,10 +527,14 @@ export declare const MESSAGES: {
         'manual.5.auto.body': string;
         'manual.5.manual.label': string;
         'manual.5.manual.body': string;
+        'manual.5.twoMachines.label': string;
+        'manual.5.twoMachines.body': string;
         'manual.5.delete.label': string;
         'manual.5.delete.body': string;
-        'manual.5.conflict.label': string;
-        'manual.5.conflict.body': string;
+        'manual.5.merge.label': string;
+        'manual.5.merge.body': string;
+        'manual.5.cloud.label': string;
+        'manual.5.cloud.body': string;
         'manual.6.title': string;
         'manual.6.query.label': string;
         'manual.6.query.body': string;

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

@@ -42,6 +42,14 @@ 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} were ids this vault did not have at all.
+     *
+     * "19 records came over" and "the vault grew by 6" are both true at once, and
+     * the reader who just watched a number expects them to match (asked
+     * 2026-09-21, after merging an abandoned tree whose copies mostly overlapped).
+     */
+    added: number;
     /** Records the remote had and this machine already had, newer or equal. */
     kept: number;
     /** Attachment objects pulled down (bytes plus their row). */
@@ -76,5 +84,13 @@ export declare function mergeOnce(vault: Vault, tree: SyncTree, prefix: string,
  * @param attachments - where attachment bytes go.
  * @returns the counts and the lines worth showing; never throws.
  */
-export declare function mergeRemote(ctx: Context, vault: Vault, attachments: AttachmentStore): Promise<MergeOutcome>;
+export declare function mergeRemote(ctx: Context, vault: Vault, attachments: AttachmentStore, 
+/**
+ * Further sync trees to merge, on top of this machine's own.
+ *
+ * The pull hands over the trees it found elsewhere in the bucket (a machine
+ * that used to sync under another directory leaves one behind). Each is read
+ * exactly like our own: per record, `id` + `updatedAt` decides.
+ */
+extraRoots?: readonly string[]): Promise<MergeOutcome>;
 export {};

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

@@ -43,7 +43,18 @@ export interface RemoteSource {
  * @param attachments - the store that owns pulled bytes.
  * @returns what happened.
  */
-export declare function ingestFrom(vault: Vault, source: RemoteSource, attachments: AttachmentStore): Promise<PullResult>;
+export declare function ingestFrom(vault: Vault, source: RemoteSource, attachments: AttachmentStore, 
+/** This machine's own sync root; anything else under `sync/` is a stranger. */
+syncRoot?: string, 
+/**
+ * Sync roots found **outside** the listed scope, from a protocol-specific
+ * probe. A listing scoped to our directory cannot see them, and without them
+ * "the other machine's records never arrived" has no explanation to show.
+ */
+elsewhere?: {
+    roots: readonly string[];
+    records?: number;
+}): Promise<PullResult>;
 /** What the user configures for WebDAV. */
 export interface WebdavConfig {
     baseUrl: string;
@@ -54,7 +65,20 @@ export interface WebdavConfig {
 export declare function pullRemote(vault: Vault, config: WebdavConfig, deps: WebdavDeps & {
     attachments: AttachmentStore;
 }): Promise<PullResult>;
-/** Pull over S3. */
-export declare function pullS3(vault: Vault, config: S3Config, prefix: string, deps: S3Deps & {
+/**
+ * Pull over S3.
+ *
+ * @param directory - the configured directory, exactly as the settings hold it.
+ *   `/`, an empty string and "never set" all mean the default; the listing is
+ *   scoped to it and the vault's own tree is `<directory>/sync`.
+ *
+ * This used to be handed the sync root as the *listing* prefix, and to treat
+ * that same string as "ours": with S3 every object the vault had uploaded
+ * therefore answered to a prefix that was not ours, so the panel reported
+ * 「自己的同步对象 0 项」 and warned about another machine's directory — which was
+ * this machine's own (measured 2026-09-21, a bucket holding both `sync/…` from
+ * the older build and `inbox/sync/…` from this one).
+ */
+export declare function pullS3(vault: Vault, config: S3Config, directory: string | undefined, deps: S3Deps & {
     attachments: AttachmentStore;
 }): Promise<PullResult>;

package/lib/types/host/s3/client.d.ts

@@ -173,7 +173,31 @@ export declare function parseListing(xml: string): RemoteObject[];
  * @param deps - credentials, fetch, clock.
  * @returns the objects found.
  */
-export declare function listPrefix(config: S3Config, prefix: string, deps: S3Deps): Promise<RemoteObject[]>;
+export declare function listPrefix(config: S3Config, prefix: string, deps: S3Deps, 
+/** Extra query parameters, e.g. `{ delimiter: '/', 'max-keys': '1' }`. */
+extra?: Record<string, string>): Promise<RemoteObject[]>;
+/**
+ * The top-level folders a bucket has.
+ *
+ * `delimiter=/` collapses everything below the first slash into
+ * `<CommonPrefixes>`, which is the cheap way to ask "what else lives up here?" —
+ * one request, however many objects the bucket holds. It is what makes "another
+ * machine synced into a different directory" visible: that machine's records are
+ * not under our directory, so a listing scoped to ours can never see them, and
+ * the silence looks exactly like "nothing new" (asked 2026-09-21).
+ *
+ * @param config - endpoint, bucket, region.
+ * @param deps - credentials, fetch, clock.
+ * @returns folder names without the trailing slash, e.g. `['inbox', 'sync']`.
+ */
+export declare function listTopLevel(config: S3Config, deps: S3Deps): Promise<string[]>;
+/**
+ * Read the folder names out of a `delimiter=/` listing.
+ *
+ * @param xml - the response body.
+ * @returns each prefix without its trailing slash.
+ */
+export declare function parsePrefixes(xml: string): string[];
 /** Fetch one object's bytes, with its content type when the server sends one. */
 export declare function readObject(config: S3Config, key: string, deps: S3Deps): Promise<{
     bytes: Uint8Array;