🐛 Preserve parked drafts and round-scoped review focus

This commit is contained in:
d-robotics 2026-10-20 12:06:48 +08:00
parent 630a95c843
commit d10c148b21
16 changed files with 626 additions and 45 deletions

View File

@ -5,6 +5,7 @@ import { reviewShortcut, reviewShortcutHelp } from "../lib/review-shortcuts.js";
import type { ReviewViewingProps, ReviewViewingController, ReviewPosition, ReviewNavigation } from "./review-viewing";
import { ReviewCaptionDetails, type ReviewCaption } from "./ReviewCaptions";
import { reviewCaptionAtTime } from "../lib/review-captions.js";
import { sliceEditActionsWithDrafts, workbenchDraftsFingerprint } from "../lib/annotation-autosave.js";
import { DiscardReasonFields, type DiscardReasonChoice } from "./DiscardReasonFields";
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
import { cancelActionPartition, lastActionFrame, moveActionBoundary } from "../lib/action-frame-boundary.js";
@ -111,6 +112,8 @@ type SliceEditPanelState = {
sliceId: string;
pendingSlices: SliceSegment[];
snapshot: { slices: SliceSegment[]; actions: AnnotationSegment[] };
baseSnapshot: { slices: SliceSegment[]; actions: AnnotationSegment[] };
draftsFingerprint: string;
focusBoundary: "start" | "end";
};
type EndSelection = { id: string; start: number; end: number; limit: number; confirmed: boolean; isNew: boolean };
@ -1357,7 +1360,13 @@ export function CaptureAnnotationWorkbench({
actionId: displayedAction?.id ?? null,
})
: [];
const [reworkFocus, setReworkFocus] = useState<{ opinionId: string; seq: number } | null>(null);
const [reworkFocus, setReworkFocus] = useState<{ opinionId: string; round: number; seq: number } | null>(null);
useEffect(() => {
if (!focusedLayout && reworkFocus)
workbenchRef.current
?.querySelector<HTMLElement>('[data-testid="rework-slice-opinions"] [data-rework-focus="true"]')
?.scrollIntoView({ block: "nearest" });
}, [focusedLayout, reworkFocus?.opinionId, reworkFocus?.round, reworkFocus?.seq]);
const reworkJumpIndexRef = useRef(-1);
const jumpReworkProblem = (direction: 1 | -1) => {
const order = reworkEmphasis?.jumpOrder || [];
@ -1365,7 +1374,7 @@ export function CaptureAnnotationWorkbench({
const count = order.length;
reworkJumpIndexRef.current = (((reworkJumpIndexRef.current + direction) % count) + count) % count;
const target = order[reworkJumpIndexRef.current];
setReworkFocus({ opinionId: target.opinion.id, seq: (reworkFocus?.seq || 0) + 1 });
setReworkFocus({ opinionId: target.opinion.id, round: target.opinion.round, seq: (reworkFocus?.seq || 0) + 1 });
// I1:跨片跳到锚定动作的意见时镜像点击路径,自动打开该动作编辑器;
// 同片仍只 seek 不重开面板(现状保持)。决策规则见 reworkLocatePlan。
executeReworkLocatePlan(
@ -1388,7 +1397,7 @@ export function CaptureAnnotationWorkbench({
return overlapping?.id || null;
};
const locateReworkOpinion = (opinion: ReworkOpinionView) => {
setReworkFocus({ opinionId: opinion.id, seq: (reworkFocus?.seq || 0) + 1 });
setReworkFocus({ opinionId: opinion.id, round: opinion.round, seq: (reworkFocus?.seq || 0) + 1 });
// 点击路径与 J/K 跳转共用 reworkLocatePlan:跨片锚定动作同样自动打开
// 编辑器(I1 对齐),同片点击仍走 seekAnnotation 点开动作(既有行为)。
executeReworkLocatePlan(
@ -1612,8 +1621,18 @@ export function CaptureAnnotationWorkbench({
// 到最初打开前);工作区已变则作废旧预览按现状新开(与 Enter 外部改动守卫同
// 一口径——旧预览应用必然被拦,不静默丢,Esc 前改动一直可见可回退)。
const stash =
sliceEditPanelStash && !workspaceDiffersFromSnapshot(sliceEditPanelStash.snapshot) ? sliceEditPanelStash : null;
const snapshot = stash ? stash.snapshot : snapshotSliceEditWorkspace({ slices, actions: segments });
sliceEditPanelStash &&
!workspaceDiffersFromSnapshot(sliceEditPanelStash.baseSnapshot) &&
sliceEditPanelStash.draftsFingerprint === workbenchDraftsFingerprint(outstandingDrafts)
? sliceEditPanelStash
: null;
const baseSnapshot = stash ? stash.baseSnapshot : snapshotSliceEditWorkspace({ slices, actions: segments });
const snapshot = stash
? stash.snapshot
: snapshotSliceEditWorkspace({
slices,
actions: continuousActions ? sliceEditActionsWithDrafts(segments, outstandingDrafts).actions : segments,
});
const pendingSlices = stash ? stash.pendingSlices : restoreSliceEditWorkspace(snapshot).slices;
setSliceEditPanelStash(null);
// 目标片已被预览合并掉时保留预览内的目标(面板渲染 pendingSlices,sliceId
@ -1623,6 +1642,8 @@ export function CaptureAnnotationWorkbench({
sliceId,
pendingSlices,
snapshot,
baseSnapshot,
draftsFingerprint: workbenchDraftsFingerprint(outstandingDrafts),
focusBoundary: sliceEditFocusBoundaryFor(pendingSlices, sliceId),
});
setSliceEditConflictList(null);
@ -1791,6 +1812,9 @@ export function CaptureAnnotationWorkbench({
resolution.actions as AnnotationSegment[],
panel.sliceId,
);
} catch (cause) {
setError(userErrorMessage(cause) || "切片改动保存失败,草稿和预览已保留,请核对后重试。");
return;
} finally {
sliceEditApplyingRef.current = false;
}
@ -1798,6 +1822,13 @@ export function CaptureAnnotationWorkbench({
setError("当前状态暂不能应用切片改动,请稍后重试,或按 Esc 取消。");
return;
}
// Only clear editors after the shared slice/draft transaction is confirmed.
// Leaving stale parked editors would let the next autosave overwrite the
// conflict resolver's adjusted boundaries with pre-edit ranges.
setEditingAnnotation(null);
setParkedEditors({});
setEndSelection(null);
onDraftsChange?.([]);
// 应用成功:面板与 D6 驻留一并清空(预览已落库,旧快照无回退意义)。
setSliceEditPanel(null);
setSliceEditPanelStash(null);
@ -1815,17 +1846,16 @@ export function CaptureAnnotationWorkbench({
setError("请先保存或取消当前描述,再应用切片改动。");
return;
}
if (outstandingDrafts.length) {
setError("请先保存或取消未保存的描述草稿,再应用切片改动。");
return;
}
// 面板期间外部改动守卫:快照经 snapshotSliceEditWorkspace 深拷贝(Esc 幂等回退
// 依赖拷贝语义),引用比较恒不相等曾使 Enter 一律被拒(验收实测「面板期间工作
// 区发生了其它修改」);改按值比较(与预览一致性检查、D6 驻留重开同一口径
// workspaceDiffersFromSnapshot),真正的外部改动(其他页面/服务器侧改写)仍被拦下。
const byStart = <T extends { start: number }>(list: T[]) =>
[...list].sort((left, right) => left.start - right.start);
if (workspaceDiffersFromSnapshot(panel.snapshot)) {
if (
workspaceDiffersFromSnapshot(panel.baseSnapshot) ||
panel.draftsFingerprint !== workbenchDraftsFingerprint(outstandingDrafts)
) {
setError("面板期间工作区发生了其它修改,请按 Esc 取消后重试。");
return;
}
@ -1840,6 +1870,12 @@ export function CaptureAnnotationWorkbench({
focusWorkbench();
return;
}
if (sliceEditActionsWithDrafts(segments, outstandingDrafts).unresolved.length) {
setError("仍有描述尚未确认结束点,请定位草稿完成区间后继续;切片预览会保留。");
stageEnterReleasedRef.current = true;
setStageConfirmation("drafts");
return;
}
const scan = scanSliceEditConflicts({
baseSlices: panel.snapshot.slices,
pendingSlices: panel.pendingSlices,
@ -3433,7 +3469,8 @@ export function CaptureAnnotationWorkbench({
className="block w-full rounded border p-3 text-left text-sm"
onClick={() => {
closeStageConfirmation();
if (slice) selectSlice(slice);
if (sliceEditPanel) collapseSliceEditPanelForNavigation();
if (slice) selectSlice(slice, slice.start, false, { bypassSliceEditLock: true });
}}
>
{slice?.name || draft.sliceId} · {draft.selectingEnd ? "尚未确认结束点" : "描述尚未保存"}
@ -4038,13 +4075,29 @@ export function CaptureAnnotationWorkbench({
)}
</div>
)}
{reviewCaption?.text && (
{reviewCaption && (
<p
className="workbench-review-caption"
aria-label="审查字幕"
data-caption-kind={reviewCaption.kind}
data-caption-slice-id={reviewCaption.sliceId}
>
{reviewCaption.text}
<strong className="capture-caption-kind">
{reviewCaption.kind === "blank"
? "语义留空"
: reviewCaption.kind === "invalid"
? "无效区间"
: reviewCaption.kind === "discarded"
? "舍弃切片"
: "动作描述"}
:
</strong>
{reviewCaption.text ||
(reviewCaption.kind === "loading"
? "正在读取动作证据…"
: reviewCaption.kind === "error"
? "动作证据读取失败,请重试"
: "当前时刻没有动作记录")}
</p>
)}
{(reworkSubtitleRowList.length > 0 || reviewReworkSubtitleRowList.length > 0) && (
@ -4334,7 +4387,10 @@ export function CaptureAnnotationWorkbench({
{[...reworkEmphasis.task.red, ...reworkEmphasis.task.skipped].map((opinion) => (
<li
key={opinion.id}
data-rework-focus={reworkFocus?.opinionId === opinion.id || undefined}
data-rework-focus={
(reworkFocus?.opinionId === opinion.id && reworkFocus.round === opinion.round) ||
undefined
}
className={cn(
"flex flex-wrap items-center gap-2 rounded border px-2 py-1",
reworkEmphasis.task.red.some((item) => item.id === opinion.id)
@ -4737,11 +4793,8 @@ export function CaptureAnnotationWorkbench({
{list.map(({ op, state }) => (
<li
key={`${op.round}:${op.id}`}
data-rework-focus={reworkFocus?.opinionId === op.id || undefined}
ref={
reworkFocus?.opinionId === op.id
? (node) => node?.scrollIntoView({ block: "nearest" })
: undefined
data-rework-focus={
(reworkFocus?.opinionId === op.id && reworkFocus.round === op.round) || undefined
}
className={cn(
"flex flex-wrap items-center gap-2 rounded border px-2 py-1 text-xs",

View File

@ -1,7 +1,13 @@
import type { HumanItem } from "../types";
/** History never replaces current task status and never grants edit access. */
export function ReviewHistorySummary({ history }: { history?: HumanItem["reviewHistory"] }) {
export function ReviewHistorySummary({
history,
currentRevision,
}: {
history?: HumanItem["reviewHistory"];
currentRevision?: number;
}) {
if (!history) return <div className="mt-1 text-[10px] text-slate-500">审核历史:旧记录缺少结果摘要</div>;
const date = history.reviewedAt ? new Date(history.reviewedAt) : undefined;
const time = date && !Number.isNaN(date.getTime()) ? date.toLocaleString("zh-CN", { hour12: false }) : "";
@ -11,6 +17,11 @@ export function ReviewHistorySummary({ history }: { history?: HumanItem["reviewH
{history.revision ? ` · 版本 ${history.revision}` : ""}
{typeof history.round === "number" ? ` · 第 ${history.round + 1} 轮` : ""}
{time && <span className="block">{time}</span>}
{currentRevision && currentRevision > (history.revision || 0) ? (
<span className="block font-medium text-amber-700 dark:text-amber-300">
当前任务已更新至版本 {currentRevision};以上是旧版本的审核记录,新版本仍可能需要复查。
</span>
) : null}
</div>
);
}

View File

@ -16,7 +16,7 @@ export type ReworkOpinionVerdict = { resolved: boolean; note?: string };
*/
export type ReworkOpinionRailProps = {
emphasis: ReworkEmphasisView;
focus: { opinionId: string; seq: number } | null;
focus: { opinionId: string; round: number; seq: number } | null;
onLocate: (opinion: ReworkOpinionView) => void;
onSkipToggle?: (opinionId: string, skipped: boolean) => void;
/** 意见当前判定(D7 复审草稿);未判定的条目返回 undefined。 */
@ -56,6 +56,11 @@ export function ReworkOpinionRail({
actionIndexOf,
}: ReworkOpinionRailProps) {
const order = emphasis.jumpOrder;
const railRef = useRef<HTMLElement | null>(null);
useEffect(() => {
if (focus)
railRef.current?.querySelector<HTMLElement>('[data-rework-focus="true"]')?.scrollIntoView({ block: "nearest" });
}, [focus?.opinionId, focus?.round, focus?.seq]);
const noteInputRef = useRef<HTMLInputElement | null>(null);
const noteFocusHandledSeq = useRef(-1);
useEffect(() => {
@ -66,7 +71,7 @@ export function ReworkOpinionRail({
}, [noteFocus]);
if (!order.length) return null;
return (
<section data-testid="rework-opinion-rail" aria-label="退回意见栏" className="capture-rework-rail">
<section ref={railRef} data-testid="rework-opinion-rail" aria-label="退回意见栏" className="capture-rework-rail">
<header className="flex flex-wrap items-center gap-x-2 gap-y-0.5 border-b border-rose-200 px-2 py-1.5 text-[11px] font-semibold text-rose-800 dark:border-rose-800 dark:text-rose-200">
<span>
退回意见 · 第 {emphasis.round} 轮打回 · {order.length} 条
@ -84,7 +89,7 @@ export function ReworkOpinionRail({
</header>
<div className="capture-rework-rail-scroll" role="list">
{order.map(({ opinion, state }, index) => {
const active = focus?.opinionId === opinion.id;
const active = focus?.opinionId === opinion.id && focus.round === opinion.round;
const verdict = verdictOf?.(opinion.id);
const sliceLabel = sliceLabelOf(opinion.sliceId);
const actionIndex = opinion.actionId ? actionIndexOf(opinion.actionId) : null;
@ -102,7 +107,6 @@ export function ReworkOpinionRail({
role="listitem"
data-rework-focus={active || undefined}
data-rework-state={state}
ref={active ? (node) => node?.scrollIntoView({ block: "nearest" }) : undefined}
onClick={() => onLocate(opinion)}
className={cn(
"capture-rework-rail-item cursor-pointer border-b px-2 py-1.5 text-[11px] leading-snug transition",

View File

@ -90,3 +90,31 @@ export function autosaveSegmentsWithDrafts(segments = [], drafts = []) {
}
return merged;
}
/** Freeze complete editor drafts into the same workspace transaction as a
* slice edit. Incomplete end-point selections remain owned by their editor.
* This does not submit the task or create a formal annotation revision. */
export function sliceEditActionsWithDrafts(segments = [], drafts = []) {
const unresolved = [];
const complete = [];
for (const draft of drafts) {
const action = draft.annotation;
if (
draft.selectingEnd ||
!action ||
!Number.isFinite(action.start) ||
!Number.isFinite(action.end) ||
action.end <= action.start
) {
unresolved.push(draft);
continue;
}
const description = String(action.description || "").trim();
const invalid = Boolean(action.isInvalid);
complete.push({
...draft,
annotation: { ...action, description, status: invalid ? "invalid" : description ? "described" : "pending" },
});
}
return { actions: autosaveSegmentsWithDrafts(segments, complete), unresolved };
}

View File

@ -2274,6 +2274,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
const [reviewReworkFocus, setReviewReworkFocus] = useState<{
board: "baseline" | "current";
id: string;
round: number;
seq: number;
} | null>(null);
// 判定键 2(票 10,R1-Q7):仍有问题 → 聚焦该行行内备注输入;seq 单调递增
@ -2319,16 +2320,24 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
setReviewReworkFocus((current) => ({
board: target.board,
id: target.opinion.id,
round: target.opinion.round,
seq: (current?.seq || 0) + 1,
}));
seekReviewReworkEntry(target);
};
const locateReviewReworkOpinion = (opinion: ReworkOpinionView) => {
const entries = reviewWalkEntries;
const index = entries.findIndex((entry) => entry.board === "baseline" && entry.opinion.id === opinion.id);
const index = entries.findIndex(
(entry) => entry.board === "baseline" && entry.opinion.id === opinion.id && entry.opinion.round === opinion.round,
);
if (index < 0) return;
reviewReworkJumpIndexRef.current = index;
setReviewReworkFocus((current) => ({ board: "baseline", id: opinion.id, seq: (current?.seq || 0) + 1 }));
setReviewReworkFocus((current) => ({
board: "baseline",
id: opinion.id,
round: opinion.round,
seq: (current?.seq || 0) + 1,
}));
seekReviewReworkEntry(entries[index]);
};
const reworkReceiveSliceLabelOf = (sliceId: string | null) =>
@ -2356,7 +2365,12 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
// 语义与行内判定按钮一致(锁定沿用、备注保留、1 清空备注),空备注的
// "仍有问题"由正式决定提交前拦截(useReviewDraft.prepareSubmit)。
const onReviewReworkVerdict = (resolved: boolean) => {
if (reviewVerdictLocked || reviewReworkFocus?.board !== "baseline") return;
if (
reviewVerdictLocked ||
reviewReworkFocus?.board !== "baseline" ||
reviewReworkFocus.round !== reworkReceiveEmphasis?.round
)
return;
const focusId = reviewReworkFocus.id;
const latest =
reworkReceiveEmphasis?.jumpOrder.find(
@ -2391,7 +2405,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
emphasis={reworkReceiveEmphasis}
focus={
reviewReworkFocus?.board === "baseline"
? { opinionId: reviewReworkFocus.id, seq: reviewReworkFocus.seq }
? { opinionId: reviewReworkFocus.id, round: reviewReworkFocus.round, seq: reviewReworkFocus.seq }
: null
}
onLocate={locateReviewReworkOpinion}
@ -6554,6 +6568,11 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
</button>
))}
</div>
{reviewOnly && (taskPoolView === "mine" || taskPoolView === "reviewed") && (
<p className="mt-2 text-xs text-slate-500" data-testid="review-pool-explanation">
“我的任务”是当前待处理任务;“我已审核”保留本人历史审核记录,同一采集的新版本可以同时成为待办。返工复查表示打回后重新送检;待验收表示质检通过后等待最终验收。
</p>
)}
{blindAnnotator && (
<div className="mt-3 space-y-2" data-testid="project-random-claim">
<p className="text-xs text-slate-500">先选项目,再随机领取一条任务;领取后不能主动释放。</p>
@ -6881,7 +6900,10 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
})()}
</div>
{taskPoolView === "reviewed" && (
<ReviewHistorySummary history={poolItem?.reviewHistory} />
<ReviewHistorySummary
history={poolItem?.reviewHistory}
currentRevision={humanItem?.currentRevision || task.currentRevision}
/>
)}
<div className="mt-1.5 text-[10px] text-gray-500">
{detailedStatus === "rework_review" &&
@ -7367,10 +7389,12 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
) : (
<span className={autosave.errorNotice ? "text-amber-600 dark:text-amber-300" : undefined}>
{autosave.errorNotice ||
`草稿已自动保存 ${new Date(autosave.lastSavedAt || 0).toLocaleTimeString("zh-CN", {
hour: "2-digit",
minute: "2-digit",
})}`}
(autosave.dirty
? "当前有修改等待自动保存"
: `草稿已自动保存 ${new Date(autosave.lastSavedAt || 0).toLocaleTimeString("zh-CN", {
hour: "2-digit",
minute: "2-digit",
})}`)}
</span>
)}
</div>

View File

@ -1752,6 +1752,7 @@
white-space: nowrap;
}
.capture-caption-strip {
flex-shrink: 0;
min-height: 0;
max-height: 96px;
overflow: auto;
@ -1774,7 +1775,7 @@
}
.workbench-review-caption {
margin: 0;
font-size: 13px;
font-size: 14px;
line-height: 1.4;
white-space: pre-wrap;
overflow-wrap: anywhere;
@ -1916,3 +1917,10 @@
.capture-rework-rail > header {
font-size: 12px;
}
.capture-caption-kind {
font-weight: 600;
}
.workbench-review-caption[data-caption-kind="blank"] {
color: var(--app-text-muted, #64748b);
}

View File

@ -80,7 +80,7 @@
min-h-40=160px),子项被 min-height:0 压扁后切片块下溢、与动作块仅剩 ~24px
甚至视觉重叠(与票 01 专注模式回归同族:固定行高 + 绝对定位轨道)。视频行
(1fr)吸收差值。 */
grid-template-rows: 26px minmax(0, 1fr) 50px auto auto 40px;
grid-template-rows: 26px minmax(0, 1fr) auto 50px auto auto 40px;
gap: 4px 8px;
position: relative;
}
@ -90,7 +90,7 @@
.annotation-operations-page[data-review-focused] .capture-workbench-host .capture-action-list {
position: static;
grid-column: 1;
grid-row: 1 / 7;
grid-row: 1 / 8;
width: auto;
min-height: 0;
max-height: none;
@ -128,7 +128,7 @@
}
.annotation-operations-page[data-review-focused] .capture-workbench-host .capture-media-controls {
grid-column: 2;
grid-row: 3;
grid-row: 4;
padding: 3px 6px;
gap: 4px 8px;
font-size: 11px;
@ -144,7 +144,7 @@
}
.annotation-operations-page[data-review-focused] .capture-workbench-host .capture-timeline-editor {
grid-column: 2;
grid-row: 4;
grid-row: 5;
padding: 0;
min-height: 0;
display: flex;
@ -182,7 +182,7 @@
}
.annotation-operations-page[data-review-focused] [data-testid="slice-annotation-timeline"] {
grid-column: 2;
grid-row: 5;
grid-row: 6;
/* 修复 B:不再钉死 90px——保留组件自带的 min-h-40(160px),轨道区块
(top-9 起、动作块 h-16)完整容纳,不再溢出压到下方预留区。 */
min-height: 160px;
@ -190,18 +190,25 @@
}
.annotation-operations-page[data-review-focused] .capture-workbench-host > .capture-workbench > footer {
grid-column: 2 / 4;
grid-row: 6;
grid-row: 7;
padding: 4px 8px;
gap: 6px;
}
.annotation-operations-page[data-review-focused] [data-testid="annotation-description-editor"],
.annotation-operations-page[data-review-focused] .review-problem-panel {
grid-column: 3;
grid-row: 3 / 6;
grid-row: 3 / 7;
min-height: 0;
overflow: auto;
margin: 0;
}
.annotation-operations-page[data-review-focused] .capture-workbench-host .capture-caption-strip {
grid-column: 2;
grid-row: 3;
max-height: 96px;
min-width: 0;
}
/* Aggregate acceptance retains its file/evidence tabs and fixed decision footer. */
[data-testid="final-acceptance-workspace"][data-review-focused] {
height: 100% !important;

View File

@ -0,0 +1,11 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<title>平台反馈回归</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/tests/browser/fixtures/platform-feedback.tsx"></script>
</body>
</html>

View File

@ -0,0 +1,151 @@
import React, { useState } from "react";
import { createRoot } from "react-dom/client";
import { CaptureAnnotationWorkbench, type AnnotationDraft } from "/src/components/CaptureAnnotationWorkbench";
import { ReworkOpinionRail } from "/src/components/ReworkOpinionRail";
import { computeReworkEmphasis } from "/src/lib/rework-emphasis.js";
import { ReviewHistorySummary } from "/src/components/ReviewHistorySummary";
import "/src/index.css";
const query = new URLSearchParams(location.search);
const initialSlices = [
{ id: "s1", name: "测试切片一", start: 0, end: 4 },
{ id: "s2", name: "测试切片二", start: 4, end: 8 },
];
const initialActions = initialSlices.map((s, i) => ({
id: `a${i + 1}`,
start: s.start,
end: s.end,
status: "pending" as const,
description: "",
}));
function DraftHarness() {
const saved = JSON.parse(sessionStorage.getItem("feedback-saved") || "null");
const [slices, setSlices] = useState(saved?.slices || initialSlices);
const [actions, setActions] = useState(saved?.actions || initialActions);
const [drafts, setDrafts] = useState<AnnotationDraft[]>([]);
const [refuse, setRefuse] = useState(query.has("refuse"));
const [applied, setApplied] = useState(0);
return (
<div className="annotation-operations-page">
<button onClick={() => setRefuse(false)}>允许保存</button>
<CaptureAnnotationWorkbench
taskId="feedback-synthetic"
videoSource="/__capture-workbench-mock.mp4"
clipStart={0}
clipEnd={8}
sourceIsFullVideo
slices={slices}
segments={actions}
statuses={{ s1: "pending", s2: "pending" }}
phase="annotate"
initialSliceId="s1"
frameTimelineStatus="ready"
frameBoundaries={Array.from({ length: 81 }, (_, i) => i / 10)}
continuousActions
focusedLayout
sliceDictionary={initialSlices.map((s) => ({ id: s.id, name: s.name }))}
onChange={setActions}
onDraftsChange={setDrafts}
onApplySliceEdit={async (next, segments) => {
if (refuse) {
setRefuse(false);
return false;
}
setSlices(next);
setActions(segments);
setApplied((n) => n + 1);
sessionStorage.setItem("feedback-saved", JSON.stringify({ slices: next, actions: segments }));
return true;
}}
onConfirmAnnotations={() => true}
/>
<pre data-testid="feedback-state">{JSON.stringify({ slices, actions, drafts, applied })}</pre>
</div>
);
}
function RailHarness() {
const [focus, setFocus] = useState<{ opinionId: string; round: number; seq: number } | null>(null);
const [tick, setTick] = useState(0);
const emphasis = computeReworkEmphasis({
currentSlices: initialSlices,
currentActions: initialActions,
baselines: [1, 2, 3].map((round) => ({
round,
slices: initialSlices,
actions: initialActions,
problems: Array.from({ length: 12 }, (_, i) => ({
id: `same-${i}`,
scope: "slice",
sliceId: "s1",
text: `第${round}轮意见${i}`,
})),
})),
});
return (
<div style={{ width: 400 }}>
<button onClick={() => setTick(tick + 1)}>页面更新 {tick}</button>
<style>
{
".capture-rework-rail{height:260px;display:flex;flex-direction:column;overflow:hidden}.capture-rework-rail>header{position:static;flex-shrink:0}.capture-rework-rail-scroll{flex:1;min-height:0;overflow:auto}.capture-rework-rail-item{min-height:60px}"
}
</style>
<ReworkOpinionRail
emphasis={emphasis}
focus={focus}
onLocate={(o) => setFocus((f) => ({ opinionId: o.id, round: o.round, seq: (f?.seq || 0) + 1 }))}
sliceLabelOf={() => "测试切片"}
actionIndexOf={() => null}
/>
</div>
);
}
function CaptionHarness() {
const [kind, setKind] = useState<"blank" | "invalid" | "described" | "error">("blank");
const text = { blank: "未填写动作描述", invalid: "无效片段", described: "合成有效动作描述", error: "" }[kind];
return (
<div>
<div>
{(["blank", "invalid", "described", "error"] as const).map((k) => (
<button key={k} onClick={() => setKind(k)}>
{k}
</button>
))}
</div>
<div className="annotation-operations-page" data-review-focused="true" style={{ height: "calc(100dvh - 60px)" }}>
<div className="capture-workbench-host">
<CaptureAnnotationWorkbench
taskId="caption-synthetic"
videoSource="/__capture-workbench-mock.mp4"
clipStart={0}
clipEnd={8}
sourceIsFullVideo
slices={initialSlices}
segments={initialActions}
statuses={{ s1: "pending", s2: "pending" }}
phase="annotate"
continuousActions
frameTimelineStatus="ready"
frameBoundaries={Array.from({ length: 81 }, (_, i) => i / 10)}
isQualityReview
reviewCaption={{
kind,
text,
action: null,
sliceId: "s1",
sliceText: "测试切片一",
timeBasis: "capture-seconds",
}}
onChange={() => {}}
/>
</div>
</div>
<ReviewHistorySummary
currentRevision={3}
history={{ decision: "rejected", revision: 2, round: 0, reviewedAt: "2026-10-12T08:25:07Z" }}
/>
</div>
);
}
createRoot(document.getElementById("root")!).render(
query.has("rail") ? <RailHarness /> : query.has("caption") ? <CaptionHarness /> : <DraftHarness />,
);

View File

@ -0,0 +1,136 @@
import assert from "node:assert/strict";
const fixture = "/tests/browser/fixtures/platform-feedback.html";
export async function runOpinionRoundFocusRegression(tab, origin) {
await tab.goto(origin + fixture + "?rail");
const rail = tab.playwright.getByTestId("rework-opinion-rail");
await rail.getByText("第3轮意见0", { exact: true }).click();
assert.equal(await rail.locator('[data-rework-focus="true"]').count(), 1, "跨轮同 ID 只能定位到点击的轮次");
assert.match(await rail.locator('[data-rework-focus="true"]').innerText(), /第3轮意见0/);
await tab.playwright.evaluate(() => {
document.querySelector(".capture-rework-rail-scroll").scrollTo({ top: 350, behavior: "instant" });
});
const top = await tab.playwright.evaluate(() => document.querySelector(".capture-rework-rail-scroll").scrollTop);
await tab.playwright.getByRole("button", { name: /页面更新/ }).click();
assert.equal(
await tab.playwright.evaluate(() => document.querySelector(".capture-rework-rail-scroll").scrollTop),
top,
"无新的定位请求时保留手动滚动",
);
await rail.getByText("第1轮意见0", { exact: true }).click();
assert.equal(await rail.locator('[data-rework-focus="true"]').count(), 1);
assert.match(await rail.locator('[data-rework-focus="true"]').innerText(), /第1轮意见0/);
return { roundIdentity: "passed", manualScrollSurvivesRender: "passed" };
}
export async function runParkedDraftSliceRegression(tab, origin) {
await tab.goto(origin + fixture);
await tab.playwright.evaluate(() => sessionStorage.removeItem("feedback-saved"));
await tab.goto(origin + fixture);
const wb = tab.playwright.getByTestId("capture-annotation-workbench");
await wb.getByRole("listbox", { name: "动作区间", exact: true }).getByRole("option").first().click();
await wb.getByRole("textbox", { name: "动作描述", exact: true }).fill("合成跨切片草稿");
await wb.getByRole("combobox", { name: "切片列表", exact: true }).selectOption("s2");
await wb.focus();
await tab.pressKey(null, "e");
await tab.playwright.getByRole("button", { name: "首帧前移1帧", exact: true }).click();
await tab.playwright.getByTestId("slice-edit-panel-apply").click();
assert.equal(
await wb.getByText("请先保存或取消未保存的描述草稿,再应用切片改动。", { exact: true }).count(),
0,
"其他切片的完整描述草稿不应全局阻断切片应用",
);
// Extending the second slice cuts the first action: the normal conflict UI
// must see the parked text rather than dropping it or blocking globally.
const conflicts = tab.playwright.getByTestId("slice-edit-conflict-list");
if (await conflicts.count()) {
await tab.playwright.getByRole("button", { name: /1 截断/ }).click();
await tab.pressKey(null, "Return");
}
await tab.playwright.getByTestId("slice-edit-panel").waitFor({ state: "hidden" });
let state = JSON.parse(await tab.playwright.getByTestId("feedback-state").innerText());
assert.equal(state.applied, 1);
assert.equal(state.drafts.length, 0);
assert.equal(state.actions.find((a) => a.id === "a1" || a.id.startsWith("a1:split:")).description, "合成跨切片草稿");
assert.equal(state.actions.find((a) => a.id === "a1" || a.id.startsWith("a1:split:")).status, "described");
await tab.goto(origin + fixture);
state = JSON.parse(await tab.playwright.getByTestId("feedback-state").innerText());
assert.equal(
state.actions.find((a) => a.id === "a1" || a.id.startsWith("a1:split:")).description,
"合成跨切片草稿",
"已应用草稿刷新后仍存在",
);
for (const mode of ["cancel", "refuse"]) {
await tab.playwright.evaluate(() => sessionStorage.removeItem("feedback-saved"));
await tab.goto(origin + fixture + "?" + mode);
await wb.getByRole("listbox", { name: "动作区间", exact: true }).getByRole("option").first().click();
await wb.getByRole("textbox", { name: "动作描述", exact: true }).fill("失败和取消都保留的草稿");
await wb.getByRole("combobox", { name: "切片列表", exact: true }).selectOption("s2");
await wb.focus();
await tab.pressKey(null, "e");
await tab.playwright.getByRole("button", { name: "首帧前移1帧", exact: true }).click();
if (mode === "cancel") {
await tab.pressKey(null, "Escape");
} else {
await tab.playwright.getByTestId("slice-edit-panel-apply").click();
await tab.playwright.getByRole("button", { name: /1 截断/ }).click();
await tab.pressKey(null, "Return");
await tab.playwright
.getByText("当前状态暂不能应用切片改动,请稍后重试,或按 Esc 取消。", { exact: true })
.waitFor({ state: "visible" });
}
state = JSON.parse(await tab.playwright.getByTestId("feedback-state").innerText());
assert.equal(state.applied, 0);
assert.equal(state.drafts[0].annotation.description, "失败和取消都保留的草稿");
assert.equal(state.slices[0].end, 4, "失败或取消不能修改原工作区");
if (mode === "refuse") {
await tab.pressKey(null, "Return");
await tab.playwright.getByTestId("slice-edit-panel").waitFor({ state: "hidden" });
state = JSON.parse(await tab.playwright.getByTestId("feedback-state").innerText());
assert.equal(state.applied, 1);
assert.equal(state.drafts.length, 0);
}
}
return {
parkedDraftParticipatesInConflicts: "passed",
refreshRetainsText: "passed",
cancelRetainsDraft: "passed",
failedSaveAndRetry: "passed",
};
}
export async function runCaptionVisibilityRegression(tab, origin) {
await tab.goto(origin + fixture + "?caption");
const caption = tab.playwright.getByLabel("审查字幕", { exact: true });
await caption.waitFor({ state: "visible" });
assert.match(await caption.innerText(), /语义留空.*未填写动作描述/);
const boxes = await tab.playwright.evaluate(() => {
const box = (selector) => {
const r = document.querySelector(selector).getBoundingClientRect();
return { top: r.top, bottom: r.bottom, height: r.height };
};
return {
video: box(".capture-video-surface"),
caption: box(".capture-caption-strip"),
controls: box(".capture-media-controls"),
};
});
assert(boxes.caption.height > 15);
assert(boxes.caption.top >= boxes.video.bottom - 1, "字幕位于视频下方独立行");
assert(boxes.caption.bottom <= boxes.controls.top + 1, "字幕不能被自动排到时间轴下方");
await tab.playwright.getByRole("button", { name: "invalid", exact: true }).click();
assert.match(await caption.innerText(), /无效区间.*无效片段/);
await tab.playwright.getByRole("button", { name: "described", exact: true }).click();
assert.match(await caption.innerText(), /合成有效动作描述/);
await tab.playwright.getByRole("button", { name: "error", exact: true }).click();
assert.match(await caption.innerText(), /动作证据读取失败/);
await tab.playwright.getByRole("button", { name: "隐藏字幕", exact: true }).click();
await caption.waitFor({ state: "hidden" });
await tab.playwright.getByRole("button", { name: "显示字幕", exact: true }).click();
await caption.waitFor({ state: "visible" });
assert.match(await tab.playwright.getByTestId("review-history-summary").innerText(), /版本 3.*旧版本.*复查/);
return {
captionPlacement: "passed",
emptyInvalidDescribedAndError: "passed",
visibilityToggle: "passed",
historyVersions: "passed",
};
}

View File

@ -0,0 +1,82 @@
import { chromium } from "playwright";
import { spawn, spawnSync } from "node:child_process";
import { mkdirSync } from "node:fs";
import { resolve } from "node:path";
import {
runOpinionRoundFocusRegression,
runParkedDraftSliceRegression,
runCaptionVisibilityRegression,
} from "./platform-feedback.mjs";
const output = resolve("local-data/test-results/platform-feedback");
mkdirSync(output, { recursive: true });
const media = resolve(output, "synthetic.mp4");
const generated = spawnSync("ffmpeg", [
"-v",
"error",
"-y",
"-f",
"lavfi",
"-i",
"color=c=black:s=160x90:r=10",
"-t",
"8",
"-c:v",
"libx264",
"-pix_fmt",
"yuv420p",
media,
]);
if (generated.status !== 0) throw Error("Cannot generate synthetic browser media");
const server = spawn(
process.execPath,
[
"node_modules/vite/bin/vite.js",
"--config",
"tests/browser/vite.platform-feedback.config.ts",
"--host",
"127.0.0.1",
"--port",
"5191",
"--strictPort",
],
{ stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, CAPTURE_WORKBENCH_MOCK_VIDEO: media } },
);
let browser;
try {
const origin = "http://127.0.0.1:5191";
let ready = false;
for (let i = 0; i < 100; i++) {
try {
if ((await fetch(origin)).ok) {
ready = true;
break;
}
} catch {}
if (server.exitCode !== null) break;
await new Promise((r) => setTimeout(r, 100));
}
if (!ready) throw Error("Local synthetic fixture server did not start");
browser = await chromium.launch({
...(process.env.BROWSER_EXECUTABLE ? { executablePath: process.env.BROWSER_EXECUTABLE } : {}),
headless: true,
args: ["--no-proxy-server"],
});
const page = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
page.setDefaultTimeout(5000);
page.on("pageerror", (error) => console.error("Fixture page error:", error.message));
page.on("console", (message) => {
if (message.type() === "error") console.error("Fixture console:", message.text());
});
const tab = {
goto: (url) => page.goto(url),
playwright: page,
pressKey: (_, key) => page.keyboard.press(key === "Return" ? "Enter" : key),
};
const which = process.argv[2];
if (!which || which === "rail") console.log(JSON.stringify(await runOpinionRoundFocusRegression(tab, origin)));
if (!which || which === "drafts") console.log(JSON.stringify(await runParkedDraftSliceRegression(tab, origin)));
if (!which || which === "captions") console.log(JSON.stringify(await runCaptionVisibilityRegression(tab, origin)));
} finally {
await browser?.close();
server.kill("SIGTERM");
}

View File

@ -0,0 +1,25 @@
import base from "../../vite.config";
import { realpathSync } from "node:fs";
import { resolve } from "node:path";
import type { ConfigEnv } from "vite";
export default async (env: ConfigEnv) => {
const config = typeof base === "function" ? await base(env) : base;
const modules = realpathSync("node_modules");
return {
...config,
cacheDir: resolve("local-data/test-results/platform-feedback/vite-cache"),
resolve: {
...config.resolve,
dedupe: ["react", "react-dom"],
alias: [
{ find: /^react$/, replacement: modules + "/react/index.js" },
{ find: /^react\/jsx-runtime$/, replacement: modules + "/react/jsx-runtime.js" },
{ find: /^react\/jsx-dev-runtime$/, replacement: modules + "/react/jsx-dev-runtime.js" },
{ find: /^react-dom\/client$/, replacement: modules + "/react-dom/client.js" },
{ find: /^react-dom$/, replacement: modules + "/react-dom/index.js" },
...Object.entries(config.resolve?.alias || {}).map(([find, replacement]) => ({ find, replacement })),
],
},
};
};

View File

@ -400,7 +400,7 @@ test("acceptance fix C: E opens despite parked drafts; autosave pauses for the p
assert.doesNotMatch(open, /slices\.length < 2/, "单切片守卫已删除(D1 直开)");
assert.match(open, /!continuousActions && editingAnnotation/, "活跃编辑会话守卫保留");
assert.match(open, /请先保存或取消当前描述,再进入切片重设面板/, "活跃编辑提示文案不变");
assert.doesNotMatch(open, /outstandingDrafts/, "停泊草稿不再拦 E(打开路径)");
assert.match(open, /sliceEditActionsWithDrafts\(segments, outstandingDrafts\)/, "停泊草稿进入冲突快照,不拦 E");
// 会话通道:打开/关闭都通知页面,页面据此暂停与补存自动保存。
assert.match(workbench, /onSliceEditSessionChange/);
assert.match(open, /onSliceEditSessionChange\?\.\(true\)/);
@ -429,7 +429,7 @@ test("acceptance fix C: E opens despite parked drafts; autosave pauses for the p
workbench.indexOf("const insertSlice ="),
);
assert.doesNotMatch(apply, /slices !== panel\.snapshot\.slices/, "不再用引用比较快照");
assert.match(apply, /workspaceDiffersFromSnapshot\(panel\.snapshot\)/);
assert.match(apply, /workspaceDiffersFromSnapshot\(panel\.baseSnapshot\)/);
assert.match(
workbench,
/const workspaceDiffersFromSnapshot =[\s\S]*?byStart\(slices\)[\s\S]*?byStart\(snapshot\.slices\)/,

View File

@ -105,7 +105,7 @@ for (const view of [
assert.equal(f.position.time, target);
const caption = f.nodes().find((item) => item.props.className === "workbench-review-caption").props;
assert.equal(caption["data-caption-slice-id"], "slice-7");
assert.equal(caption.children, "切片 7");
assert.equal(caption.children.at(-1), "切片 7");
assert.equal(f.position.actionId, "a-slice-7");
const visible = f.nodes().filter((item) => item.props["data-camera"] && item.props.src);
for (const item of visible) {

View File

@ -101,7 +101,8 @@ test("R1-Q7: workbench dispatches verdict keys to the page handler", () => {
test("R1-Q7: verdict keys act only on the focused baseline board row (right board is a no-op)", () => {
const page = read("src/pages/AnnotationOperations.tsx");
assert.match(page, /const onReviewReworkVerdict = \(resolved: boolean\) =>/, "页面实现判定键处理");
assert.match(page, /reviewReworkFocus\?\.board !== "baseline"\) return;/, "右栏/未聚焦时空操作");
assert.match(page, /reviewReworkFocus\?\.board !== "baseline" \|\|/, "右栏/未聚焦时空操作");
assert.match(page, /reviewReworkFocus\.round !== reworkReceiveEmphasis\?\.round/, "旧轮次同 ID 不可判定");
assert.match(page, /opinion\.round === reworkReceiveEmphasis\.round/, "仅最新轮基线行可判定(与行内控件一致)");
assert.match(page, /onReviewReworkVerdict=\{/, "判定键传入工作台");
});

View File

@ -0,0 +1,40 @@
import { test } from "node:test";
import assert from "node:assert/strict";
import { sliceEditActionsWithDrafts } from "../../src/lib/annotation-autosave.js";
import { scanSliceEditConflicts, resolveSliceEditConflicts } from "../../src/lib/slice-edit-conflict.js";
test("parked text participates in the real boundary conflict resolution without duplicate actions", () => {
const slices = [
{ id: "s1", start: 0, end: 4 },
{ id: "s2", start: 4, end: 8 },
];
const original = [{ id: "a", start: 0, end: 4, description: "", status: "pending" }];
const draft = { sliceId: "s1", annotation: { ...original[0], description: " 保留草稿 " }, selectingEnd: false };
const prepared = sliceEditActionsWithDrafts(original, [draft]);
const pending = [
{ ...slices[0], end: 3.9 },
{ ...slices[1], start: 3.9 },
];
const scan = scanSliceEditConflicts({ baseSlices: slices, pendingSlices: pending, actions: prepared.actions });
assert.equal(scan.entries.length, 1);
const result = resolveSliceEditConflicts({
baseSlices: slices,
pendingSlices: pending,
actions: prepared.actions,
choices: { a: "truncate" },
});
assert(result.actions.every((a) => a.description === "保留草稿" && a.status === "described"));
assert.equal(
result.actions.reduce((n, a) => n + a.end - a.start, 0),
4,
);
assert.equal(original[0].description, "");
assert.equal(draft.annotation.description, " 保留草稿 ");
});
test("unfinished end selection is returned for navigation instead of being silently applied", () => {
const action = { id: "a", start: 0, end: 1, description: "未完成" };
const d = { sliceId: "s1", annotation: action, selectingEnd: true };
const result = sliceEditActionsWithDrafts([], [d]);
assert.deepEqual(result.actions, []);
assert.deepEqual(result.unresolved, [d]);
});