Merge branch 'scr2'

Co-Authored-By: Claude Fable 5.1 <[email protected]>

# Conflicts:
#	CHANGELOG.md
#	apps/server/src/modules/file-manager/routes.ts

packages/contracts/src/organization.ts

@@ -6,6 +6,7 @@ import { MediaEntity, MediaKind } from "./content.ts";
 import { AcquisitionPlan, DownloadStatus, DownloadTask } from "./execution.ts";
 import { ExternalIdentity } from "./identity.ts";
 import { AcquisitionSlot, CandidateEvaluation, SlotStatus } from "./policy.ts";
+import { LibraryScrapeState } from "./scrape.ts";
 
 // 整理域:整理记录(批次)+ 逐文件结果,以及对外开放的整理记录 API 合同(REQ §12.4)
 // 自动与手动整理产生同格式记录;读记录需 organize.read,发起整理需 organize.execute。
@@ -456,81 +457,6 @@ export const LibraryDroppedPlanView = z.object({
 });
 export type LibraryDroppedPlanView = z.infer<typeof LibraryDroppedPlanView>;
 
-/** SCR-1 刮削:一个写入目标(NFO / 图片)的结果;path 为库根内相对路径 */
-export const ScrapeFileResult = z.object({
-  path: z.string(),
-  kind: z.enum(["nfo", "image"]),
-  /** movie_nfo / tvshow_nfo / season_nfo / episode_nfo / poster / fanart / season_poster / episode_thumb */
-  role: z.string(),
-  action: z.enum(["written", "skipped", "failed"]),
-  /** 跳过 / 失败原因码(reasons.ts:scrape_exists / scrape_write_failed / scrape_image_failed …) */
-  reason: z.string().nullable(),
-});
-export type ScrapeFileResult = z.infer<typeof ScrapeFileResult>;
-
-export const ScrapeMode = z.enum(["missing", "overwrite"]);
-export type ScrapeMode = z.infer<typeof ScrapeMode>;
-
-export const ScrapeStatus = z.enum(["queued", "running", "succeeded", "partial", "failed"]);
-export type ScrapeStatus = z.infer<typeof ScrapeStatus>;
-export const ScrapeTrigger = z.enum(["auto", "manual"]);
-export type ScrapeTrigger = z.infer<typeof ScrapeTrigger>;
-
-/** 表 media_scrape 的行(一部作品一行,最近一次刮削) */
-export const MediaScrape = z.object({
-  mediaEntityId: Id,
-  status: ScrapeStatus,
-  trigger: ScrapeTrigger,
-  mode: ScrapeMode,
-  recordId: Id.nullable(),
-  engineRunId: z.string().nullable(),
-  requestedAt: Timestamp,
-  startedAt: Timestamp.nullable(),
-  finishedAt: Timestamp.nullable(),
-  written: NonNegInt,
-  skipped: NonNegInt,
-  failed: NonNegInt,
-  reason: z.string().nullable(),
-  files: z.array(ScrapeFileResult),
-  createdAt: Timestamp,
-  updatedAt: Timestamp,
-});
-export type MediaScrape = z.infer<typeof MediaScrape>;
-
-/** SCR-1 作品刮削状态(最近一次;表 media_scrape) */
-export const LibraryScrapeState = z.object({
-  status: ScrapeStatus,
-  trigger: ScrapeTrigger,
-  mode: ScrapeMode,
-  requestedAt: Timestamp,
-  startedAt: Timestamp.nullable(),
-  finishedAt: Timestamp.nullable(),
-  written: NonNegInt,
-  skipped: NonNegInt,
-  failed: NonNegInt,
-  /** 整体失败原因码(没有文件、没有元数据等) */
-  reason: z.string().nullable(),
-  files: z.array(ScrapeFileResult),
-  /** 触发它的整理记录(入库后自动刮削) */
-  recordId: Id.nullable(),
-  /** 引擎 run id */
-  taskId: z.string().nullable(),
-});
-export type LibraryScrapeState = z.infer<typeof LibraryScrapeState>;
-
-export const LibraryScrapeRequest = z.object({
-  /** 缺省按设置 organize.scrapeMode */
-  mode: ScrapeMode.optional(),
-});
-export type LibraryScrapeRequest = z.infer<typeof LibraryScrapeRequest>;
-export const LibraryScrapeResult = z.object({
-  mediaEntityId: Id,
-  taskId: z.string(),
-  /** 同一作品已有排队中的刮削,直接复用 */
-  deduplicated: z.boolean(),
-});
-export type LibraryScrapeResult = z.infer<typeof LibraryScrapeResult>;
-
 export const LibraryDetail = z.object({
   entity: MediaEntity,
   /** 身份映射状态(含 proposed/conflicted,前端区分展示) */