Fix/动作前端展示下载+后端数据结构+精选的问题 (#117)

原问题 ``` 历史角色动作是一个兼容例外：后端允许它没有 editor_project_resource 资源行，只要布局自身保存了完整图片序列帧。 ``` - 把生成动作的原视频asstetkind改为 video，只把图片序列作为action - db asset新增字段image_sequence_frames_json image_seq_duration_ms等，（原来动作的这些数据存在generation-input中，并不合适）修改了externaljob，把这部分数据正确填写到数据库中。 - 为避免到处fallback,做了数据库迁移, 脚本: `scripts/spacetime-normalize-editor-character-actions.mjs` 手动进行过画布+素材库中动作序列帧+原始视频迁移的测试 - 移除preview_video_path字段, reason: >preview video → separate resource/asset with assetKind="video" final transparent action → assetKind="character-animation" → source_resource_id points to the preview-video resource → image_sequence_frames_json contains the actual playable result > > So preview_video_path on the final action duplicates the source video resource’s image_src. - 移除每个frame的index字段原因: 这个只用于后端内部处理时有一个并发请求, 每个赋一个index方便收集, 后续没有再用到,且与数组本身重复 - 清除副产品preview video的generation_input_json, 因为会影响改造功能, 迁移后预览视频不提供改造(参数), 只有序列帧动作有改造仍存在的共性问题: #134 - 导出: 下载改为完整序列帧, 封面不再作为fallback, 部分帧读取失败时行为:仍生成 ZIP，并记录失败帧, 不变画布放置: before: ![shotmd-1785207959-compressed.webp](/attachments/e56454f0-49a3-4a8a-951f-c21960975f99) after: ![shotmd-1785231365-compressed.webp](/attachments/886f07df-c25b-4ecc-acc9-160e1795a991) 精选模块: 主页展示, 审核部分UI: ![shotmd-1785500046-compressed.webp](/attachments/9ec3b679-0045-494a-9f20-134f7e73fecf) ![shotmd-1785499780-compressed.webp](/attachments/42396e63-5f26-4853-a367-0f3c15111add) 这两处序列帧们的加载设计为惰式的, 只有hover和单独preview才会全部加载 Reviewed-on: http://192.168.35.82/git/GenarrativeAI/Genarrative/pulls/117 Reviewed-by: 段舒康 <kdletters@qq.com> Co-authored-by: 王德宇 <kvtodev@outlook.com> Co-committed-by: 王德宇 <kvtodev@outlook.com>
2026-08-06 16:57:38 +08:00
parent b63923eb04
commit a03f13d0a5
111 changed files with 10825 additions and 1262 deletions
@@ -558,6 +558,7 @@ copy_required_file "${SCRIPT_DIR}/spacetime-export-migration-json.mjs" "${TARGET
 copy_required_file "${SCRIPT_DIR}/spacetime-import-migration-json.mjs" "${TARGET_DIR}/scripts/database-import.mjs" "数据库导入脚本"
 copy_required_file "${SCRIPT_DIR}/spacetime-migration-common.mjs" "${TARGET_DIR}/scripts/spacetime-migration-common.mjs" "数据库迁移公共脚本"
 copy_required_file "${SCRIPT_DIR}/spacetime-maintain-external-generation-jobs.mjs" "${TARGET_DIR}/scripts/spacetime-maintain-external-generation-jobs.mjs" "外部生成任务维护脚本"
+copy_required_file "${SCRIPT_DIR}/spacetime-normalize-editor-character-actions.mjs" "${TARGET_DIR}/scripts/spacetime-normalize-editor-character-actions.mjs" "角色动作元数据规范化脚本"
 copy_required_file "${SCRIPT_DIR}/spacetime-authorize-migration-operator.mjs" "${TARGET_DIR}/scripts/spacetime-authorize-migration-operator.mjs" "数据库迁移授权脚本"
 copy_required_file "${SCRIPT_DIR}/spacetime-revoke-migration-operator.mjs" "${TARGET_DIR}/scripts/spacetime-revoke-migration-operator.mjs" "数据库迁移撤权脚本"
 copy_required_file "${SCRIPT_DIR}/database-backup-to-oss.mjs" "${TARGET_DIR}/scripts/database-backup-to-oss.mjs" "数据库 OSS 备份脚本"
@@ -614,6 +614,21 @@ const checks = [
    includes: 'dry_run: !options.apply',
    reason: '图片画布存量迁移必须默认 dry-run，只有显式 --apply 才写入。',
  },
+  {
+    file: 'scripts/spacetime-normalize-editor-character-actions.mjs',
+    includes: "const SCOPES = ['asset', 'project-resource', 'showcase', 'canvas']",
+    reason: '角色动作规范化必须按固定依赖顺序执行四个 scope。',
+  },
+  {
+    file: 'scripts/spacetime-normalize-editor-character-actions.mjs',
+    includes: 'expectedBatchSha256: dryRun.batch_sha256',
+    reason: '角色动作规范化 apply 必须绑定同批 dry-run 返回的摘要。',
+  },
+  {
+    file: 'scripts/spacetime-normalize-editor-character-actions.mjs',
+    includes: "await scanScopes(options, { verifyZero: true })",
+    reason: '角色动作规范化 apply 后必须执行全量零匹配复核。',
+  },
  {
    file: 'scripts/spacetime-repair-editor-canvas-resources.mjs',
    includes: 'buildProcedureInput(canvas, updatedAtMicros, !options.apply)',
@@ -634,11 +649,21 @@ const checks = [
    includes: 'scripts/spacetime-migrate-editor-canvas-layout.mjs',
    reason: 'Stdb Build 必须归档图片画布存量迁移脚本。',
  },
+  {
+    file: 'jenkins/Jenkinsfile.production-stdb-module-build',
+    includes: 'scripts/spacetime-normalize-editor-character-actions.mjs',
+    reason: 'Stdb Build 必须归档角色动作元数据规范化脚本。',
+  },
  {
    file: 'jenkins/Jenkinsfile.production-stdb-module-publish',
    includes: 'scripts/spacetime-migrate-editor-canvas-layout.mjs',
    reason: 'Stdb Publish 必须从同一上游制品复制图片画布存量迁移脚本。',
  },
+  {
+    file: 'jenkins/Jenkinsfile.production-stdb-module-publish',
+    includes: 'scripts/spacetime-normalize-editor-character-actions.mjs',
+    reason: 'Stdb Publish 必须从同一上游制品复制角色动作元数据规范化脚本。',
+  },
  {
    file: 'jenkins/Jenkinsfile.production-stdb-module-build',
    includes: 'scripts/spacetime-repair-editor-canvas-resources.mjs',
@@ -281,7 +281,7 @@ export async function assertReadableFile(filePath) {

 function normalizeProcedureResult(value, procedureName) {
  if (value && typeof value === 'object' && !Array.isArray(value)) {
-    return value;
+    return normalizeSatsObject(value, procedureName);
  }

  if (Array.isArray(value)) {
@@ -291,7 +291,53 @@ function normalizeProcedureResult(value, procedureName) {
  throw new Error('procedure 返回值不是对象。');
 }

+function normalizeSatsObject(value, procedureName) {
+  const normalized = normalizeSatsValue(value);
+  if (
+    procedureName !==
+      'normalize_editor_character_animation_metadata_and_return' ||
+    !normalized ||
+    typeof normalized !== 'object' ||
+    Array.isArray(normalized)
+  ) {
+    return normalized;
+  }
+
+  const { batch_sha_256: batchSha256, ...result } = normalized;
+  return {
+    ...result,
+    batch_sha256: result.batch_sha256 ?? batchSha256,
+  };
+}
+
 function normalizeSatsProduct(value, procedureName) {
+  if (
+    procedureName === 'normalize_editor_character_animation_metadata_and_return' &&
+    value.length === 19
+  ) {
+    return {
+      ok: normalizeSatsValue(value[0]),
+      scope: normalizeSatsValue(value[1]),
+      dry_run: normalizeSatsValue(value[2]),
+      scanned_count: normalizeSatsValue(value[3]),
+      matched_count: normalizeSatsValue(value[4]),
+      updated_count: normalizeSatsValue(value[5]),
+      backfilled_frames_count: normalizeSatsValue(value[6]),
+      backfilled_duration_count: normalizeSatsValue(value[7]),
+      reclassified_preview_count: normalizeSatsValue(value[8]),
+      cleaned_generation_inputs_count: normalizeSatsValue(value[9]),
+      cleaned_frame_index_count: normalizeSatsValue(value[10]),
+      cleaned_canvas_layer_count: normalizeSatsValue(value[11]),
+      materialized_resource_count: normalizeSatsValue(value[12]),
+      blocker_count: normalizeSatsValue(value[13]),
+      blocker_ids: normalizeSatsValue(value[14]),
+      next_cursor: normalizeSatsOption(value[15]),
+      has_more: normalizeSatsValue(value[16]),
+      batch_sha256: normalizeSatsValue(value[17]),
+      error_message: normalizeSatsOption(value[18]),
+    };
+  }
+
  if (
    procedureName === 'repair_editor_canvas_resources_and_return' &&
    value.length === 3
@@ -99,4 +99,79 @@ describe('SpacetimeDB CLI SATS option encoding', () => {
      error_message: null,
    });
  });
+
+  it('normalizes character action metadata normalization results', () => {
+    const result = parseProcedureResult(
+      JSON.stringify([
+        true,
+        'asset',
+        true,
+        25,
+        3,
+        0,
+        2,
+        1,
+        0,
+        3,
+        2,
+        0,
+        0,
+        1,
+        ['asset-blocked'],
+        [0, 'asset-25'],
+        true,
+        'a'.repeat(64),
+        [1],
+      ]),
+      'normalize_editor_character_animation_metadata_and_return',
+    );
+
+    expect(result).toEqual({
+      ok: true,
+      scope: 'asset',
+      dry_run: true,
+      scanned_count: 25,
+      matched_count: 3,
+      updated_count: 0,
+      backfilled_frames_count: 2,
+      backfilled_duration_count: 1,
+      reclassified_preview_count: 0,
+      cleaned_generation_inputs_count: 3,
+      cleaned_frame_index_count: 2,
+      cleaned_canvas_layer_count: 0,
+      materialized_resource_count: 0,
+      blocker_count: 1,
+      blocker_ids: ['asset-blocked'],
+      next_cursor: 'asset-25',
+      has_more: true,
+      batch_sha256: 'a'.repeat(64),
+      error_message: null,
+    });
+  });
+
+  it('normalizes object-shaped character action procedure results', () => {
+    const result = parseProcedureResult(
+      JSON.stringify({
+        ok: true,
+        scope: 'asset',
+        dry_run: true,
+        scanned_count: 25,
+        matched_count: 3,
+        updated_count: 0,
+        blocker_count: 0,
+        blocker_ids: [],
+        next_cursor: 'asset-25',
+        has_more: true,
+        batch_sha_256: 'b'.repeat(64),
+        error_message: null,
+      }),
+      'normalize_editor_character_animation_metadata_and_return',
+    );
+
+    expect(result).toMatchObject({
+      batch_sha256: 'b'.repeat(64),
+      next_cursor: 'asset-25',
+    });
+    expect(result).not.toHaveProperty('batch_sha_256');
+  });
 });
@@ -0,0 +1,253 @@
+#!/usr/bin/env node
+
+import { pathToFileURL } from 'node:url';
+
+import {
+  callSpacetimeProcedure,
+  callSpacetimeProcedureViaCli,
+  encodeSpacetimeCliOption,
+  ensureProcedureOk,
+  parsePositiveInteger,
+} from './spacetime-migration-common.mjs';
+
+const PROCEDURE_NAME = 'normalize_editor_character_animation_metadata_and_return';
+const SCOPES = ['asset', 'project-resource', 'showcase', 'canvas'];
+const DEFAULT_CHUNK_SIZE = 25;
+const CANVAS_MAX_CHUNK_SIZE = 5;
+const SHA256_PATTERN = /^[0-9a-f]{64}$/u;
+
+function usage() {
+  return `用法：
+  node scripts/spacetime-normalize-editor-character-actions.mjs \\
+    --database <name> --server <name-or-url> [--chunk-size <1-25>] [--apply]
+
+默认按 asset、project-resource、showcase、canvas 的固定顺序执行全量 dry-run，不修改数据。
+追加 --apply 后，每批仍会先 dry-run；只有 blocker 为零，才携带该批返回的 SHA-256 立即 apply。
+apply 完成后脚本会再次从头 dry-run，要求四个 scope 的 matched/blocker 均为零。
+必须使用已授权 database migration operator 的 spacetime CLI 登录态，并显式指定 server。`;
+}
+
+export function parseOptions(argv, env = process.env) {
+  const options = {
+    apply: false,
+    chunkSize: DEFAULT_CHUNK_SIZE,
+    database: env.GENARRATIVE_SPACETIME_DATABASE || '',
+    passthrough: [],
+    server: env.GENARRATIVE_SPACETIME_SERVER || '',
+    serverUrl: env.GENARRATIVE_SPACETIME_SERVER_URL || '',
+    token: env.GENARRATIVE_SPACETIME_TOKEN || '',
+    useHttp: false,
+  };
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index];
+    const readValue = () => {
+      const value = argv[index + 1];
+      if (!value || value.startsWith('--')) {
+        throw new Error(`${arg} 缺少参数值。`);
+      }
+      index += 1;
+      return value.trim();
+    };
+    if (arg === '--database') {
+      options.database = readValue();
+    } else if (arg === '--server') {
+      options.server = readValue();
+    } else if (arg === '--server-url') {
+      options.serverUrl = readValue();
+    } else if (arg === '--token') {
+      options.token = readValue();
+    } else if (arg === '--chunk-size') {
+      options.chunkSize = parsePositiveInteger(readValue(), arg);
+    } else if (arg === '--apply') {
+      options.apply = true;
+    } else if (arg === '--use-http') {
+      options.useHttp = true;
+    } else if (arg === '--no-config' || arg === '--anonymous') {
+      options.passthrough.push(arg);
+    } else if (arg === '--help' || arg === '-h') {
+      options.help = true;
+    } else {
+      throw new Error(`未知参数: ${arg}`);
+    }
+  }
+  if (options.chunkSize > DEFAULT_CHUNK_SIZE) {
+    throw new Error(`--chunk-size 不能超过 ${DEFAULT_CHUNK_SIZE}。`);
+  }
+  return options;
+}
+
+export function buildNormalizationInput({
+  scope,
+  cursor = null,
+  limit,
+  dryRun,
+  expectedBatchSha256 = null,
+}) {
+  if (!SCOPES.includes(scope)) {
+    throw new Error(`未知角色动作规范化 scope: ${scope}`);
+  }
+  if (!Number.isInteger(limit) || limit < 1) {
+    throw new Error('角色动作规范化 limit 必须是正整数。');
+  }
+  if (scope === 'canvas' && limit > CANVAS_MAX_CHUNK_SIZE) {
+    throw new Error(`canvas scope limit 不能超过 ${CANVAS_MAX_CHUNK_SIZE}。`);
+  }
+  if (!dryRun && !SHA256_PATTERN.test(expectedBatchSha256 || '')) {
+    throw new Error('apply 必须绑定 dry-run 返回的 64 位 batch SHA-256。');
+  }
+  return {
+    scope,
+    cursor: encodeSpacetimeCliOption(cursor),
+    limit,
+    dry_run: dryRun,
+    expected_batch_sha_256: encodeSpacetimeCliOption(
+      dryRun ? null : expectedBatchSha256,
+    ),
+  };
+}
+
+function scopeLimit(scope, chunkSize) {
+  return scope === 'canvas'
+    ? Math.min(chunkSize, CANVAS_MAX_CHUNK_SIZE)
+    : chunkSize;
+}
+
+function assertSafeBatch(result, scope) {
+  ensureProcedureOk(result);
+  if (result.scope !== scope) {
+    throw new Error(`procedure 返回 scope ${result.scope}，预期为 ${scope}。`);
+  }
+  if (result.blocker_count !== 0 || result.blocker_ids.length !== 0) {
+    throw new Error(
+      `${scope} scope 存在 ${result.blocker_count} 个 blocker：${result.blocker_ids.join(', ')}`,
+    );
+  }
+  if (!SHA256_PATTERN.test(result.batch_sha256 || '')) {
+    throw new Error(`${scope} scope 未返回有效的 batch SHA-256。`);
+  }
+}
+
+async function callBatch(options, input) {
+  return options.useHttp
+    ? callSpacetimeProcedure(options, PROCEDURE_NAME, input)
+    : callSpacetimeProcedureViaCli(options, PROCEDURE_NAME, input);
+}
+
+export async function scanScopes(
+  options,
+  { apply = false, verifyZero = false, callProcedure = callBatch } = {},
+) {
+  const summaries = [];
+  for (const scope of SCOPES) {
+    let cursor = null;
+    const seenCursors = new Set();
+    const summary = {
+      scope,
+      scanned_count: 0,
+      matched_count: 0,
+      updated_count: 0,
+      batches: 0,
+    };
+    do {
+      const limit = scopeLimit(scope, options.chunkSize);
+      const dryRun = await callProcedure(
+        options,
+        buildNormalizationInput({ scope, cursor, limit, dryRun: true }),
+      );
+      assertSafeBatch(dryRun, scope);
+      summary.scanned_count += dryRun.scanned_count;
+      summary.matched_count += dryRun.matched_count;
+      summary.batches += 1;
+
+      if (verifyZero && dryRun.matched_count !== 0) {
+        throw new Error(
+          `${scope} scope apply 后复核仍有 ${dryRun.matched_count} 行待规范化。`,
+        );
+      }
+      if (apply && dryRun.matched_count > 0) {
+        const applied = await callProcedure(
+          options,
+          buildNormalizationInput({
+            scope,
+            cursor,
+            limit,
+            dryRun: false,
+            expectedBatchSha256: dryRun.batch_sha256,
+          }),
+        );
+        assertSafeBatch(applied, scope);
+        if (applied.batch_sha256 !== dryRun.batch_sha256) {
+          throw new Error(`${scope} scope apply 返回的 batch SHA-256 与 dry-run 不一致。`);
+        }
+        if (applied.updated_count !== dryRun.matched_count) {
+          throw new Error(
+            `${scope} scope apply 更新 ${applied.updated_count} 行，dry-run 匹配 ${dryRun.matched_count} 行。`,
+          );
+        }
+        summary.updated_count += applied.updated_count;
+      }
+      const nextCursor = dryRun.has_more ? dryRun.next_cursor : null;
+      if (dryRun.has_more && !nextCursor) {
+        throw new Error(`${scope} scope 声明 has_more 但未返回 next_cursor。`);
+      }
+      if (nextCursor && seenCursors.has(nextCursor)) {
+        throw new Error(`${scope} scope 返回了重复的 next_cursor: ${nextCursor}。`);
+      }
+      if (nextCursor) {
+        seenCursors.add(nextCursor);
+      }
+      cursor = nextCursor;
+    } while (cursor);
+    summaries.push(summary);
+  }
+  return summaries;
+}
+
+export async function main(argv = process.argv.slice(2)) {
+  const options = parseOptions(argv);
+  if (options.help) {
+    console.log(usage());
+    return;
+  }
+  if (!options.database) {
+    throw new Error('必须显式传入 --database。');
+  }
+  if (!options.server && !options.serverUrl) {
+    throw new Error('必须显式传入 --server / --server-url，不使用默认 cloud target。');
+  }
+  if (options.useHttp && !options.token) {
+    throw new Error('--use-http 需要通过 --token 或 GENARRATIVE_SPACETIME_TOKEN 提供身份。');
+  }
+
+  const migration = await scanScopes(options, { apply: options.apply });
+  const verification = options.apply
+    ? await scanScopes(options, { verifyZero: true })
+    : null;
+  console.log(
+    JSON.stringify(
+      {
+        procedure: PROCEDURE_NAME,
+        applied: options.apply,
+        scope_order: SCOPES,
+        migration,
+        verification,
+      },
+      null,
+      2,
+    ),
+  );
+  if (!options.apply) {
+    console.log('全量 dry-run 已通过；确认输出后追加 --apply 重跑。');
+  }
+}
+
+if (import.meta.url === pathToFileURL(process.argv[1] || '').href) {
+  main().catch((error) => {
+    console.error(
+      `[spacetime:editor-character-actions:normalize] ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
+    process.exitCode = 1;
+  });
+}
@@ -0,0 +1,190 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildNormalizationInput,
+  parseOptions,
+  scanScopes,
+} from './spacetime-normalize-editor-character-actions.mjs';
+
+describe('角色动作元数据规范化脚本', () => {
+  it('默认 dry-run 并要求调用方显式选择 apply', () => {
+    expect(
+      parseOptions(
+        ['--database', 'genarrative-prod', '--server', 'prod'],
+        {},
+      ),
+    ).toMatchObject({
+      apply: false,
+      chunkSize: 25,
+      database: 'genarrative-prod',
+      server: 'prod',
+    });
+  });
+
+  it('支持使用环境 token 的 HTTP 调用模式', () => {
+    expect(
+      parseOptions(
+        [
+          '--database',
+          'genarrative-dev',
+          '--server-url',
+          'http://127.0.0.1:3101',
+          '--use-http',
+        ],
+        { GENARRATIVE_SPACETIME_TOKEN: 'dev-migration-token' },
+      ),
+    ).toMatchObject({
+      database: 'genarrative-dev',
+      serverUrl: 'http://127.0.0.1:3101',
+      token: 'dev-migration-token',
+      useHttp: true,
+    });
+  });
+
+  it('编码 dry-run cursor 并禁止 canvas 超过五行', () => {
+    expect(
+      buildNormalizationInput({
+        scope: 'asset',
+        cursor: 'asset-25',
+        limit: 25,
+        dryRun: true,
+      }),
+    ).toEqual({
+      scope: 'asset',
+      cursor: [0, 'asset-25'],
+      limit: 25,
+      dry_run: true,
+      expected_batch_sha_256: null,
+    });
+    expect(() =>
+      buildNormalizationInput({
+        scope: 'canvas',
+        limit: 6,
+        dryRun: true,
+      }),
+    ).toThrow('canvas scope limit');
+  });
+
+  it('apply 必须绑定 dry-run 返回的批次哈希', () => {
+    expect(() =>
+      buildNormalizationInput({
+        scope: 'showcase',
+        limit: 25,
+        dryRun: false,
+      }),
+    ).toThrow('batch SHA-256');
+
+    expect(
+      buildNormalizationInput({
+        scope: 'showcase',
+        cursor: null,
+        limit: 25,
+        dryRun: false,
+        expectedBatchSha256: 'a'.repeat(64),
+      }),
+    ).toEqual({
+      scope: 'showcase',
+      cursor: null,
+      limit: 25,
+      dry_run: false,
+      expected_batch_sha_256: [0, 'a'.repeat(64)],
+    });
+  });
+
+  it('按固定 scope 顺序为每批执行 hash 绑定的 dry-run 与 apply', async () => {
+    const calls: Array<Record<string, unknown>> = [];
+    const callProcedure = async (
+      _options: Record<string, unknown>,
+      input: Record<string, unknown>,
+    ) => {
+      calls.push(input);
+      const dryRun = input.dry_run === true;
+      const scope = String(input.scope);
+      const hashDigit = {
+        asset: 'a',
+        'project-resource': 'b',
+        showcase: 'c',
+        canvas: 'd',
+      }[scope]!;
+      const batchSha256 = hashDigit.repeat(64);
+      return {
+        ok: true,
+        scope,
+        dry_run: dryRun,
+        scanned_count: 1,
+        matched_count: 1,
+        updated_count: dryRun ? 0 : 1,
+        blocker_count: 0,
+        blocker_ids: [],
+        next_cursor: null,
+        has_more: false,
+        batch_sha256: batchSha256,
+        error_message: null,
+      };
+    };
+
+    const summaries = await scanScopes(
+      { chunkSize: 25 },
+      { apply: true, callProcedure },
+    );
+
+    expect(summaries.map((summary) => summary.scope)).toEqual([
+      'asset',
+      'project-resource',
+      'showcase',
+      'canvas',
+    ]);
+    expect(calls.map((call) => `${call.scope}:${call.dry_run}`)).toEqual([
+      'asset:true',
+      'asset:false',
+      'project-resource:true',
+      'project-resource:false',
+      'showcase:true',
+      'showcase:false',
+      'canvas:true',
+      'canvas:false',
+    ]);
+    for (let index = 1; index < calls.length; index += 2) {
+      const apply = calls[index]!;
+      const scope = String(apply.scope);
+      const hashDigit = {
+        asset: 'a',
+        'project-resource': 'b',
+        showcase: 'c',
+        canvas: 'd',
+      }[scope]!;
+      expect(apply.expected_batch_sha_256).toEqual([
+        0,
+        hashDigit.repeat(64),
+      ]);
+    }
+    expect(calls.at(-2)?.limit).toBe(5);
+  });
+
+  it('拒绝 procedure 返回已访问过的 cursor', async () => {
+    let callCount = 0;
+    const callProcedure = async () => {
+      callCount += 1;
+      const nextCursor = ['asset-25', 'asset-50', 'asset-25'][callCount - 1];
+      return {
+        ok: true,
+        scope: 'asset',
+        dry_run: true,
+        scanned_count: 1,
+        matched_count: 0,
+        updated_count: 0,
+        blocker_count: 0,
+        blocker_ids: [],
+        next_cursor: nextCursor,
+        has_more: true,
+        batch_sha256: 'a'.repeat(64),
+        error_message: null,
+      };
+    };
+
+    await expect(
+      scanScopes({ chunkSize: 25 }, { callProcedure }),
+    ).rejects.toThrow('重复的 next_cursor: asset-25');
+    expect(callCount).toBe(3);
+  });
+});
@@ -1,6 +1,7 @@
 #!/usr/bin/env node

 import {
+  callSpacetimeProcedure,
  callSpacetimeProcedureViaCli,
  ensureProcedureOk,
  parseArgs,
@@ -15,11 +16,20 @@ try {
  const input = {
    operator_identity_hex: options.operatorIdentity,
  };
-  const result = await callSpacetimeProcedureViaCli(
-    options,
-    'revoke_database_migration_operator',
-    input,
-  );
+  if (options.useHttp && !options.token) {
+    throw new Error('--use-http 需要同时传入 --token。');
+  }
+  const result = options.useHttp
+    ? await callSpacetimeProcedure(
+        options,
+        'revoke_database_migration_operator',
+        input,
+      )
+    : await callSpacetimeProcedureViaCli(
+        options,
+        'revoke_database_migration_operator',
+        input,
+      );
  ensureProcedureOk(result);

  console.log(