feat: v0.3.8–v0.3.14 工作区汇总（依赖升级、整理来源、手动入库、原地入库等）
生产 v0.3.8～v0.3.13 均由 8013196 加工作区修改构建部署，此前未提交；本提交补齐源码，
并含未部署的 v0.3.14 原地入库。中间各版本源码状态未保存，无法逐版拆分，详见
docs/plan/17-full-upgrade.md 与 docs/plan/18-organize-release.md。
- v0.3.8 全面升级：Deno workspace 依赖、Router 8 / Vite 8、camofox 1.18.0 / Node 24、
PostgreSQL 18.6、备份客户端 18.6、演示 qB 5.2.4
- v0.3.9 媒体整理：分类规则、整理来源与目录快照（0059）、文件管理整理入口
- v0.3.10 手动下载与入库：独立手动下载、详情页资源下载、TMDB / Local 元数据兜底
（metadata.resolve_organize）、正常多版本 / 一次性洗版（0060）
- v0.3.11 搜索详情与桌面黑边修复
- v0.3.12 列表分页、搜索历史、首页概况
- v0.3.13 统一整理弹窗与队列
- v0.3.14 原地入库（0061，未部署）
同批审计修复：
- 刮削入队：确认原记录存在后才删重放产生的新记录；写回 run 关联失败时保持 queued，
由处理器补关联（对齐 MP 先登记、只在入队失败时记失败）
- 识别升级链只在结果更确定时采用，不再用 no_match 顶替原有歧义候选
- bluray_dir 资产以原盘目录本身为刮削根（MP 同做法）
- metadata.resolve_organize 登记到入库排障 Skill 与能力地图
- db/src/types.ts 按迁移重新生成；contracts 整理动作枚举顺序与数据库对齐
- 测试：原地入库用例改为直接查记录表；domain 测试模板补 version
- 前端：通知铃铛弹层与用户菜单统一样式；站点卡片共用卡头、底栏贴底、分页间距
依赖升级证据只提交摘要文件，registry-snapshot.json 移至 .local/（SHA-256 记于文档）。
Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
rootandClaude Opus 5.5 committed
1 parent
8013196e3f
commit
ceb66f8c77
265 files changed
+17751
-2483
No files matched your search
@@ -4,12 +4,12 @@ import {
|
||||
Api,
|
||||
CAPABILITY_CATALOG,
|
||||
type CapabilityDescriptor,
|
||||
type DownloadPlanOutput,
|
||||
type KnownCapabilityId,
|
||||
} from "@umt/contracts";
|
||||
import { type AgentRunRow, sql } from "@umt/db";
|
||||
import { hasScope } from "../../http/auth.ts";
|
||||
import { ApiException } from "../../http/errors.ts";
|
||||
import { planManualAcquisition } from "../acquisition-organize/services/manual-acquisition.ts";
|
||||
import type { ModuleApp, ServerContext } from "../types.ts";
|
||||
import { planBinding } from "./authorize.ts";
|
||||
import { cancelTask, retryTask, taskToApi } from "./capabilities.ts";
|
||||
@@ -426,73 +426,48 @@ export function registerAgentRoutes(
|
||||
}
|
||||
});
|
||||
|
||||
// ── 手动提交下载:同一条 download.plan → download.submit 能力路径(授权/审计/幂等与 Agent 一致)──
|
||||
// 手动资源选择不依赖订阅，提交后仍走共同下载及整理任务。
|
||||
route(app, Api.acquisitionPlans.create, async ({ body, actorId, c }) => {
|
||||
const rel = await db()
|
||||
.selectFrom("source_release")
|
||||
.select(["id", "media_entity_id"])
|
||||
.select("media_entity_id")
|
||||
.where("id", "=", body.sourceReleaseId)
|
||||
.executeTakeFirst();
|
||||
if (!rel) throw new ApiException("not_found", "资源不存在");
|
||||
let slotIds: string[];
|
||||
if (body.slotId) {
|
||||
const s = await db().selectFrom("acquisition_slot").select("id").where("id", "=", body.slotId).executeTakeFirst();
|
||||
if (!s) throw new ApiException("not_found", "收录版本不存在");
|
||||
slotIds = [s.id];
|
||||
} else {
|
||||
const entityId = body.entityId ?? rel.media_entity_id;
|
||||
if (!entityId)
|
||||
throw new ApiException("precondition_failed", "资源还没有关联本地作品，先在「身份与元数据」指定作品");
|
||||
slotIds = (
|
||||
await db()
|
||||
.selectFrom("acquisition_slot")
|
||||
.select("id")
|
||||
.where("media_entity_id", "=", entityId)
|
||||
.orderBy("created_at")
|
||||
.execute()
|
||||
).map((r) => r.id);
|
||||
}
|
||||
const rejected: { slotId: string | null; code: string; message: string }[] = [];
|
||||
if (slotIds.length === 0)
|
||||
rejected.push({ slotId: null, code: "no_slot", message: "这个作品没有收录版本，先在订阅里新建" });
|
||||
const invokeCtx = {
|
||||
actorId,
|
||||
taskId: `http:${c.get("requestId") ?? "req"}`,
|
||||
scopeIds: [],
|
||||
signal: c.req.raw.signal,
|
||||
source: "web" as const,
|
||||
};
|
||||
try {
|
||||
for (const slotId of slotIds) {
|
||||
const out = (await ctx.capabilities.invoke(
|
||||
"download.plan",
|
||||
{ slotId, sourceReleaseId: rel.id },
|
||||
invokeCtx,
|
||||
)) as DownloadPlanOutput;
|
||||
if (!out.plan) {
|
||||
for (const r of out.rejected) rejected.push({ slotId, ...r });
|
||||
continue;
|
||||
}
|
||||
const sub = (await ctx.capabilities.invoke("download.submit", { planId: out.plan.id }, invokeCtx)) as {
|
||||
taskId: string;
|
||||
};
|
||||
const plan = await db()
|
||||
.selectFrom("acquisition_plan")
|
||||
.selectAll()
|
||||
.where("id", "=", out.plan.id)
|
||||
.executeTakeFirstOrThrow();
|
||||
await audit(ctx, actorId, "acquisition_plan.manual_submit", plan.id, {
|
||||
sourceReleaseId: rel.id,
|
||||
slotId,
|
||||
taskId: sub.taskId,
|
||||
note: body.note ?? null,
|
||||
});
|
||||
return { submitted: true, plan: camel(plan), slotId, taskId: sub.taskId, rejected };
|
||||
if (
|
||||
rel &&
|
||||
!rel.media_entity_id &&
|
||||
!body.entityId &&
|
||||
!body.allowUnrecognized &&
|
||||
ctx.capabilities.get("identity.resolve")
|
||||
) {
|
||||
try {
|
||||
await ctx.capabilities.invoke(
|
||||
"identity.resolve",
|
||||
{ sourceReleaseId: body.sourceReleaseId },
|
||||
{
|
||||
actorId,
|
||||
taskId: `http:${c.get("requestId") ?? "req"}`,
|
||||
scopeIds: [],
|
||||
signal: c.req.raw.signal,
|
||||
source: "web",
|
||||
},
|
||||
);
|
||||
} catch (err) {
|
||||
ctx.logger.warn(
|
||||
{ sourceReleaseId: body.sourceReleaseId, error: err instanceof Error ? err.message : String(err) },
|
||||
"手动下载识别未完成，允许确认后下载",
|
||||
);
|
||||
}
|
||||
} catch (err) {
|
||||
capabilityHttpError(err);
|
||||
}
|
||||
return { submitted: false, plan: null, slotId: null, taskId: null, rejected };
|
||||
const result = await planManualAcquisition(ctx, body);
|
||||
if (result.plan)
|
||||
await audit(ctx, actorId, "acquisition_plan.manual_submit", result.plan.id, {
|
||||
sourceReleaseId: body.sourceReleaseId,
|
||||
taskId: result.taskId,
|
||||
importMode: body.importMode,
|
||||
note: body.note ?? null,
|
||||
});
|
||||
return result;
|
||||
});
|
||||
|
||||
// ── 产物(整理计划 / 汇报 / 证据):只读 ──
|
||||
|
||||
Reference in new issue
Block a user