koishi-plugin-echo-cave 1.31.0 → 1.31.2

package/README.md

@@ -85,6 +85,7 @@ npm install koishi-plugin-echo-cave
 | `autoBindSingleForwardUser`  | boolean | `false` | 转发消息仅识别到一个用户时，是否默认自动绑定该用户 |
 | `forwardSpecialUserHandlingMode` | `'ignore' \| 'reject' \| 'confirm'` | `'ignore'` | 检测到转发消息中包含用户 `1094950020` 时的处理方式：忽略、提醒后拒绝存储、或提醒并要求确认后再存储 |
 | `alpha`                      | number  | `0.2`   | 加权随机抽取的调整因子，控制抽取次数对概率的影响程度，值越大影响越明显 |
+| `s3UploadFailureFallbackMode` | `'local' \| 'original-link'` | `'local'` | 仅在 `mediaStorage='s3'` 时生效：S3 上传失败后回退到本地存储，或保留原始链接 |
 | `enableAutoReindex`          | boolean | `false` | 是否启用每日自动重整回声洞 public ID |
 | `autoReindexTime`            | string  | `00:00` | 自动重整的每日执行时间，格式为 `HH:mm` |
 
@@ -108,6 +109,7 @@ npm install koishi-plugin-echo-cave
 - 如果重排前备份写入失败，命令会直接终止，不会开始改写数据库
 - 若开启 `enableAutoReindex`，插件会在 `autoReindexTime` 指定的每日时间自动执行同样的 public ID 重排，并输出日志
 - 如果需要恢复，可执行 `cave.admin.restore-reindex <备份路径>` 读取对应的 JSON 备份并回写数据库
+- 若 `mediaStorage='s3'` 且上传失败，可通过 `s3UploadFailureFallbackMode` 指定回退到本地存储，或直接保留原始媒体链接
 
 ## 🤝 贡献指南
 

package/lib/config/config.d.ts

@@ -2,6 +2,7 @@ import { Schema } from 'koishi';
 export type SendFailureHandlingMode = 'auto-delete' | 'daily-report' | 'ignore';
 export type OversizedMediaCleanupMode = 'delete-cave' | 'keep-cave';
 export type ForwardSpecialUserHandlingMode = 'ignore' | 'reject' | 'confirm';
+export type S3UploadFailureFallbackMode = 'local' | 'original-link';
 export interface Config {
     adminMessageProtection?: boolean;
     adminIds?: string[];
@@ -22,6 +23,7 @@ export interface Config {
     forwardSpecialUserHandlingMode?: ForwardSpecialUserHandlingMode;
     alpha?: number;
     mediaStorage?: 'local' | 's3';
+    s3UploadFailureFallbackMode?: S3UploadFailureFallbackMode;
     s3Bucket?: string;
     s3Region?: string;
     s3Endpoint?: string;

package/lib/index.cjs

@@ -18017,9 +18017,9 @@ var require_dist_cjs47 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js
 var require_ruleset = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/ruleset.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ruleSet = void 0;
@@ -18219,9 +18219,9 @@ var require_ruleset = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js
 var require_endpointResolver = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/endpoint/endpointResolver.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.defaultEndpointResolver = void 0;
@@ -18258,9 +18258,9 @@ var require_endpointResolver = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js
 var require_httpAuthSchemeProvider = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/auth/httpAuthSchemeProvider.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveHttpAuthSchemeConfig = exports2.defaultS3HttpAuthSchemeProvider = exports2.defaultS3HttpAuthSchemeParametersProvider = void 0;
@@ -18387,9 +18387,9 @@ var require_httpAuthSchemeProvider = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js
 var require_S3ServiceException = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/S3ServiceException.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.S3ServiceException = exports2.__ServiceException = void 0;
@@ -18407,9 +18407,9 @@ var require_S3ServiceException = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js
 var require_errors = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/models/errors.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ObjectAlreadyInActiveTierError = exports2.IdempotencyParameterMismatch = exports2.TooManyParts = exports2.InvalidWriteOffset = exports2.InvalidRequest = exports2.EncryptionTypeMismatch = exports2.NotFound = exports2.NoSuchKey = exports2.InvalidObjectState = exports2.NoSuchBucket = exports2.BucketAlreadyOwnedByYou = exports2.BucketAlreadyExists = exports2.ObjectNotInActiveTierError = exports2.AccessDenied = exports2.NoSuchUpload = void 0;
@@ -18616,9 +18616,9 @@ var require_errors = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js
 var require_schemas_0 = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/schemas/schemas_0.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.CreateBucketMetadataTableConfigurationRequest$ = exports2.CreateBucketMetadataConfigurationRequest$ = exports2.CreateBucketConfiguration$ = exports2.CORSRule$ = exports2.CORSConfiguration$ = exports2.CopyPartResult$ = exports2.CopyObjectResult$ = exports2.CopyObjectRequest$ = exports2.CopyObjectOutput$ = exports2.ContinuationEvent$ = exports2.Condition$ = exports2.CompleteMultipartUploadRequest$ = exports2.CompleteMultipartUploadOutput$ = exports2.CompletedPart$ = exports2.CompletedMultipartUpload$ = exports2.CommonPrefix$ = exports2.Checksum$ = exports2.BucketLoggingStatus$ = exports2.BucketLifecycleConfiguration$ = exports2.BucketInfo$ = exports2.Bucket$ = exports2.BlockedEncryptionTypes$ = exports2.AnalyticsS3BucketDestination$ = exports2.AnalyticsExportDestination$ = exports2.AnalyticsConfiguration$ = exports2.AnalyticsAndOperator$ = exports2.AccessControlTranslation$ = exports2.AccessControlPolicy$ = exports2.AccelerateConfiguration$ = exports2.AbortMultipartUploadRequest$ = exports2.AbortMultipartUploadOutput$ = exports2.AbortIncompleteMultipartUpload$ = exports2.AbacStatus$ = exports2.errorTypeRegistries = exports2.TooManyParts$ = exports2.ObjectNotInActiveTierError$ = exports2.ObjectAlreadyInActiveTierError$ = exports2.NotFound$ = exports2.NoSuchUpload$ = exports2.NoSuchKey$ = exports2.NoSuchBucket$ = exports2.InvalidWriteOffset$ = exports2.InvalidRequest$ = exports2.InvalidObjectState$ = exports2.IdempotencyParameterMismatch$ = exports2.EncryptionTypeMismatch$ = exports2.BucketAlreadyOwnedByYou$ = exports2.BucketAlreadyExists$ = exports2.AccessDenied$ = exports2.S3ServiceException$ = void 0;
@@ -23815,13 +23815,13 @@ var require_schemas_0 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/package.json
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/package.json
 var require_package = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/package.json"(exports2, module2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/package.json"(exports2, module2) {
     module2.exports = {
       name: "@aws-sdk/client-s3",
       description: "AWS SDK for JavaScript S3 Client for Node.js, Browser and React Native",
-      version: "3.1029.0",
+      version: "3.1030.0",
       scripts: {
         build: "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
         "build:cjs": "node ../../scripts/compilation/inline client-s3",
@@ -23904,7 +23904,7 @@ var require_package = __commonJS({
         tslib: "^2.6.2"
       },
       devDependencies: {
-        "@aws-sdk/signature-v4-crt": "3.1029.0",
+        "@aws-sdk/signature-v4-crt": "3.1030.0",
         "@smithy/snapshot-testing": "^2.0.5",
         "@tsconfig/node20": "20.1.8",
         "@types/node": "^20.14.8",
@@ -30686,9 +30686,9 @@ var require_dist_cjs67 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js
 var require_runtimeConfig_shared = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.shared.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -30748,9 +30748,9 @@ var require_runtimeConfig_shared = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js
 var require_runtimeConfig = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/runtimeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getRuntimeConfig = void 0;
@@ -31098,9 +31098,9 @@ var require_dist_cjs70 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js
+// node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js
 var require_dist_cjs71 = __commonJS({
-  "node_modules/.pnpm/@aws-sdk+client-s3@3.1029.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js"(exports2) {
+  "node_modules/.pnpm/@aws-sdk+client-s3@3.1030.0/node_modules/@aws-sdk/client-s3/dist-cjs/index.js"(exports2) {
     "use strict";
     var middlewareExpectContinue = require_dist_cjs3();
     var middlewareFlexibleChecksums = require_dist_cjs19();
@@ -33737,6 +33737,9 @@ async function uploadTransferredMediaToS3(cfg, fileRef, channelId, type, buffer,
 function getStorageMode(cfg) {
   return cfg.mediaStorage === "s3" ? "s3" : "local";
 }
+function getS3UploadFailureFallbackMode(cfg) {
+  return cfg.s3UploadFailureFallbackMode === "original-link" ? "original-link" : "local";
+}
 function hasS3Config(cfg) {
   return Boolean(cfg.s3Bucket && cfg.s3Region);
 }
@@ -34179,19 +34182,19 @@ async function transferMediaRefToChannel(ctx, fileRef, type, targetChannelId, ta
   if (targetMode === "local") {
     if (isFileUri(fileRef)) {
       const localSourcePath = fromFileUri(fileRef);
-      const nextRef2 = await transferLocalFileToChannel(
+      const nextRef = await transferLocalFileToChannel(
         ctx,
         localSourcePath,
         type,
         targetChannelId,
         transferMode
       );
-      const plan3 = {
-        nextRef: nextRef2,
-        rollback: createDeleteLocalFilePlan(fromFileUri(nextRef2)).rollback
+      const plan2 = {
+        nextRef,
+        rollback: createDeleteLocalFilePlan(fromFileUri(nextRef)).rollback
       };
       if (transferMode === "move") {
-        plan3.commit = async () => {
+        plan2.commit = async () => {
           try {
             await import_node_fs.promises.unlink(localSourcePath);
             base64Cache.delete(localSourcePath);
@@ -34204,25 +34207,25 @@ async function transferMediaRefToChannel(ctx, fileRef, type, targetChannelId, ta
       } else {
         stats.mediaCopied += 1;
       }
-      state2.transferPlans.set(cacheKey, plan3);
-      return plan3;
+      state2.transferPlans.set(cacheKey, plan2);
+      return plan2;
     }
-    const loaded2 = await loadMediaBuffer(ctx, fileRef, cfg);
+    const loaded = await loadMediaBuffer(ctx, fileRef, cfg);
     const targetPath = await writeTransferredLocalMedia(
       ctx,
       fileRef,
       targetChannelId,
       type,
-      loaded2.buffer
+      loaded.buffer
     );
-    const plan2 = {
+    const plan = {
       nextRef: toFileUri(targetPath),
       rollback: createDeleteLocalFilePlan(targetPath).rollback
     };
     if (transferMode === "move" && isS3Uri(fileRef)) {
       const source = parseS3Uri(fileRef);
       if (source) {
-        plan2.commit = async () => {
+        plan.commit = async () => {
           try {
             await deleteS3Object(cfg, source);
           } catch (error2) {
@@ -34235,87 +34238,113 @@ async function transferMediaRefToChannel(ctx, fileRef, type, targetChannelId, ta
     } else {
       stats.mediaCopied += 1;
     }
-    state2.transferPlans.set(cacheKey, plan2);
-    return plan2;
+    state2.transferPlans.set(cacheKey, plan);
+    return plan;
   }
-  if (isS3Uri(fileRef)) {
-    const source = parseS3Uri(fileRef);
-    if (!source) {
-      throw new Error(`Invalid S3 uri: ${fileRef}`);
+  try {
+    if (isS3Uri(fileRef)) {
+      const source = parseS3Uri(fileRef);
+      if (!source) {
+        throw new Error(`Invalid S3 uri: ${fileRef}`);
+      }
+      const nextRef2 = await transferS3ObjectToChannel(
+        cfg,
+        source,
+        type,
+        targetChannelId,
+        transferMode
+      );
+      const targetLocation2 = parseS3Uri(nextRef2);
+      const plan2 = {
+        nextRef: nextRef2,
+        rollback: targetLocation2 ? async () => {
+          try {
+            await deleteS3Object(cfg, targetLocation2);
+          } catch (error2) {
+            return;
+          }
+        } : void 0
+      };
+      if (transferMode === "move") {
+        plan2.commit = async () => {
+          try {
+            await deleteS3Object(cfg, source);
+          } catch (error2) {
+            return;
+          }
+        };
+        stats.mediaMoved += 1;
+        stats.mediaDeleted += 1;
+      } else {
+        stats.mediaCopied += 1;
+      }
+      state2.transferPlans.set(cacheKey, plan2);
+      return plan2;
     }
-    const nextRef2 = await transferS3ObjectToChannel(
+    const loaded = await loadMediaBuffer(ctx, fileRef, cfg);
+    const location = await uploadTransferredMediaToS3(
       cfg,
-      source,
-      type,
+      fileRef,
       targetChannelId,
-      transferMode
+      type,
+      loaded.buffer,
+      loaded.contentType
     );
-    const targetLocation2 = parseS3Uri(nextRef2);
-    const plan2 = {
-      nextRef: nextRef2,
-      rollback: targetLocation2 ? async () => {
+    const nextRef = toS3Uri(location);
+    const targetLocation = parseS3Uri(nextRef);
+    const plan = {
+      nextRef,
+      rollback: targetLocation ? async () => {
         try {
-          await deleteS3Object(cfg, targetLocation2);
+          await deleteS3Object(cfg, targetLocation);
         } catch (error2) {
           return;
         }
       } : void 0
     };
-    if (transferMode === "move") {
-      plan2.commit = async () => {
+    if (transferMode === "move" && isFileUri(fileRef)) {
+      const currentPath = fromFileUri(fileRef);
+      plan.commit = async () => {
         try {
-          await deleteS3Object(cfg, source);
+          await import_node_fs.promises.unlink(currentPath);
+          base64Cache.delete(currentPath);
+          base64Cache.delete(fileRef);
         } catch (error2) {
           return;
         }
       };
-      stats.mediaMoved += 1;
       stats.mediaDeleted += 1;
-    } else {
-      stats.mediaCopied += 1;
+      stats.mediaMoved += 1;
     }
-    state2.transferPlans.set(cacheKey, plan2);
-    return plan2;
-  }
-  const loaded = await loadMediaBuffer(ctx, fileRef, cfg);
-  const location = await uploadTransferredMediaToS3(
-    cfg,
-    fileRef,
-    targetChannelId,
-    type,
-    loaded.buffer,
-    loaded.contentType
-  );
-  const nextRef = toS3Uri(location);
-  const targetLocation = parseS3Uri(nextRef);
-  const plan = {
-    nextRef,
-    rollback: targetLocation ? async () => {
-      try {
-        await deleteS3Object(cfg, targetLocation);
-      } catch (error2) {
-        return;
-      }
-    } : void 0
-  };
-  if (transferMode === "move" && isFileUri(fileRef)) {
-    const currentPath = fromFileUri(fileRef);
-    plan.commit = async () => {
-      try {
-        await import_node_fs.promises.unlink(currentPath);
-        base64Cache.delete(currentPath);
-        base64Cache.delete(fileRef);
-      } catch (error2) {
-        return;
-      }
-    };
-    stats.mediaDeleted += 1;
-    stats.mediaMoved += 1;
+    state2.transferPlans.set(cacheKey, plan);
+    stats.mediaUploaded += 1;
+    await hooks?.onS3Upload?.(type, nextRef);
+    return plan;
+  } catch (error2) {
+    const fallbackMode = getS3UploadFailureFallbackMode(cfg);
+    ctx.logger.warn(
+      `Failed to store media in S3 for ${fileRef}, fallback mode=${fallbackMode}: ${error2}`
+    );
+    if (fallbackMode === "original-link") {
+      const plan = { nextRef: fileRef };
+      state2.transferPlans.set(cacheKey, plan);
+      return plan;
+    }
+    const fallbackPlan = await transferMediaRefToChannel(
+      ctx,
+      fileRef,
+      type,
+      targetChannelId,
+      "local",
+      transferMode,
+      cfg,
+      state2,
+      stats,
+      hooks
+    );
+    state2.transferPlans.set(cacheKey, fallbackPlan);
+    return fallbackPlan;
   }
-  state2.transferPlans.set(cacheKey, plan);
-  stats.mediaUploaded += 1;
-  await hooks?.onS3Upload?.(type, nextRef);
-  return plan;
 }
 async function mutateMessageContent(ctx, content, handler) {
   const parsed = JSON.parse(content);
@@ -34436,11 +34465,14 @@ async function deleteCavesForOversizedMedia(ctx, caves, cfg) {
 }
 async function inspectCaveMediaRefs(ctx, shouldInclude) {
   const caves = await getAllCaves(ctx);
+  let scannedRecords = 0;
+  const failedRecordIds = [];
   const results = [];
   for (const cave of caves) {
     if (shouldInclude && !shouldInclude(cave.id)) {
       continue;
     }
+    scannedRecords += 1;
     try {
       const refs = await collectMessageMediaRefs(ctx, cave.content);
       if (refs.length > 0) {
@@ -34450,10 +34482,15 @@ async function inspectCaveMediaRefs(ctx, shouldInclude) {
         });
       }
     } catch (error2) {
+      failedRecordIds.push(cave.id);
       ctx.logger.warn(`Failed to inspect media refs for cave #${cave.id}: ${error2}`);
     }
   }
-  return results;
+  return {
+    failedRecordIds,
+    results,
+    scannedRecords
+  };
 }
 async function rewriteMessageMediaStorage(ctx, content, targetChannelId, targetMode, transferMode, cfg, state2, stats, shouldRewrite, hooks) {
   const planSet = /* @__PURE__ */ new Set();
@@ -34590,15 +34627,28 @@ async function saveMedia(ctx, mediaElement, type, cfg, channelId, progressOption
       return mediaUrl;
     }
     if (getStorageMode(cfg) === "s3") {
-      const location = await uploadBufferToS3(
-        cfg,
-        channelId,
-        type,
-        buffer,
-        extension,
-        contentType || getMimeTypeByExtension(`.${extension}`, type)
-      );
-      return toS3Uri(location);
+      try {
+        const location = await uploadBufferToS3(
+          cfg,
+          channelId,
+          type,
+          buffer,
+          extension,
+          contentType || getMimeTypeByExtension(`.${extension}`, type)
+        );
+        return toS3Uri(location);
+      } catch (error2) {
+        const fallbackMode = getS3UploadFailureFallbackMode(cfg);
+        ctx.logger.warn(
+          `Failed to upload ${type} to S3 for ${mediaUrl}, fallback mode=${fallbackMode}: ${error2}`
+        );
+        if (fallbackMode === "original-link") {
+          return mediaUrl;
+        }
+        const savedPath2 = await writeLocalMedia(ctx, channelId, type, buffer, extension);
+        await debouncedCleanup(ctx, cfg, type, channelId);
+        return savedPath2;
+      }
     }
     const savedPath = await writeLocalMedia(ctx, channelId, type, buffer, extension);
     await debouncedCleanup(ctx, cfg, type, channelId);
@@ -34827,7 +34877,7 @@ async function deleteMediaFilesFromMessage(ctx, content, cfg) {
     return element;
   });
 }
-async function migrateLocalMediaToV2(ctx, cfg) {
+async function migrateLocalMediaToV2(ctx, cfg, createHooks) {
   const caves = await getAllCaves(ctx);
   const stats = createEmptyStats();
   const state2 = {
@@ -34836,6 +34886,8 @@ async function migrateLocalMediaToV2(ctx, cfg) {
   const failedRecordIds = [];
   for (const cave of caves) {
     let rewritten = null;
+    let status = "skipped";
+    const hooks = createHooks?.(cave.id);
     try {
       rewritten = await rewriteMessageMediaStorage(
         ctx,
@@ -34846,7 +34898,8 @@ async function migrateLocalMediaToV2(ctx, cfg) {
         cfg,
         state2,
         stats,
-        (fileRef, type) => isLegacyLocalMediaRef(ctx, fileRef, type)
+        (fileRef, type) => isLegacyLocalMediaRef(ctx, fileRef, type),
+        hooks
       );
       const mediaUrlFields = await collectStoredMessageMediaUrls(ctx, rewritten.content);
       const shouldUpdateMediaFields = hasMediaUrlFieldChanges(cave, mediaUrlFields);
@@ -34859,13 +34912,17 @@ async function migrateLocalMediaToV2(ctx, cfg) {
           ...mediaUrlFields
         });
         await runTransferPlans(rewritten.plans, "commit");
+        status = "updated";
       }
     } catch (error2) {
       if (rewritten) {
         await runTransferPlans(rewritten.plans, "rollback");
       }
       failedRecordIds.push(cave.id);
+      status = "failed";
       ctx.logger.warn(`Failed to migrate legacy local media for cave #${cave.id}: ${error2}`);
+    } finally {
+      await hooks?.onRecordProcessed?.(status);
     }
   }
   return {
@@ -34883,6 +34940,7 @@ async function migrateLocalMediaToS3(ctx, cfg, keepLocal, createHooks) {
   const failedRecordIds = [];
   for (const cave of caves) {
     let rewritten = null;
+    let status = "skipped";
     const hooks = createHooks?.(cave.id);
     try {
       rewritten = await rewriteMessageMediaStorage(
@@ -34909,13 +34967,17 @@ async function migrateLocalMediaToS3(ctx, cfg, keepLocal, createHooks) {
         });
         await runTransferPlans(rewritten.plans, "commit");
         await hooks?.onMigrationCommitted?.();
+        status = "updated";
       }
     } catch (error2) {
       if (rewritten) {
         await runTransferPlans(rewritten.plans, "rollback");
       }
       failedRecordIds.push(cave.id);
+      status = "failed";
       ctx.logger.warn(`Failed to migrate local media to S3 for cave #${cave.id}: ${error2}`);
+    } finally {
+      await hooks?.onRecordProcessed?.(status);
     }
   }
   return {
@@ -34924,7 +34986,7 @@ async function migrateLocalMediaToS3(ctx, cfg, keepLocal, createHooks) {
     ...stats
   };
 }
-async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, keepSource) {
+async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, keepSource, createHooks) {
   const sourceCaves = await getCavesByChannel(ctx, sourceChannelId);
   const targetMode = getStorageMode(cfg);
   const transferMode = keepSource ? "copy" : "move";
@@ -34936,6 +34998,8 @@ async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, kee
   let mergedRecords = 0;
   for (const cave of sourceCaves) {
     let rewritten = null;
+    let status = "skipped";
+    const hooks = createHooks?.(cave.id);
     try {
       rewritten = await rewriteMessageMediaStorage(
         ctx,
@@ -34945,7 +35009,9 @@ async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, kee
         transferMode,
         cfg,
         state2,
-        stats
+        stats,
+        void 0,
+        hooks
       );
       if (keepSource) {
         const nextId = await getNextCavePublicId(ctx);
@@ -34976,12 +35042,16 @@ async function mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, kee
       }
       await runTransferPlans(rewritten.plans, "commit");
       mergedRecords += 1;
+      status = "updated";
     } catch (error2) {
       if (rewritten) {
         await runTransferPlans(rewritten.plans, "rollback");
       }
       failedRecordIds.push(cave.id);
+      status = "failed";
       ctx.logger.warn(`Failed to merge cave #${cave.id}: ${error2}`);
+    } finally {
+      await hooks?.onRecordProcessed?.(status);
     }
   }
   return {
@@ -35074,6 +35144,7 @@ async function listenForUserMessage(ctx, session, prompt, timeout, onMessage, on
 var import_node_fs2 = require("node:fs");
 var import_node_path2 = __toESM(require("node:path"), 1);
 var REINDEX_SPECIAL_OFFSET = 1e6;
+var ADMIN_BATCH_PROGRESS_INTERVAL = 50;
 var caveMaintenanceLock = false;
 function hasStringArray(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
@@ -35268,18 +35339,6 @@ function getBooleanLabel(session, value) {
     value ? "commands.cave.admin.common.boolean.keep" : "commands.cave.admin.common.boolean.drop"
   );
 }
-function getMediaTypeLabel(session, type) {
-  switch (type) {
-    case "image":
-      return session.text("commands.cave.admin.common.mediaType.image");
-    case "video":
-      return session.text("commands.cave.admin.common.mediaType.video");
-    case "record":
-      return session.text("commands.cave.admin.common.mediaType.record");
-    default:
-      return session.text("commands.cave.admin.common.mediaType.file");
-  }
-}
 function getMediaStorageLabel(session, storage) {
   return session.text(
     storage === "s3" ? "commands.cave.admin.common.mediaStorage.s3" : "commands.cave.admin.common.mediaStorage.local"
@@ -35297,6 +35356,30 @@ function appendFailedRecordSummary(session, message, failedRecordIds) {
     failedRecordIds: failedRecordIds.join(", ")
   });
 }
+async function sendBatchProgressIfNeeded(session, processedCount, totalCount, messageKey) {
+  if (processedCount === 0 || processedCount % ADMIN_BATCH_PROGRESS_INTERVAL !== 0) {
+    return;
+  }
+  await session.send(
+    session.text(messageKey, {
+      processedCount,
+      totalCount
+    })
+  );
+}
+async function sendBatchedInspectResults(session, batch) {
+  if (batch.length === 0) {
+    return;
+  }
+  await session.send(
+    batch.map(
+      ({ id, refs }) => session.text("commands.cave.admin.inspect-media.messages.resultItem", {
+        id,
+        refs: refs.join("\n")
+      })
+    ).join("\n\n")
+  );
+}
 function getAllRangesLabel(session) {
   return session.text("commands.cave.admin.inspect-media.messages.allRanges");
 }
@@ -35398,7 +35481,26 @@ async function mergeCavesBetweenChannels(ctx, session, cfg, sourceChannelId, tar
   if (!confirmed) {
     return;
   }
-  const result = await mergeChannelCaves(ctx, cfg, sourceChannelId, targetChannelId, keepSource);
+  let processedCount = 0;
+  const totalCount = sourceCaves.length;
+  const result = await mergeChannelCaves(
+    ctx,
+    cfg,
+    sourceChannelId,
+    targetChannelId,
+    keepSource,
+    () => ({
+      onRecordProcessed: async () => {
+        processedCount += 1;
+        await sendBatchProgressIfNeeded(
+          session,
+          processedCount,
+          totalCount,
+          "commands.cave.admin.merge.messages.progress"
+        );
+      }
+    })
+  );
   return appendFailedRecordSummary(
     session,
     session.text("commands.cave.admin.merge.messages.mergeDone", result),
@@ -35410,7 +35512,19 @@ async function migrateLegacyLocalMedia(ctx, session, cfg) {
   if (accessError) {
     return accessError;
   }
-  const result = await migrateLocalMediaToV2(ctx, cfg);
+  const caves = await getAllCaves(ctx);
+  let processedCount = 0;
+  const result = await migrateLocalMediaToV2(ctx, cfg, () => ({
+    onRecordProcessed: async () => {
+      processedCount += 1;
+      await sendBatchProgressIfNeeded(
+        session,
+        processedCount,
+        caves.length,
+        "commands.cave.admin.migrate-local-v2.messages.progress"
+      );
+    }
+  }));
   return appendFailedRecordSummary(
     session,
     session.text("commands.cave.admin.migrate-local-v2.messages.migrateDone", result),
@@ -35445,21 +35559,18 @@ async function migrateMediaToS3(ctx, session, cfg, keepLocalOption) {
   if (!confirmed) {
     return;
   }
-  const result = await migrateLocalMediaToS3(ctx, cfg, keepLocal, (caveId) => {
-    const uploadedMediaTypes = [];
+  const caves = await getAllCaves(ctx);
+  let processedCount = 0;
+  const result = await migrateLocalMediaToS3(ctx, cfg, keepLocal, () => {
     return {
-      onS3Upload: async (type) => {
-        uploadedMediaTypes.push(type);
-      },
-      onMigrationCommitted: async () => {
-        for (const mediaType of uploadedMediaTypes) {
-          await session.send(
-            session.text("commands.cave.admin.migrate-s3.messages.itemUploaded", {
-              caveId,
-              mediaType: getMediaTypeLabel(session, mediaType)
-            })
-          );
-        }
+      onRecordProcessed: async () => {
+        processedCount += 1;
+        await sendBatchProgressIfNeeded(
+          session,
+          processedCount,
+          caves.length,
+          "commands.cave.admin.migrate-s3.messages.progress"
+        );
       }
     };
   });
@@ -35479,8 +35590,8 @@ async function inspectMediaRefsForMigration(ctx, session, cfg, idRangesOption) {
     return session.text("commands.cave.admin.inspect-media.messages.invalidRange");
   }
   const displayRanges = idRangesOption?.trim() || getAllRangesLabel(session);
-  const results = await inspectCaveMediaRefs(ctx, (id) => isIdInRanges(id, idRanges));
-  if (results.length === 0) {
+  const inspection = await inspectCaveMediaRefs(ctx, (id) => isIdInRanges(id, idRanges));
+  if (inspection.results.length === 0 && inspection.failedRecordIds.length === 0) {
     return session.text("commands.cave.admin.inspect-media.messages.noMediaFound", {
       idRanges: displayRanges
     });
@@ -35490,7 +35601,7 @@ async function inspectMediaRefsForMigration(ctx, session, cfg, idRangesOption) {
     session,
     session.text("commands.cave.admin.inspect-media.messages.confirmSummary", {
       idRanges: displayRanges,
-      matchedCount: results.length
+      matchedCount: inspection.results.length
     }),
     session.text("commands.cave.admin.inspect-media.messages.confirmRetry"),
     session.text("commands.cave.admin.inspect-media.messages.confirmTimeout"),
@@ -35499,14 +35610,31 @@ async function inspectMediaRefsForMigration(ctx, session, cfg, idRangesOption) {
   if (!confirmed) {
     return;
   }
-  for (const { id, refs } of results) {
-    await session.send(
-      session.text("commands.cave.admin.inspect-media.messages.resultItem", {
-        id,
-        refs: refs.join("\n")
-      })
-    );
+  let processedCount = 0;
+  const batchedResults = [];
+  for (const result of inspection.results) {
+    batchedResults.push(result);
+    processedCount += 1;
+    if (batchedResults.length === ADMIN_BATCH_PROGRESS_INTERVAL) {
+      await sendBatchedInspectResults(session, batchedResults);
+      batchedResults.length = 0;
+      await session.send(
+        session.text("commands.cave.admin.inspect-media.messages.progress", {
+          processedCount,
+          totalCount: inspection.results.length
+        })
+      );
+    }
   }
+  await sendBatchedInspectResults(session, batchedResults);
+  return appendFailedRecordSummary(
+    session,
+    session.text("commands.cave.admin.inspect-media.messages.inspectDone", {
+      scannedRecords: inspection.scannedRecords,
+      matchedCount: inspection.results.length
+    }),
+    inspection.failedRecordIds
+  );
 }
 async function backfillCaveMediaUrls(ctx, session, cfg, idRangesOption) {
   const accessError = ensureAdminPrivateAccess(session, cfg);
@@ -35541,6 +35669,7 @@ async function backfillCaveMediaUrls(ctx, session, cfg, idRangesOption) {
   if (!confirmed) {
     return;
   }
+  let processedCount = 0;
   let updatedCount = 0;
   let skippedWithoutMedia = 0;
   const failedRecordIds = [];
@@ -35552,13 +35681,21 @@ async function backfillCaveMediaUrls(ctx, session, cfg, idRangesOption) {
       const mediaUrlFields = await collectStoredMessageMediaUrls(ctx, cave.content);
       if (areMediaUrlFieldsEmpty(mediaUrlFields)) {
         skippedWithoutMedia += 1;
-        continue;
+      } else {
+        await updateCaveByEntryId(ctx, cave.entryId, mediaUrlFields);
+        updatedCount += 1;
       }
-      await updateCaveByEntryId(ctx, cave.entryId, mediaUrlFields);
-      updatedCount += 1;
     } catch (error2) {
       failedRecordIds.push(cave.id);
       ctx.logger.warn(`Failed to backfill media URLs for cave #${cave.id}: ${error2}`);
+    } finally {
+      processedCount += 1;
+      await sendBatchProgressIfNeeded(
+        session,
+        processedCount,
+        candidates.length,
+        "commands.cave.admin.backfill-media-urls.messages.progress"
+      );
     }
   }
   return appendFailedRecordSummary(
@@ -35672,11 +35809,32 @@ async function reindexCaveIds(ctx, session, cfg) {
   setCaveMaintenanceLock(true);
   try {
     const reindexedCaves = buildSequentialCaveSnapshot(caves);
+    let processedCount = 0;
+    const failedRecordIds = [];
     for (const cave of reindexedCaves) {
-      if (typeof cave.entryId !== "number") {
-        throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+      try {
+        if (typeof cave.entryId !== "number") {
+          throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+        }
+        await updateCaveByEntryId(ctx, cave.entryId, { id: cave.id });
+        processedCount += 1;
+        await sendBatchProgressIfNeeded(
+          session,
+          processedCount,
+          reindexedCaves.length,
+          "commands.cave.admin.reindex.messages.progress"
+        );
+      } catch (error2) {
+        failedRecordIds.push(cave.id);
+        throw appendFailedRecordSummary(
+          session,
+          session.text("commands.cave.admin.reindex.messages.reindexFailed", {
+            backupPath,
+            error: error2 instanceof Error ? error2.message : String(error2)
+          }),
+          failedRecordIds
+        );
       }
-      await updateCaveByEntryId(ctx, cave.entryId, { id: cave.id });
     }
     await verifyCaveSnapshot(ctx, reindexedCaves);
     return session.text("commands.cave.admin.reindex.messages.reindexDone", {
@@ -35685,7 +35843,7 @@ async function reindexCaveIds(ctx, session, cfg) {
     });
   } catch (error2) {
     ctx.logger.error(`Failed to reindex cave ids: ${error2}`);
-    return session.text("commands.cave.admin.reindex.messages.reindexFailed", {
+    return typeof error2 === "string" ? error2 : session.text("commands.cave.admin.reindex.messages.reindexFailed", {
       backupPath,
       error: error2 instanceof Error ? error2.message : String(error2)
     });
@@ -35736,6 +35894,32 @@ async function restoreReindexBackup(ctx, session, cfg, backupPathInput) {
       ...toCaveSnapshotRecord(record),
       entryId: record.entryId
     }));
+    let processedCount = 0;
+    const failedRecordIds = [];
+    for (const cave of restoreRecords) {
+      try {
+        if (typeof cave.entryId !== "number") {
+          throw new Error(`missing_entry_id_for_cave_${cave.id}`);
+        }
+        processedCount += 1;
+        await sendBatchProgressIfNeeded(
+          session,
+          processedCount,
+          restoreRecords.length,
+          "commands.cave.admin.restore-reindex.messages.progress"
+        );
+      } catch (error2) {
+        failedRecordIds.push(cave.id);
+        throw appendFailedRecordSummary(
+          session,
+          session.text("commands.cave.admin.restore-reindex.messages.restoreFailed", {
+            backupPath,
+            error: error2 instanceof Error ? error2.message : String(error2)
+          }),
+          failedRecordIds
+        );
+      }
+    }
     await replaceCaveSnapshot(ctx, currentCaves, restoreRecords);
     await verifyRestoredSnapshot(ctx, backup.records);
     return session.text("commands.cave.admin.restore-reindex.messages.restoreDone", {
@@ -35744,7 +35928,7 @@ async function restoreReindexBackup(ctx, session, cfg, backupPathInput) {
     });
   } catch (error2) {
     ctx.logger.error(`Failed to restore cave reindex backup: ${error2}`);
-    return session.text("commands.cave.admin.restore-reindex.messages.restoreFailed", {
+    return typeof error2 === "string" ? error2 : session.text("commands.cave.admin.restore-reindex.messages.restoreFailed", {
       backupPath,
       error: error2 instanceof Error ? error2.message : String(error2)
     });
@@ -37213,6 +37397,7 @@ var zh_CN_default = {
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u64CD\u4F5C\u3002",
         confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u64CD\u4F5C\u672A\u6267\u884C\u3002",
+        progress: "\u23F3 \u7FA4\u804A\u56DE\u58F0\u6D1E\u5408\u5E76\u8FDB\u5EA6\uFF1A\u5DF2\u5904\u7406 {processedCount}/{totalCount} \u6761\u8BB0\u5F55\u3002",
         mergeDone: "\u2705 \u5408\u5E76\u5B8C\u6210\uFF1A\u5904\u7406\u4E86 {mergedRecords} \u6761\u8BB0\u5F55\uFF0C\u5A92\u4F53\u590D\u5236 {mediaCopied} \u4E2A\u3001\u79FB\u52A8 {mediaMoved} \u4E2A\u3001\u4E0A\u4F20 {mediaUploaded} \u4E2A\u3001\u5931\u8D25 {mediaFailed} \u4E2A\u3002"
       }
     },
@@ -37239,6 +37424,7 @@ var zh_CN_default = {
     "cave.admin.migrate-local-v2": {
       description: "\u8FC1\u79FB\u65E7\u672C\u5730\u5A92\u4F53\u76EE\u5F55\u5230 V2 \u5206\u7FA4\u5B58\u50A8\u683C\u5F0F",
       messages: {
+        progress: "\u23F3 \u672C\u5730\u5A92\u4F53\u8FC1\u79FB\u8FDB\u5EA6\uFF1A\u5DF2\u5904\u7406 {processedCount}/{totalCount} \u6761\u8BB0\u5F55\u3002",
         migrateDone: "\u2705 \u672C\u5730\u5A92\u4F53\u8FC1\u79FB\u5B8C\u6210\uFF1A\u626B\u63CF {scannedRecords} \u6761\u8BB0\u5F55\uFF0C\u66F4\u65B0 {recordsUpdated} \u6761\u8BB0\u5F55\uFF0C\u590D\u5236 {mediaCopied} \u4E2A\u3001\u79FB\u52A8 {mediaMoved} \u4E2A\u3001\u5931\u8D25 {mediaFailed} \u4E2A\u3002"
       }
     },
@@ -37251,7 +37437,7 @@ var zh_CN_default = {
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u64CD\u4F5C\u3002",
         confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u64CD\u4F5C\u672A\u6267\u884C\u3002",
-        itemUploaded: "\u{1F4E6} \u5DF2\u4E0A\u4F20\u5230 S3\uFF1A\u56DE\u58F0\u6D1E #{caveId} \u7684{mediaType}",
+        progress: "\u23F3 S3 \u8FC1\u79FB\u8FDB\u5EA6\uFF1A\u5DF2\u5904\u7406 {processedCount}/{totalCount} \u6761\u8BB0\u5F55\u3002",
         migrateDone: "\u2705 S3 \u8FC1\u79FB\u5B8C\u6210\uFF1A\u626B\u63CF {scannedRecords} \u6761\u8BB0\u5F55\uFF0C\u66F4\u65B0 {recordsUpdated} \u6761\u8BB0\u5F55\uFF0C\u4E0A\u4F20 {mediaUploaded} \u4E2A\u3001\u590D\u5236 {mediaCopied} \u4E2A\u3001\u79FB\u52A8 {mediaMoved} \u4E2A\u3001\u5220\u9664 {mediaDeleted} \u4E2A\u3001\u5931\u8D25 {mediaFailed} \u4E2A\u3002"
       }
     },
@@ -37262,10 +37448,12 @@ var zh_CN_default = {
         allRanges: "\u5168\u90E8",
         noMediaFound: "\u{1F50D} \u5728\u8303\u56F4 {idRanges} \u5185\u672A\u68C0\u6D4B\u5230\u4EFB\u4F55\u5A92\u4F53\u94FE\u63A5\u3002",
         resultItem: "\u56DE\u58F0\u6D1E #{id}\n{refs}",
-        confirmSummary: "\u26A0\uFE0F \u5373\u5C06\u6267\u884C\u5A92\u4F53\u94FE\u63A5\u68C0\u6D4B\uFF08\u53EA\u8BFB\uFF09\n\u68C0\u6D4B\u8303\u56F4\uFF1A{idRanges}\n\u547D\u4E2D\u56DE\u58F0\u6D1E\u6570\uFF1A{matchedCount}\n\n\u672C\u6B21\u64CD\u4F5C\u4E0D\u4F1A\u4E0A\u4F20 S3\u3001\u4E0D\u4F1A\u5220\u9664\u672C\u5730\u5A92\u4F53\u3001\u4E0D\u4F1A\u6539\u5199\u6570\u636E\u5E93\uFF0C\u4F46\u4F1A\u9010\u6761\u53D1\u9001\u68C0\u6D4B\u7ED3\u679C\u3002\u8BF7\u5728 30 \u79D2\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u8F93\u5165\u201C\u53D6\u6D88\u201D\u53EF\u7EC8\u6B62\u3002",
+        confirmSummary: "\u26A0\uFE0F \u5373\u5C06\u6267\u884C\u5A92\u4F53\u94FE\u63A5\u68C0\u6D4B\uFF08\u53EA\u8BFB\uFF09\n\u68C0\u6D4B\u8303\u56F4\uFF1A{idRanges}\n\u547D\u4E2D\u56DE\u58F0\u6D1E\u6570\uFF1A{matchedCount}\n\n\u672C\u6B21\u64CD\u4F5C\u4E0D\u4F1A\u4E0A\u4F20 S3\u3001\u4E0D\u4F1A\u5220\u9664\u672C\u5730\u5A92\u4F53\u3001\u4E0D\u4F1A\u6539\u5199\u6570\u636E\u5E93\uFF1B\u68C0\u6D4B\u7ED3\u679C\u4F1A\u6309\u6279\u6B21\u53D1\u9001\u8FDB\u5EA6\u4E0E\u660E\u7EC6\u3002\u8BF7\u5728 30 \u79D2\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u8F93\u5165\u201C\u53D6\u6D88\u201D\u53EF\u7EC8\u6B62\u3002",
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u68C0\u6D4B\u3002",
-        confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u68C0\u6D4B\u672A\u6267\u884C\u3002"
+        confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u68C0\u6D4B\u672A\u6267\u884C\u3002",
+        progress: "\u23F3 \u5A92\u4F53\u94FE\u63A5\u68C0\u6D4B\u8FDB\u5EA6\uFF1A\u5DF2\u53D1\u9001 {processedCount}/{totalCount} \u6761\u547D\u4E2D\u7ED3\u679C\u3002",
+        inspectDone: "\u2705 \u5A92\u4F53\u94FE\u63A5\u68C0\u6D4B\u5B8C\u6210\uFF1A\u5171\u626B\u63CF {scannedRecords} \u6761\u8BB0\u5F55\uFF0C\u547D\u4E2D {matchedCount} \u6761\u56DE\u58F0\u6D1E\u3002"
       }
     },
     "cave.admin.backfill-media-urls": {
@@ -37277,6 +37465,7 @@ var zh_CN_default = {
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u5A92\u4F53 URL \u56DE\u586B\u3002",
         confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u5A92\u4F53 URL \u56DE\u586B\u672A\u6267\u884C\u3002",
+        progress: "\u23F3 \u5A92\u4F53 URL \u56DE\u586B\u8FDB\u5EA6\uFF1A\u5DF2\u5904\u7406 {processedCount}/{totalCount} \u6761\u5019\u9009\u8BB0\u5F55\u3002",
         backfillDone: "\u2705 \u5A92\u4F53 URL \u56DE\u586B\u5B8C\u6210\uFF1A\u626B\u63CF {scannedRecords} \u6761\u5019\u9009\u8BB0\u5F55\uFF0C\u6210\u529F\u66F4\u65B0 {updatedCount} \u6761\uFF0C\u65E0\u5A92\u4F53\u53EF\u56DE\u586B {skippedWithoutMedia} \u6761\u3002"
       }
     },
@@ -37290,6 +37479,7 @@ var zh_CN_default = {
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u56DE\u58F0\u6D1E ID \u91CD\u6392\u3002",
         confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u56DE\u58F0\u6D1E ID \u91CD\u6392\u672A\u6267\u884C\u3002",
+        progress: "\u23F3 \u56DE\u58F0\u6D1E ID \u91CD\u6392\u8FDB\u5EA6\uFF1A\u5DF2\u5904\u7406 {processedCount}/{totalCount} \u6761\u8BB0\u5F55\u3002",
         reindexDone: "\u2705 \u56DE\u58F0\u6D1E public ID \u91CD\u6392\u5B8C\u6210\uFF0C\u5171\u5904\u7406 {caveCount} \u6761\u8BB0\u5F55\u3002\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}",
         reindexFailed: "\u274C \u56DE\u58F0\u6D1E ID \u91CD\u6392\u5931\u8D25\uFF0C\u5DF2\u505C\u6B62\u7EE7\u7EED\u5199\u5165\u3002\u53EF\u4F7F\u7528 cave.admin.restore-reindex \u6062\u590D\u5907\u4EFD\uFF1A{backupPath}\n\u9519\u8BEF\uFF1A{error}"
       }
@@ -37303,6 +37493,7 @@ var zh_CN_default = {
         confirmRetry: "\u26A0\uFE0F \u672A\u6536\u5230\u201C\u786E\u8BA4\u201D\u3002\u8BF7\u5728\u5269\u4F59\u65F6\u95F4\u5185\u8F93\u5165\u201C\u786E\u8BA4\u201D\u7EE7\u7EED\uFF0C\u6216\u8F93\u5165\u201C\u53D6\u6D88\u201D\u7EC8\u6B62\u3002",
         confirmCancelled: "\u{1F6D1} \u5DF2\u53D6\u6D88\u672C\u6B21\u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u3002",
         confirmTimeout: "\u231B \u4E8C\u6B21\u786E\u8BA4\u8D85\u65F6\uFF0C\u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u672A\u6267\u884C\u3002",
+        progress: "\u23F3 \u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u8FDB\u5EA6\uFF1A\u5DF2\u6821\u9A8C {processedCount}/{totalCount} \u6761\u8BB0\u5F55\u3002",
         restoreDone: "\u2705 \u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u5B8C\u6210\uFF0C\u5171\u6062\u590D {caveCount} \u6761\u8BB0\u5F55\u3002\u5907\u4EFD\u6587\u4EF6\uFF1A{backupPath}",
         restoreFailed: "\u274C \u56DE\u58F0\u6D1E\u5907\u4EFD\u6062\u590D\u5931\u8D25\uFF0C\u5DF2\u5C1D\u8BD5\u56DE\u6EDA\u5230\u6062\u590D\u524D\u72B6\u6001\uFF1A{backupPath}\n\u9519\u8BEF\uFF1A{error}"
       }
@@ -37332,6 +37523,7 @@ var zh_CN_default2 = {
   forwardSpecialUserHandlingMode: "\u68C0\u6D4B\u5230\u7279\u6B8A\u7528\u6237 1094950020 \u65F6\u7684\u5904\u7406\u65B9\u5F0F\uFF1Aignore \u4E3A\u5FFD\u7565\uFF0Creject \u4E3A\u63D0\u9192\u5E76\u62D2\u7EDD\u5B58\u50A8\uFF0Cconfirm \u4E3A\u63D0\u9192\u3001\u5C55\u793A\u8F6C\u53D1\u5185\u5BB9\u5E76\u8981\u6C42\u786E\u8BA4\u540E\u518D\u5B58\u50A8",
   alpha: "\u52A0\u6743\u968F\u673A\u62BD\u53D6\u7684\u8C03\u6574\u56E0\u5B50\uFF0C\u63A7\u5236\u62BD\u53D6\u6B21\u6570\u5BF9\u6982\u7387\u7684\u5F71\u54CD\u7A0B\u5EA6\uFF0C\u503C\u8D8A\u5927\u5F71\u54CD\u8D8A\u660E\u663E",
   mediaStorage: "\u5A92\u4F53\u5B58\u50A8\u65B9\u5F0F\uFF1Alocal \u4E3A\u672C\u5730\uFF0Cs3 \u4E3A\u5BF9\u8C61\u5B58\u50A8",
+  s3UploadFailureFallbackMode: "\u4EC5\u5728\u5A92\u4F53\u5B58\u50A8\u65B9\u5F0F\u4E3A s3 \u65F6\u751F\u6548\uFF1AS3 \u4E0A\u4F20\u5931\u8D25\u540E\u56DE\u9000\u5230\u672C\u5730\u5B58\u50A8\uFF0C\u6216\u4FDD\u7559\u539F\u59CB\u94FE\u63A5",
   s3Bucket: "S3 \u5B58\u50A8\u6876\u540D\u79F0",
   s3Region: "S3 \u533A\u57DF",
   s3Endpoint: "S3 Endpoint\uFF0C\u53EF\u7528\u4E8E\u517C\u5BB9 S3 \u7684\u79C1\u6709\u670D\u52A1",
@@ -37377,6 +37569,7 @@ var Config = import_koishi2.Schema.intersect([
   }).description("\u5A92\u4F53\u5904\u7406"),
   import_koishi2.Schema.object({
     mediaStorage: import_koishi2.Schema.union(["local", "s3"]).default("local"),
+    s3UploadFailureFallbackMode: import_koishi2.Schema.union(["local", "original-link"]).default("local"),
     s3Bucket: import_koishi2.Schema.string().default(""),
     s3Region: import_koishi2.Schema.string().default(""),
     s3Endpoint: import_koishi2.Schema.string().default(""),
@@ -37532,7 +37725,9 @@ function apply(ctx, cfg) {
   ctx.command("cave.admin.inspect-media [idRanges:text]").action(
     async ({ session }, idRanges) => await inspectMediaRefsForMigration(ctx, session, cfg, idRanges)
   );
-  ctx.command("cave.admin.backfill-media-urls [idRanges:text]").action(async ({ session }, idRanges) => await backfillCaveMediaUrls(ctx, session, cfg, idRanges));
+  ctx.command("cave.admin.backfill-media-urls [idRanges:text]").action(
+    async ({ session }, idRanges) => await backfillCaveMediaUrls(ctx, session, cfg, idRanges)
+  );
   ctx.command("cave.admin.reindex").action(async ({ session }) => await reindexCaveIds(ctx, session, cfg));
   ctx.command("cave.admin.restore-reindex <backupPath:text>").action(
     async ({ session }, backupPath) => await restoreReindexBackup(ctx, session, cfg, backupPath)

package/lib/utils/media/media-helper.d.ts

@@ -10,6 +10,7 @@ type MaybeMediaElement = {
 interface RewriteHooks {
     onS3Upload?: (type: MediaType, nextRef: string) => Promise<void>;
     onMigrationCommitted?: () => Promise<void>;
+    onRecordProcessed?: (status: 'updated' | 'skipped' | 'failed') => Promise<void>;
 }
 interface MediaSaveProgressState {
     progressMessageIds?: string[];
@@ -22,16 +23,21 @@ interface CaveMediaRefs {
     id: number;
     refs: string[];
 }
+interface InspectCaveMediaRefsResult {
+    failedRecordIds: number[];
+    results: CaveMediaRefs[];
+    scannedRecords: number;
+}
 export declare function processStoredMessageMedia(ctx: Context, content: string, cfg: Config, channelId: string, progressOptions?: MediaSaveProgressOptions): Promise<string>;
 export declare function collectStoredMessageMediaUrls(ctx: Context, content: string): Promise<CaveMediaUrlFields>;
-export declare function inspectCaveMediaRefs(ctx: Context, shouldInclude?: (caveId: number) => boolean): Promise<CaveMediaRefs[]>;
+export declare function inspectCaveMediaRefs(ctx: Context, shouldInclude?: (caveId: number) => boolean): Promise<InspectCaveMediaRefsResult>;
 export declare function saveMedia(ctx: Context, mediaElement: Record<string, unknown>, type: MediaType, cfg: Config, channelId: string, progressOptions?: MediaSaveProgressOptions): Promise<string>;
 export declare function processMediaElement(ctx: Context, element: MaybeMediaElement, cfg: Config, channelId: string, progressOptions?: MediaSaveProgressOptions): Promise<MaybeMediaElement>;
 export declare function messageContainsMedia(content: unknown): Promise<boolean>;
 export declare function resolveMediaElementForSend(ctx: Context, element: MaybeMediaElement, cfg: Config): Promise<MaybeMediaElement>;
 export declare function checkAndCleanMediaFiles(ctx: Context, cfg: Config, type: MediaType): Promise<void>;
 export declare function deleteMediaFilesFromMessage(ctx: Context, content: string, cfg: Config): Promise<void>;
-export declare function migrateLocalMediaToV2(ctx: Context, cfg: Config): Promise<{
+export declare function migrateLocalMediaToV2(ctx: Context, cfg: Config, createHooks?: (caveId: number) => RewriteHooks): Promise<{
     recordsUpdated: number;
     mediaCopied: number;
     mediaMoved: number;
@@ -53,7 +59,7 @@ export declare function migrateLocalMediaToS3(ctx: Context, cfg: Config, keepLoc
     scannedRecords: number;
     failedRecordIds: number[];
 }>;
-export declare function mergeChannelCaves(ctx: Context, cfg: Config, sourceChannelId: string, targetChannelId: string, keepSource: boolean): Promise<{
+export declare function mergeChannelCaves(ctx: Context, cfg: Config, sourceChannelId: string, targetChannelId: string, keepSource: boolean, createHooks?: (caveId: number) => RewriteHooks): Promise<{
     recordsUpdated: number;
     mediaCopied: number;
     mediaMoved: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-echo-cave",
   "description": "Group echo cave",
-  "version": "1.31.0",
+  "version": "1.31.2",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",
@@ -36,7 +36,7 @@
     "koishi": "^4.18.11"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1029.0",
+    "@aws-sdk/client-s3": "^3.1030.0",
     "@aws-sdk/s3-request-presigner": "^3.1030.0",
     "@pynickle/koishi-plugin-adapter-onebot": "^1.0.0",
     "axios": "^1.15.0",