feat: M3 — 伏笔账本 + 节奏引擎 + 大纲（含并发记账 bugfix）
- 伏笔账本：纯函数状态机(OPEN/PARTIAL/CLOSED/OVERDUE) + ForeshadowLedger repo；验收后到期扫描(BackgroundTask 自建 session 置 OVERDUE)；登记/状态变更端点 - 节奏 + 三审齐：foreshadow-analyst + pace-checker 并入 LangGraph 并行审(REVIEW_SPECS)，collect 分列落 chapter_reviews(conflicts/foreshadow_sug/pace)，review SSE 加 foreshadow/pace 事件 - 大纲：outliner Agent 产 OutlineResult(含 foreshadow_windows)，POST /outline 逐章 upsert outline 表；GET /foreshadow?status= 看板 - 前端：伏笔四泳道看板(OVERDUE 琥珀) + 大纲编辑器(窗口徽标) + 节奏节拍图(▁▃▅) + 审稿页消费 foreshadow/pace SSE - bugfix(T3.8)：并行三审共用请求 session 记账触发 'Session is already flushing' → foreshadow/pace 静默丢失；SqlAlchemyLedgerSink.record 改 add-only(靠端点/事务 commit)，加并发回归测试 - M3 E2E：真实 DB + mock 网关零 token 走通 埋设→进展→验收后扫描 OVERDUE→看板 + 大纲含窗口 + 三审齐 SSE/留痕；E2E 暴露并钉住上述 bug - 门禁绿：mypy 111 / pytest 228(0 xfailed) / alembic 无漂移；前端 gen:api/lint/tsc/vitest 69/build
This commit is contained in:
Yaojia Wang
72
apps/web/components/foreshadow/ForeshadowBoard.tsx
Normal file
72
apps/web/components/foreshadow/ForeshadowBoard.tsx
Normal file
@@ -0,0 +1,72 @@
|
||||
"use client";
|
||||
|
||||
import { useMemo } from "react";
|
||||
|
||||
import { AppShell } from "@/components/AppShell";
|
||||
import type { ForeshadowView, ProjectResponse } from "@/lib/api/types";
|
||||
import {
|
||||
LANES,
|
||||
groupByStatus,
|
||||
type ForeshadowStatus,
|
||||
} from "@/lib/foreshadow/board";
|
||||
import { useForeshadow } from "@/lib/foreshadow/useForeshadow";
|
||||
import { KanbanColumn } from "./KanbanColumn";
|
||||
import { RegisterForm } from "./RegisterForm";
|
||||
|
||||
interface ForeshadowBoardProps {
|
||||
project: ProjectResponse;
|
||||
initialItems: ForeshadowView[];
|
||||
}
|
||||
|
||||
// 伏笔看板主体（UX §6.8）：四泳道 + 登记/状态变更交互。
|
||||
// RSC 取全量种入；Client 承载登记/转移（乐观 + 回滚 + Toast）。
|
||||
export function ForeshadowBoard({
|
||||
project,
|
||||
initialItems,
|
||||
}: ForeshadowBoardProps) {
|
||||
const { items, busy, register, transition } = useForeshadow(initialItems);
|
||||
const lanes = useMemo(() => groupByStatus(items), [items]);
|
||||
|
||||
const onTransition = (
|
||||
code: string,
|
||||
toStatus: ForeshadowStatus | null,
|
||||
progressNote: string,
|
||||
): void => {
|
||||
void transition(code, {
|
||||
projectId: project.id,
|
||||
toStatus,
|
||||
progressEntry: progressNote ? { note: progressNote } : null,
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<AppShell
|
||||
title={`〈${project.title}〉`}
|
||||
subtitle="伏笔看板"
|
||||
projectId={project.id}
|
||||
activeNav="foreshadow"
|
||||
>
|
||||
<div className="flex h-[calc(100vh-4rem)] flex-col p-4">
|
||||
<div className="mb-4 flex items-start justify-between gap-4">
|
||||
<h1 className="font-serif text-lg text-ink">伏笔看板</h1>
|
||||
<RegisterForm
|
||||
projectId={project.id}
|
||||
busy={busy}
|
||||
onRegister={register}
|
||||
/>
|
||||
</div>
|
||||
<div className="grid min-h-0 flex-1 grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-4">
|
||||
{LANES.map((status) => (
|
||||
<KanbanColumn
|
||||
key={status}
|
||||
status={status}
|
||||
items={lanes[status]}
|
||||
busy={busy}
|
||||
onTransition={onTransition}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</AppShell>
|
||||
);
|
||||
}
|
||||
133
apps/web/components/foreshadow/ForeshadowCard.tsx
Normal file
133
apps/web/components/foreshadow/ForeshadowCard.tsx
Normal file
@@ -0,0 +1,133 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
|
||||
import type { ForeshadowView } from "@/lib/api/types";
|
||||
import type { ForeshadowStatus } from "@/lib/foreshadow/board";
|
||||
|
||||
interface ForeshadowCardProps {
|
||||
item: ForeshadowView;
|
||||
overdue: boolean;
|
||||
busy: boolean;
|
||||
onTransition: (
|
||||
code: string,
|
||||
toStatus: ForeshadowStatus | null,
|
||||
progressNote: string,
|
||||
) => void;
|
||||
}
|
||||
|
||||
const NEXT_STATUS: Record<string, ForeshadowStatus[]> = {
|
||||
OPEN: ["PARTIAL", "CLOSED"],
|
||||
PARTIAL: ["CLOSED"],
|
||||
OVERDUE: ["PARTIAL", "CLOSED"],
|
||||
CLOSED: [],
|
||||
};
|
||||
|
||||
// 伏笔卡（UX §6.8）：code/title/回收窗口/importance/progress 时间线 + 状态变更/加进展。
|
||||
// OVERDUE 用琥珀强调（不单靠色：加 ⚠ 图标 + 文案，a11y §10）。
|
||||
export function ForeshadowCard({
|
||||
item,
|
||||
overdue,
|
||||
busy,
|
||||
onTransition,
|
||||
}: ForeshadowCardProps) {
|
||||
const [note, setNote] = useState("");
|
||||
const transitions = NEXT_STATUS[item.status] ?? [];
|
||||
const windowText = recoveryWindow(item);
|
||||
|
||||
return (
|
||||
<li
|
||||
className={`rounded border bg-panel p-3 ${
|
||||
overdue ? "border-overdue ring-1 ring-overdue/40" : "border-line"
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-baseline gap-2">
|
||||
<span className="font-mono text-xs text-cinnabar">{item.code}</span>
|
||||
{overdue ? (
|
||||
<span className="text-xs text-overdue" aria-label="逾期">
|
||||
⚠ 逾期
|
||||
</span>
|
||||
) : null}
|
||||
</div>
|
||||
<p className="mt-0.5 font-serif text-sm text-ink">{item.title}</p>
|
||||
|
||||
<dl className="mt-2 space-y-0.5 text-xs text-ink-soft">
|
||||
{typeof item.planted_at === "number" ? (
|
||||
<div>埋于 {item.planted_at} 章</div>
|
||||
) : null}
|
||||
{windowText ? <div>窗口 {windowText}</div> : null}
|
||||
{item.importance ? <div>{item.importance}</div> : null}
|
||||
</dl>
|
||||
|
||||
{item.progress && item.progress.length > 0 ? (
|
||||
<ul className="mt-2 border-l-2 border-line pl-2 text-xs text-ink-soft">
|
||||
{item.progress.map((p, i) => (
|
||||
<li key={i}>· {progressLabel(p)}</li>
|
||||
))}
|
||||
</ul>
|
||||
) : null}
|
||||
|
||||
{transitions.length > 0 || item.status !== "CLOSED" ? (
|
||||
<div className="mt-3 space-y-2">
|
||||
{transitions.length > 0 ? (
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{transitions.map((to) => (
|
||||
<button
|
||||
key={to}
|
||||
type="button"
|
||||
disabled={busy}
|
||||
onClick={() => onTransition(item.code, to, "")}
|
||||
className="rounded border border-line px-2 py-0.5 text-xs text-ink hover:border-cinnabar hover:text-cinnabar disabled:opacity-40"
|
||||
>
|
||||
→ {to === "CLOSED" ? "回收" : to}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
) : null}
|
||||
{item.status !== "CLOSED" ? (
|
||||
<div className="flex gap-1.5">
|
||||
<label htmlFor={`prog-${item.code}`} className="sr-only">
|
||||
{item.code} 进展
|
||||
</label>
|
||||
<input
|
||||
id={`prog-${item.code}`}
|
||||
type="text"
|
||||
value={note}
|
||||
onChange={(e) => setNote(e.target.value)}
|
||||
placeholder="加进展（如：23章发光）"
|
||||
className="min-w-0 flex-1 rounded border border-line bg-bg px-2 py-0.5 text-xs text-ink focus:border-cinnabar focus:outline-none"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
disabled={busy || note.trim().length === 0}
|
||||
onClick={() => {
|
||||
onTransition(item.code, null, note.trim());
|
||||
setNote("");
|
||||
}}
|
||||
className="rounded border border-line px-2 py-0.5 text-xs text-ink hover:border-cinnabar disabled:opacity-40"
|
||||
>
|
||||
记
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
) : null}
|
||||
</li>
|
||||
);
|
||||
}
|
||||
|
||||
function recoveryWindow(item: ForeshadowView): string | null {
|
||||
const from = item.expected_close_from;
|
||||
const to = item.expected_close_to;
|
||||
if (typeof from === "number" && typeof to === "number") return `${from}-${to}`;
|
||||
if (typeof to === "number") return `≤${to}`;
|
||||
if (typeof from === "number") return `≥${from}`;
|
||||
return null;
|
||||
}
|
||||
|
||||
function progressLabel(entry: Record<string, unknown>): string {
|
||||
const chapter = entry["chapter"];
|
||||
const note = entry["note"];
|
||||
const noteStr = typeof note === "string" ? note : JSON.stringify(entry);
|
||||
return typeof chapter === "number" ? `${chapter}章：${noteStr}` : noteStr;
|
||||
}
|
||||
61
apps/web/components/foreshadow/KanbanColumn.tsx
Normal file
61
apps/web/components/foreshadow/KanbanColumn.tsx
Normal file
@@ -0,0 +1,61 @@
|
||||
"use client";
|
||||
|
||||
import type { ForeshadowView } from "@/lib/api/types";
|
||||
import type { ForeshadowStatus } from "@/lib/foreshadow/board";
|
||||
import { ForeshadowCard } from "./ForeshadowCard";
|
||||
|
||||
interface KanbanColumnProps {
|
||||
status: ForeshadowStatus;
|
||||
items: ForeshadowView[];
|
||||
busy: boolean;
|
||||
onTransition: (
|
||||
code: string,
|
||||
toStatus: ForeshadowStatus | null,
|
||||
progressNote: string,
|
||||
) => void;
|
||||
}
|
||||
|
||||
// 单个状态泳道（UX §6.8）。OVERDUE 列整列琥珀强调（表头 + 卡片）。
|
||||
export function KanbanColumn({
|
||||
status,
|
||||
items,
|
||||
busy,
|
||||
onTransition,
|
||||
}: KanbanColumnProps) {
|
||||
const overdue = status === "OVERDUE";
|
||||
return (
|
||||
<section
|
||||
className="flex min-w-0 flex-col rounded border border-line bg-bg"
|
||||
aria-label={`${status} 泳道`}
|
||||
>
|
||||
<header
|
||||
className={`flex items-center justify-between rounded-t border-b px-3 py-2 ${
|
||||
overdue
|
||||
? "border-overdue bg-overdue/10 text-overdue"
|
||||
: "border-line bg-panel text-ink-soft"
|
||||
}`}
|
||||
>
|
||||
<span className="font-mono text-xs font-semibold">
|
||||
{overdue ? "⚠ " : ""}
|
||||
{status}
|
||||
</span>
|
||||
<span className="font-mono text-xs">{items.length}</span>
|
||||
</header>
|
||||
<ul className="flex-1 space-y-2 overflow-auto p-2">
|
||||
{items.length === 0 ? (
|
||||
<li className="px-1 py-3 text-xs text-ink-soft/60">—</li>
|
||||
) : (
|
||||
items.map((item) => (
|
||||
<ForeshadowCard
|
||||
key={item.code}
|
||||
item={item}
|
||||
overdue={overdue}
|
||||
busy={busy}
|
||||
onTransition={onTransition}
|
||||
/>
|
||||
))
|
||||
)}
|
||||
</ul>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
185
apps/web/components/foreshadow/RegisterForm.tsx
Normal file
185
apps/web/components/foreshadow/RegisterForm.tsx
Normal file
@@ -0,0 +1,185 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
|
||||
import type { RegisterInput } from "@/lib/foreshadow/board";
|
||||
|
||||
interface RegisterFormProps {
|
||||
projectId: string;
|
||||
busy: boolean;
|
||||
onRegister: (input: RegisterInput) => Promise<boolean>;
|
||||
}
|
||||
|
||||
const EMPTY = {
|
||||
code: "",
|
||||
title: "",
|
||||
plantedAt: "",
|
||||
content: "",
|
||||
expectedCloseFrom: "",
|
||||
expectedCloseTo: "",
|
||||
importance: "",
|
||||
};
|
||||
|
||||
// 登记新伏笔（UX §6.8）。受控表单 → 组装 RegisterInput；成功后清空。
|
||||
export function RegisterForm({
|
||||
projectId,
|
||||
busy,
|
||||
onRegister,
|
||||
}: RegisterFormProps) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [form, setForm] = useState({ ...EMPTY });
|
||||
|
||||
const set = (key: keyof typeof EMPTY, value: string): void =>
|
||||
setForm((prev) => ({ ...prev, [key]: value }));
|
||||
|
||||
const submit = async (): Promise<void> => {
|
||||
const ok = await onRegister({
|
||||
projectId,
|
||||
code: form.code,
|
||||
title: form.title,
|
||||
plantedAt: toInt(form.plantedAt),
|
||||
content: form.content || null,
|
||||
expectedCloseFrom: toInt(form.expectedCloseFrom),
|
||||
expectedCloseTo: toInt(form.expectedCloseTo),
|
||||
importance: form.importance || null,
|
||||
});
|
||||
if (ok) {
|
||||
setForm({ ...EMPTY });
|
||||
setOpen(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (!open) {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOpen(true)}
|
||||
className="rounded bg-cinnabar px-3 py-1.5 text-sm text-panel hover:opacity-90"
|
||||
>
|
||||
＋ 登记伏笔
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
const canSubmit =
|
||||
form.code.trim().length > 0 && form.title.trim().length > 0 && !busy;
|
||||
|
||||
return (
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
void submit();
|
||||
}}
|
||||
className="rounded border border-line bg-panel p-4"
|
||||
>
|
||||
<div className="grid grid-cols-2 gap-3 sm:grid-cols-3">
|
||||
<Field label="代号 *" id="f-code">
|
||||
<input
|
||||
id="f-code"
|
||||
value={form.code}
|
||||
onChange={(e) => set("code", e.target.value)}
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="标题 *" id="f-title" span2>
|
||||
<input
|
||||
id="f-title"
|
||||
value={form.title}
|
||||
onChange={(e) => set("title", e.target.value)}
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="埋设章" id="f-planted">
|
||||
<input
|
||||
id="f-planted"
|
||||
inputMode="numeric"
|
||||
value={form.plantedAt}
|
||||
onChange={(e) => set("plantedAt", e.target.value)}
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="回收窗口起" id="f-from">
|
||||
<input
|
||||
id="f-from"
|
||||
inputMode="numeric"
|
||||
value={form.expectedCloseFrom}
|
||||
onChange={(e) => set("expectedCloseFrom", e.target.value)}
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="回收窗口止" id="f-to">
|
||||
<input
|
||||
id="f-to"
|
||||
inputMode="numeric"
|
||||
value={form.expectedCloseTo}
|
||||
onChange={(e) => set("expectedCloseTo", e.target.value)}
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="重要度" id="f-imp">
|
||||
<input
|
||||
id="f-imp"
|
||||
value={form.importance}
|
||||
onChange={(e) => set("importance", e.target.value)}
|
||||
placeholder="主线/支线"
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
<Field label="线索内容" id="f-content" span3>
|
||||
<input
|
||||
id="f-content"
|
||||
value={form.content}
|
||||
onChange={(e) => set("content", e.target.value)}
|
||||
className={inputCls}
|
||||
/>
|
||||
</Field>
|
||||
</div>
|
||||
<div className="mt-3 flex items-center gap-2">
|
||||
<button
|
||||
type="submit"
|
||||
disabled={!canSubmit}
|
||||
className="rounded bg-cinnabar px-3 py-1.5 text-sm text-panel hover:opacity-90 disabled:opacity-40"
|
||||
>
|
||||
{busy ? "登记中…" : "登记"}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOpen(false)}
|
||||
className="rounded border border-line px-3 py-1.5 text-sm text-ink-soft hover:border-cinnabar"
|
||||
>
|
||||
取消
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
|
||||
const inputCls =
|
||||
"w-full rounded border border-line bg-bg px-2 py-1 text-sm text-ink focus:border-cinnabar focus:outline-none";
|
||||
|
||||
interface FieldProps {
|
||||
label: string;
|
||||
id: string;
|
||||
span2?: boolean;
|
||||
span3?: boolean;
|
||||
children: React.ReactNode;
|
||||
}
|
||||
|
||||
function Field({ label, id, span2, span3, children }: FieldProps) {
|
||||
const span = span3 ? "col-span-2 sm:col-span-3" : span2 ? "col-span-2" : "";
|
||||
return (
|
||||
<div className={span}>
|
||||
<label htmlFor={id} className="block text-xs text-ink-soft">
|
||||
{label}
|
||||
</label>
|
||||
<div className="mt-0.5">{children}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function toInt(raw: string): number | null {
|
||||
const trimmed = raw.trim();
|
||||
if (trimmed.length === 0) return null;
|
||||
const n = Number.parseInt(trimmed, 10);
|
||||
return Number.isInteger(n) ? n : null;
|
||||
}
|
||||
Reference in New Issue
Block a user