diff --git a/docs/requirements/handoff-HEL-823.json b/docs/requirements/handoff-HEL-823.json new file mode 100644 index 0000000..0553a9c --- /dev/null +++ b/docs/requirements/handoff-HEL-823.json @@ -0,0 +1,31 @@ +{ + "task": "HEL-823 视觉总监:把 HEL-815 的日子、已分享生活详情、共同回忆、首次创建、设置管理完整页面接到正式 React 产品(A3)", + "baseline_version": "1.10", + "read_commit": "cef8ae5581f68ae81991533698ef05abcb82e659", + "read_notes": "唯一施工基底为远端 hel-822-candidate 提交 cef8ae5(总管 git archive 附件 HEL-823-A3-base-cef8ae5.zip,SHA256 245dab3f124c0c987a322c4dd788dbb7e7f5e24c4fb96f9eb50f4ec6c61a3894,本机复算一致)。本机实际阅读该包内根 AGENTS.md、docs/requirements/README.md、current.md(v1.10,59项)、coverage.md、changes.md、task-handoff-template.md、handoff-HEL-824.json,并按编号核对 CG-006/007/012–016/018/024/029–031、VIS-001–013、AM-001–003、UX-001–006、GOV-001–005、DEL-001 原文与边界。页面设计依据为本人 HEL-815 原稿附件 01a16845-b50a-7335-a87e-61bf11c44703(README、src/pages.js、boards/01)。授权原话:主卡评论 01a169a8-5884-7c26-a00f-c23a5f5399a9「继续吧,现在没什么主要的内容需要我确认的」。模板里的旧 1.7 字样不覆盖当前入口 v1.10。", + "requirement_ids": ["CG-006", "CG-007", "CG-012", "CG-013", "CG-014", "CG-015", "CG-016", "CG-018", "CG-024", "CG-029", "CG-030", "CG-031", "VIS-001", "VIS-002", "VIS-003", "VIS-004", "VIS-005", "VIS-006", "VIS-007", "VIS-008", "VIS-009", "VIS-010", "VIS-011", "VIS-012", "VIS-013", "AM-001", "AM-002", "AM-003", "UX-001", "UX-002", "UX-003", "UX-004", "UX-005", "UX-006", "GOV-001", "GOV-002", "GOV-003", "GOV-004", "GOV-005", "DEL-001"], + "deliverable": "在 cef8ae5 上改 web 下 15 个文件(10 个源码、5 个测试)、新增本交接,无删除(清单与前后哈希见 CHANGES-HEL-823.json)。(1) web/src/life/LifePanel.tsx 重写为 HEL-815 日子页:标题区「她的日子 / 我们的回忆」+ 宽屏「日子 · 演示数据」/ ≤1100「她此刻 · …」;页签行附说明;列表按「她说过的打算」置顶、其余按日分组,行=时间·状态点(实心已发生/呼吸点正在/虚线打算)·标题·一句摘要·少量标签;分页「看更早的日子」→ 加载中 → 到底「再往前,就是她刚住进来的那天了」;演示失败开关下的读取失败卡与「再试一次」(加载骨架);空状态(首晚 / 真实后台未接)。详情:类别·时间·地点、何时告诉你、带身份的她的原话、关联回忆卡、那时候的聊天(只取已通过 publicView 的消息)、「在交谈里看这段」、演示说明。回忆四组带计数,详情「她是这样记得的」、成长注明不改写底色并可跳到设置·她、来自这些日子的反链或说明。任何解析不到的选择(过期、删除或从未讲过)统一显示「这一条现在打不开」,不暗示记录存在。每个页签保留自己的滚动位置,面板隐藏再打开(交谈返回日子)恢复;手机 Esc 先关推入详情。(2) web/src/manage/CreationWizard.tsx:左侧叙事随步骤与创建中/失败/完成变化;名字为空并有占位,错误时焦点落到出问题的字段(名字/生日/关系);生日「随机生成 / 我来指定」(默认随机一个满 19–35 岁的生日,可再随机;手动改日期或时辰即为指定);关系改为两张说明卡且不预选;新增可选相处边界(后端 CreationInput 已接受 boundary,未改 API);汇总含边界;创建中提示、失败「返回修改 / 再试一次」资料保留;真实 409「已经有一位她」时禁用再次创建并提供「重新打开,恢复已有的她」(只 reload,不覆盖);完成页「第一晚」。(3) web/src/manage/ManagePanel.tsx:分区列表加能力说明与手机推入箭头、底注「首版只有一位她 · 没有重建或清空」;分区标题旁能力标签(只读/可以调整/演示数据/未接入/文字已接通/本机生效);「她」改为名字只读+生辰只读、底色(沿用 BaseColor 真实排盘)、「她怎么理解自己」诚实未接卡(不放固定段落)、最初就有的/后来慢慢有的分栏(成长只取已分享来源的回忆);关系改为分段按钮,确认框写明「把关系从「X」改成「Y」?」并保留记忆与信任说明;真实城市/外观/备份/语音视觉开头加「还没有接上」说明卡(接上后做什么、现在什么都不会发生),原有待接入细节保留;减少动效改为开关样式。(4) web/src/stage/Presenter.tsx 新增「她此刻」浮签:面板打开且宽度 >1100 时贴在她下方,随相机落定与窗口变化跟随命中区;≤1100 改写在面板标题上方。(5) App.tsx / RealApp.tsx 传入此刻文字、演示失败开关与「在设置里看底色与成长」跳转;domain/model.ts LifeEvent 增可选 told;demo/fixtures.ts 演示条目补 told;adapters/storage.ts 恢复时只为已分享条目保留 told。(6) styles/components.css 追加 A3 区块(两主题共用 token,状态色只用于点、细线与短字;≤1100、≤720、≤720×620、≤360 断点)。(7) tests:domain.test.ts 新增 told 只保留在已分享记录的单测;browser_check / real_browser_check / import_check / rework_browser_check 只按本次有意的界面变化改选择器(关系下拉→分段按钮,「看那段聊天」→「在交谈里看这段」,私有深链断言改为中性「这一条现在打不开」),其余断言不动。", + "acceptance": [ + "日子(演示 ?demo=1,载入三天记录):打算置顶并标「计划可能会变」,正在为呼吸点;列表与详情、回忆、搜索不出现未分享条目;#event=secret 深链只显示「这一条现在打不开。」,页面不含「秘密散步/私密地点」(browser_check 已改断言)。", + "长记录:首屏 18 条,看更早的日子后 30 条;选第 11 条 → 在交谈里看这段 → 结束交谈 · 回到日子,列表滚动位置与选中项不变(import_check 原断言)。", + "我们的回忆:真实入口四组各显示「暂无可核实的回忆」(.pane .list .grp = 4,rework 原断言);演示入口四组带计数,成长条目可跳到设置·她。", + "首建:名字为空、关系不预选(两张卡 aria-pressed=false)、未满 18 岁与未选关系被拦并聚焦对应字段;勾选确认前「确认创建」禁用;演示失败后资料保留、再试一次成功;真实入口 409 不覆盖已有档案。", + "设置:名字与生辰只读,无改名/新建/切换/清空/重建入口;改关系类型须确认,取消恢复,保存失败修改保留;离开有未保存修改须确认(原守卫未改);未接入能力全部标「未接入」且按钮不可用,演示能力标「演示数据」。", + "两主题结构一致(同一 DOM,只换 token);1600×1000、1024、390×844、320×568、390×430 键盘等效下无关键遮挡——需总工以浏览器检查与截图实测,本机未能运行。", + "未触碰 A1/A2:ChatPanel、reading.ts、lineStage、Viewport、compact/typing 规则、真实适配器/TurnGate/epoch 均未修改。" + ], + "deferred": [ + "本机(Windows 运行时)没有 node/npm、python、git,也找不到可用的 TypeScript:未执行 npm ci/typecheck/lint/test/build、四份浏览器检查、check_requirements.py、git diff --check,也没有正式 React 页面截图或录屏;全部交总工机械执行,未运行即未通过,不以静态阅读或 HEL-815 静态样图代替。", + "未提交、未开 PR:按 CHANGES-HEL-823.json 落到 hel-822-candidate(cef8ae5)之上的独立分支,产品目标仍为 agent/agent/de8874a3803b,不指 main;不合并、不部署 8320,8300/8310 未触碰。", + "HEL-815 中「看接入后的设计稿」只作施工参照,按原稿施工须知未放进正式产品;城市、外观、备份、语音、视觉观察、生活、长期记忆、主动消息的真实能力仍未接通(R2–R7)。", + "「她怎么理解自己」与最初小习惯在真实入口显示未接说明,由 R1 人格深度承接(CG-013/014/015、UX-004);不以固定模板填充。", + "真机软键盘、Safari/Firefox、读屏未测;等效视口不冒充真机(UX-001)。人物仍为参考静帧,真实日常视频/首尾衔接/语音口型由主卡 HEL-797 与 HEL-802/803 承接(DEL-001)。" + ], + "requirement_changes": [], + "verification": [ + "附件 SHA256 复算 245dab3f124c0c987a322c4dd788dbb7e7f5e24c4fb96f9eb50f4ec6c61a3894,与卡片一致;解包为只读 before 与可写 work 两份,修改只在 work,before 全部 250 个文件哈希另存。", + "修改前后文件哈希与改/增/删清单见交付包 CHANGES-HEL-823.json。", + "静态自查:逐文件回读 JSX 结构与类型(新增 props 均为可选、noUnusedLocals 下无多余变量),核对测试所依赖的可访问名称(她的名字、出生日期(公历)、1 / 4 · 出生资料、朋友/恋人 aria-pressed、确认创建、再试一次、去看看她、看更早的日子、结束交谈 · 回到日子、设置分区各按钮名、她怎么称呼你、相处边界、取消修改/保存/重试保存、.kv/.ev/.list/.grp/.city-list/.svc、关闭日子/关闭设置、has-detail 类串)保持不变。静态自查不等于构建或测试通过。", + "待总工执行:cd web && npm ci && npm run typecheck && npm run lint && npm test && npm run build;PYTHONPATH=src python3.12 web/tests/{browser_check,import_check,real_browser_check,rework_browser_check}.py;python3 scripts/check_requirements.py --base-ref origin/main --handoff docs/requirements/handoff-HEL-823.json 及实际目标引用;git diff --check;并补 1600×1000、1024、390×844、320×568、390×430 两主题截图。" + ] +} diff --git a/web/src/adapters/storage.ts b/web/src/adapters/storage.ts index fe5d870..8b181c4 100644 --- a/web/src/adapters/storage.ts +++ b/web/src/adapters/storage.ts @@ -28,7 +28,7 @@ export function parseState(text: string, sameIdentity?: Identity): DemoState { if (!messages.every(m => object(m) && str(m.id, 100) && ['user', 'companion'].includes(String(m.role)) && str(m.text) && strings(m.lifeIds) && (!m.status || ['pending', 'failed', 'sent', 'cancelled'].includes(String(m.status))))) throw new Error('聊天记录不完整。'); // Reconstruct the schema: do not preserve arbitrary imported object keys/prototypes. - return { version: 1, identity: { id: i.id, name: i.name, birth: i.birth, hour: i.hour, relation: i.relation as Identity['relation'], nickname: i.nickname, boundary: i.boundary }, settings: { city: s.city, appearance: s.appearance, reduced: s.reduced, services: Object.fromEntries(Object.keys(defaultSettings.services).map(k => [k, String((s.services as Record)[k] || '')])) }, events: events.map(e => { const v = e as DemoState['events'][number]; return { id: v.id, title: v.title, text: v.text, time: v.time, place: v.place, kind: v.kind, shared: v.shared === true, memoryIds: [...v.memoryIds] }; }), memories: memories.map(m => { const v = m as DemoState['memories'][number]; return { id: v.id, title: v.title, text: v.text, group: v.group, source: v.source, lifeIds: [...v.lifeIds] }; }), messages: messages.map(m => { const v = m as DemoState['messages'][number]; return { id: v.id, role: v.role, text: v.text, lifeIds: [...v.lifeIds], status: v.status === 'pending' ? 'cancelled' : v.status, turnId: typeof v.turnId === 'string' ? v.turnId : undefined, proactive: v.proactive === true }; }), lastVisit: typeof x.lastVisit === 'number' ? x.lastVisit : Date.now() }; + return { version: 1, identity: { id: i.id, name: i.name, birth: i.birth, hour: i.hour, relation: i.relation as Identity['relation'], nickname: i.nickname, boundary: i.boundary }, settings: { city: s.city, appearance: s.appearance, reduced: s.reduced, services: Object.fromEntries(Object.keys(defaultSettings.services).map(k => [k, String((s.services as Record)[k] || '')])) }, events: events.map(e => { const v = e as DemoState['events'][number]; return { id: v.id, title: v.title, text: v.text, time: v.time, place: v.place, kind: v.kind, shared: v.shared === true, ...(v.shared === true && str(v.told, 100) ? { told: v.told } : {}), memoryIds: [...v.memoryIds] }; }), memories: memories.map(m => { const v = m as DemoState['memories'][number]; return { id: v.id, title: v.title, text: v.text, group: v.group, source: v.source, lifeIds: [...v.lifeIds] }; }), messages: messages.map(m => { const v = m as DemoState['messages'][number]; return { id: v.id, role: v.role, text: v.text, lifeIds: [...v.lifeIds], status: v.status === 'pending' ? 'cancelled' : v.status, turnId: typeof v.turnId === 'string' ? v.turnId : undefined, proactive: v.proactive === true }; }), lastVisit: typeof x.lastVisit === 'number' ? x.lastVisit : Date.now() }; } export function loadState(): { state: DemoState | null; diff --git a/web/src/app/App.tsx b/web/src/app/App.tsx index be49f4f..b0cbf80 100644 --- a/web/src/app/App.tsx +++ b/web/src/app/App.tsx @@ -20,6 +20,7 @@ export function App() { catch { return 'moon'; } }), [toast, setToast] = useState(''), [controls, setControls] = useState(false), [fail, setFail] = useState(false), [offline, setOffline] = useState(false), [reconnecting, setReconnecting] = useState(false), [welcome, setWelcome] = useState(!!initial.state && Date.now() - initial.state.lastVisit > 86400000), [reach, setReach] = useState(false), [unread, setUnread] = useState(false), [log, setLog] = useState(false), [focusLife, setFocusLife] = useState(''), [returnTo, setReturnTo] = useState('now'), [presence, setPresence] = useState('在你面前'), [voice, setVoice] = useState(false), [observation, setObservation] = useState(''), [record, setRecord] = useState(false), [instant, setInstant] = useState(0); + const [herFocus, setHerFocus] = useState(0); const latest = useRef(state); latest.current = state; const toastTimer = useRef | null>(null), reconnectTimer = useRef | null>(null); @@ -107,14 +108,14 @@ export function App() { // The reference still is not her new daily life (reading is no longer the default, 01a166aa): say only where she is. const scene = { mode: area === 'talk' ? 'talk' as const : 'daily' as const, activity: view?.events.length ? '在窗边待着' : '刚搬进来,安静待着', time_band: 'evening', weather: 'demo', outfit: 'home' }; const talking = area === 'talk'; - return <> navigate('talk')}/> + return <> navigate('talk')}/>
{state?.identity.name || 'CyberGril'}{state && !creating && {talking ? presence : scene.activity}}{demo ? '本机演示 · 无真实后台' : '服务尚未接通'}
{state?.settings.city || '杭州'}雨后 · 模拟{(['moon', 'fog'] as Theme[]).map(t => )}{talking && state && }
{!demo ?

一扇亮着的窗。

真实服务还在准备,当前没有连接对话、生活、记忆或备份后台。你可以先体验完整的本机演示。

进入本机演示
: initial.error ?

资料暂时读不出来

请先检查浏览器存储权限,或备份浏览器中的原始资料后再处理。不会自动清空或覆盖。

: <> {creating && setCreating(false)}/>} {!creating && state && view && <> {area === 'now' && !welcome &&
夜色里 · 一扇亮着的窗

{state.events.length ? '夜深了,慢慢说。' : '刚住进来,一切都慢慢来。'}

心情平静 · 演示{state.identity.relation} · 慢慢熟悉
{view.messages.filter(m => m.role === 'companion').length > 0 && }

{state.identity.name}今晚刚住进来。这里还没有共同的日子。

本机演示 · 没有真实后台生活

} {welcome && area === 'now' &&
回来坐一会儿

你不在的这两天

固定演示摘要 · 只展示已分享记录

    {view.events.filter(e => e.kind !== 'plan').slice(0, 3).map(e =>
  • {e.title}
  • )}

演示中网页关闭不会产生新的生活,服务器后台尚未接通。

} - navigate('now')} onChat={openEventChat}/> navigate('now')} onSave={save} fail={fail} theme={theme} setTheme={setTheme}/> + navigate('now')} onChat={openEventChat} onSettings={() => { navigate('settings'); setHerFocus(n => n + 1); }}/> navigate('now')} onSave={save} fail={fail} theme={theme} setTheme={setTheme}/> {talking && } {offline &&
{reconnecting ? '信号不太好,正在重新连上…' : '模拟断线,草稿还在'}
} {reach && } diff --git a/web/src/app/RealApp.tsx b/web/src/app/RealApp.tsx index ad92c89..f94e88c 100644 --- a/web/src/app/RealApp.tsx +++ b/web/src/app/RealApp.tsx @@ -14,6 +14,7 @@ import { spaceFor, useSpace } from '../shared/space'; export function RealApp() { const [state, setState] = useState(null), [ready, setReady] = useState(false), [creating, setCreating] = useState(false), [error, setError] = useState(''), [health, setHealth] = useState(), [area, setArea] = useState('now'), [log, setLog] = useState(false), [presence, setPresence] = useState('文字已接通'), [record, setRecord] = useState(false), [instant, setInstant] = useState(0); const [theme, setTheme] = useState(() => { try { return localStorage.getItem('cg.theme') === 'fog' ? 'fog' : 'moon'; } catch { return 'moon'; } }); + const [herFocus, setHerFocus] = useState(0); const latest = useRef(state); latest.current = state; const initialize = useCallback(async () => { setError(''); setReady(false); @@ -33,15 +34,15 @@ export function RealApp() { useEffect(() => { const key = (e: KeyboardEvent) => { if (e.key !== 'Escape' || creating) return; if (log) { setLog(false); return; } if (area === 'talk') { snap(); setInstant(i => i + 1); setArea('now'); return; } if (area !== 'now') navigate('now'); }; window.addEventListener('keydown', key); return () => window.removeEventListener('keydown', key); }, [creating, log, navigate, area]); const lastReply = state ? [...state.messages].reverse().find(m => m.role === 'companion') : undefined; const talking = area === 'talk' && !!state && !creating; - return <> navigate('talk')}/> + return <> navigate('talk')}/>
{state?.identity.name || 'CyberGril'}{talking && {presence}}{ready ? '真实档案 · 文字对话' : '连接真实服务'}
天气尚未接通{(['moon', 'fog'] as Theme[]).map(t => )}{talking && }
{!ready ?

一扇亮着的窗。

{error && <>

请检查真实服务是否可达。资料仍在服务器保存。

}
: <> {creating && setCreating(false)}/>} {!creating && state && <> {area === 'now' &&
一扇亮着的窗

慢慢说,我在这里。

{state.identity.relation} · 慢慢熟悉
{lastReply && }

资料与聊天已保存在服务器。生活、长期记忆与语音尚未接通。

{health && !health.llm.ok && }
} {area === 'talk' && } - navigate('now')} onChat={() => { navigate('talk'); setLog(true); }}/> - navigate('now')} onSave={setState} fail={false} theme={theme} setTheme={setTheme}/> + navigate('now')} onChat={() => { navigate('talk'); setLog(true); }} onSettings={() => { navigate('settings'); setHerFocus(n => n + 1); }}/> + navigate('now')} onSave={setState} fail={false} theme={theme} setTheme={setTheme}/> } }; } diff --git a/web/src/demo/fixtures.ts b/web/src/demo/fixtures.ts index 3f30708..dcf6fc9 100644 --- a/web/src/demo/fixtures.ts +++ b/web/src/demo/fixtures.ts @@ -5,11 +5,11 @@ export function freshState(identity: Identity): DemoState { // Loaded only through an explicit demo action; never a fabricated background life loop. export function sampleDays(state: DemoState, long = false): DemoState { const events: DemoState['events'] = [ - { id: 'book', title: '读到了书里的那片海', text: '翻到讲海的那一页,忽然想起你说过喜欢安静的地方。', time: '10月21日 19:40', place: '卧室 · 窗边', kind: 'now', shared: true, memoryIds: ['habit'] }, - { id: 'tea', title: '给自己泡了一杯热茶', text: '杯子捧在手里,夜晚就慢了下来。', time: '10月21日 16:20', place: '卧室', kind: 'done', shared: true, memoryIds: [] }, - { id: 'rain', title: '听了一下午的雨', text: '雨滴在玻璃上跑得一快一慢,很像一段没有歌词的曲子。', time: '10月20日 15:30', place: '卧室 · 窗边', kind: 'done', shared: true, memoryIds: ['rain-memory'] }, + { id: 'book', title: '读到了书里的那片海', text: '翻到讲海的那一页,忽然想起你说过喜欢安静的地方。', time: '10月21日 19:40', place: '卧室 · 窗边', kind: 'now', shared: true, told: '19:46 告诉你', memoryIds: ['habit'] }, + { id: 'tea', title: '给自己泡了一杯热茶', text: '杯子捧在手里,夜晚就慢了下来。', time: '10月21日 16:20', place: '卧室', kind: 'done', shared: true, told: '16:40 告诉你', memoryIds: [] }, + { id: 'rain', title: '听了一下午的雨', text: '雨滴在玻璃上跑得一快一慢,很像一段没有歌词的曲子。', time: '10月20日 15:30', place: '卧室 · 窗边', kind: 'done', shared: true, told: '17:05 留言给你', memoryIds: ['rain-memory'] }, { id: 'secret', title: '未分享的秘密散步', text: '这段未分享的生活不能出现在任何视图里。', time: '10月21日 13:00', place: '私密地点', kind: 'done', shared: false, memoryIds: ['secret-memory'] }, - { id: 'plan', title: '明天想读完这一章', text: '如果精神好,就再读一会儿。计划也可能会变。', time: '10月22日 20:00', place: '卧室', kind: 'plan', shared: true, memoryIds: [] } + { id: 'plan', title: '明天想读完这一章', text: '如果精神好,就再读一会儿。计划也可能会变。', time: '10月22日 20:00', place: '卧室', kind: 'plan', shared: true, told: '10月21日 21:10 告诉你', memoryIds: [] } ]; if (long) for (let i = 0; i < 40; i++) diff --git a/web/src/domain/model.ts b/web/src/domain/model.ts index 736af98..aec0668 100644 --- a/web/src/domain/model.ts +++ b/web/src/domain/model.ts @@ -23,6 +23,8 @@ export interface LifeEvent { place: string; kind: 'done' | 'now' | 'plan'; shared: boolean; + // When and how she told you ("19:34 告诉你", "你们一起经历的"); only ever present on records she has shared. + told?: string; memoryIds: string[]; } export interface Memory { diff --git a/web/src/life/LifePanel.tsx b/web/src/life/LifePanel.tsx index c3d045c..3fe9b3a 100644 --- a/web/src/life/LifePanel.tsx +++ b/web/src/life/LifePanel.tsx @@ -1,16 +1,27 @@ -import { useEffect, useRef, useState } from 'react'; -import type { DemoState } from '../domain/model'; +import { useEffect, useLayoutEffect, useRef, useState } from 'react'; +import type { DemoState, LifeEvent, Memory } from '../domain/model'; import { publicView } from '../domain/privacy'; import { Button, Icon } from '../shared/ui'; -export function LifePanel({ state, open, onClose, onChat, real = false }: { +import { delay } from '../adapters/demo'; +// HEL-815 page design: a page lying on your side of the table while the room steps back. Only what she has already +// told you is ever rendered (AM-001), so there is no "not told yet" label, filter or switch anywhere; any link the +// client cannot resolve opens one neutral "can't open" state that reveals nothing about whether the record exists. +const KIND = { plan: '打算', now: '正在', done: '已经发生' } as const; +const MEMORY_GROUPS = ['我们一起的', '你们的小习惯', '她知道的你', '她的成长']; +const phone = () => matchMedia('(max-width:720px)').matches; +type Load = 'ok' | 'loading' | 'error'; +export function LifePanel({ state, open, onClose, onChat, onSettings, now = '', fail = false, real = false }: { real?: boolean; state: DemoState; open: boolean; + now?: string; + fail?: boolean; onClose: () => void; onChat: (id: string) => void; + onSettings?: () => void; }) { - const view = publicView(state), [tab, setTab] = useState('life'), [selection, setSelection] = useState(''), [limit, setLimit] = useState(18); - const list = useRef(null); + const view = publicView(state), [tab, setTab] = useState('life'), [selection, setSelection] = useState(''), [limit, setLimit] = useState(18), [load, setLoad] = useState('ok'), [more, setMore] = useState(false); + const list = useRef(null), detail = useRef(null), scroll = useRef>({}), wasOpen = useRef(false), request = useRef(null); useEffect(() => { if (open) { const params = new URLSearchParams(location.hash.slice(1)); const id = params.get('event'); @@ -19,9 +30,73 @@ export function LifePanel({ state, open, onClose, onChat, real = false }: { setSelection(id); } } }, [open]); + // Demo only: the failure switch shows how a list that could not be read looks; nothing real is requested. + useEffect(() => { if (open && !wasOpen.current && !real) setLoad(fail ? 'error' : 'ok'); wasOpen.current = open; if (!open) { request.current?.abort(); setMore(false); } }, [open, fail, real]); + useEffect(() => () => request.current?.abort(), []); + async function retry() { request.current?.abort(); const c = new AbortController(); request.current = c; setLoad('loading'); try { await delay(600, c.signal); setLoad(fail ? 'error' : 'ok'); } catch { /* Closed or replaced. */ } } + async function earlier() { request.current?.abort(); const c = new AbortController(); request.current = c; setMore(true); try { await delay(real ? 0 : 450, c.signal); setLimit(x => x + 12); } catch { /* Closed. */ } finally { if (!c.signal.aborted) setMore(false); } } + // Each tab keeps its own reading position; switching back lands where you left it. + // A hidden panel is display:none, which drops its scroll offset; reopening (e.g. "结束交谈 · 回到日子") puts it back. + useLayoutEffect(() => { if (list.current && open) list.current.scrollTop = scroll.current[tab] || 0; }, [tab, open]); + useLayoutEffect(() => { if (detail.current) detail.current.scrollTop = 0; }, [selection, tab]); + const switchTab = (t: string) => { if (list.current) scroll.current[tab] = list.current.scrollTop; setTab(t); setSelection(''); }; + const select = (id: string, t = tab) => { if (t !== tab) switchTab(t); setSelection(id); }; + // Esc on a phone closes the pushed detail first; the app then closes the panel on the next press. + useEffect(() => { if (!open || !selection) return; const key = (e: KeyboardEvent) => { if (e.key !== 'Escape' || !phone() || document.querySelector('.modal.open')) return; e.stopImmediatePropagation(); setSelection(''); }; window.addEventListener('keydown', key, true); return () => window.removeEventListener('keydown', key, true); }, [open, selection]); + const ordered = [...view.events.filter(e => e.kind === 'plan'), ...view.events.filter(e => e.kind !== 'plan')], shown = ordered.slice(0, limit); + const day = (e: LifeEvent) => e.kind === 'plan' ? '她说过的打算' : e.time.split(' ')[0]; const event = tab === 'life' ? view.events.find(e => e.id === selection) : undefined, memory = tab === 'memory' ? view.memories.find(m => m.id === selection) : undefined; - const select = (id: string, t = tab) => { setTab(t); setSelection(id); }; - return ; + const name = view.identity.name, demoTag = !real && 演示数据; + const lines = (e: LifeEvent) => view.messages.filter(m => m.lifeIds.includes(e.id)); + const said = (who: string, text: string) =>
{who}{text}
; + const linkCard = (key: string, title: string, sub: string, go: () => void) => ; + function eventView(e: LifeEvent) { + const mems = e.memoryIds.map(id => view.memories.find(m => m.id === id)).filter((m): m is Memory => !!m), chat = lines(e); + return <> +
{KIND[e.kind]} · {e.time} · {e.place}
+

{e.title}

+

{e.told ? `她在 ${e.told}` : '她讲给你听过的事'}{e.kind === 'plan' ? ' · 计划可能会变' : ''}

+ {said(name, e.text)} + {mems.length > 0 && <>
和这件事有关的回忆
{mems.map(m => linkCard(m.id, m.title, m.source, () => select(m.id, 'memory')))}
} +
那时候的聊天
+ {chat.length ?
{chat.map(m =>

{m.role === 'user' ? '你' : name}{m.text}

)}
:

那时候没有留下聊天记录。

} + +
{demoTag}这是模拟生活里的一条记录,不是真实发生的事。画面只按记录选片,不会反过来改写她的生活。
+ ; + } + function memoryView(m: Memory) { + const from = m.lifeIds.map(id => view.events.find(e => e.id === id)).filter((e): e is LifeEvent => !!e); + return <> +
{m.group} · {m.source}
+

{m.title}

+

她是这样记得的

+ {said(name, m.text)} + {m.group === '她的成长' &&

这是后来慢慢有的。成长单独记录,不改写她最初的底色。{onSettings && }

} +
来自这些日子
+ {from.length ?
{from.map(e => linkCard(e.id, e.title, e.time, () => select(e.id, 'life')))}
:

这条回忆来自你们的日常聊天,没有对应的某一天。

} +
{demoTag}回忆由她在相处中整理,只引用她讲过的日子。
+ ; + } + const failed =

这几天的事一时没翻出来。

不是你的问题,记录也没有丢。

; + const skeleton = (n: number) => ; + function lifeList() { + if (load === 'loading') return <>

正在翻她的日子…

{skeleton(6)}; + if (load === 'error') return failed; + if (!view.events.length) return
{real ? '还没有可展示的生活记录' : '她今晚刚住进来,还没有发生什么。'}{real ? '生活后台尚未接通,不用示例经历填充。你们说过的话可在交谈的完整记录中查看。' : '等她跟你讲起,日子会一条条留在这里。演示资料可以从「演示场景」载入。'}
; + return <>{shown.map((e, i) =>
{(i === 0 || day(shown[i - 1]) !== day(e)) &&
{day(e)}
}
)} + {more ?

正在翻更早的日子…

: limit < ordered.length ?
:

再往前,就是她刚住进来的那天了。

}; + } + function memoryList() { + if (load === 'loading') return skeleton(5); + if (load === 'error') return failed; + if (!real && !view.memories.length) return
还没有共同的回忆。聊着聊着就会有了。
; + return MEMORY_GROUPS.map(group => { const items = view.memories.filter(m => m.group === group); return
{group}{!real && {items.length}}
{real &&
暂无可核实的回忆长期记忆尚未接通;文字聊天记录独立保留。
}{items.map(m => )}
; }); + } + const blank = load !== 'ok' || (tab === 'life' ? !view.events.length : !view.memories.length); + return ; } diff --git a/web/src/manage/CreationWizard.tsx b/web/src/manage/CreationWizard.tsx index 7c9c634..e20c4aa 100644 --- a/web/src/manage/CreationWizard.tsx +++ b/web/src/manage/CreationWizard.tsx @@ -1,32 +1,55 @@ import { api, type Color, type RealIdentity } from '../adapters/real'; import { newId } from '../domain/id'; -import { useState } from 'react'; +import { useEffect, useRef, useState } from 'react'; import { validateCreation, type Identity } from '../domain/model'; import { freshState } from '../demo/fixtures'; import { delay } from '../adapters/demo'; -import { BaseColor, Button, Field, Status } from '../shared/ui'; +import { BaseColor, Button, Field, Icon, Status } from '../shared/ui'; import type { DemoState } from '../domain/model'; +const HOURS = ['子时', '丑时', '寅时', '卯时', '辰时', '巳时', '午时', '未时', '申时', '酉时', '戌时', '亥时']; +// A random birthday she could have: an adult of 19–35, any month, a day every month has, any hour. +function randomBirth(now = new Date()) { + const pick = (n: number) => Math.floor(Math.random() * n); + return { birth: `${now.getFullYear() - 19 - pick(17)}-${String(1 + pick(12)).padStart(2, '0')}-${String(1 + pick(28)).padStart(2, '0')}`, hour: HOURS[pick(12)] }; +} +// What the left-hand story says at each moment of the first meeting (HEL-815). +const STORY: Record = { + 0: ['先给她一个名字,和一个属于她的生日。', '名字由你来起。生日可以随机,也可以由你指定。'], + 1: ['这是她出生时带来的底色。', '底色只读。她以后的样子,由你们的相处慢慢长出来。'], + 2: ['你们从什么关系开始?', '不替你选。以后也可以在设置里调整。'], + 3: ['确认之后,她就住进来了。', '这件事只会发生一次。'], + run: ['她在收拾东西,马上就好。', '窗外的灯一直亮着。'], + fail: ['差一点就好了。', '你填的都还在。'], + 4: ['她住进来了。', '去看看她吧。'] +}; +const RELATIONS: [string, string][] = [['朋友', '像朋友一样相处,慢慢熟起来。'], ['恋人', '从恋人开始,彼此更亲近一些。']]; export function CreationWizard({ onCreate, onEnter, fail, real = false }: { real?: boolean; onCreate: (s: DemoState) => void; onEnter: () => void; fail: boolean; }) { - const [step, setStep] = useState(0), [name, setName] = useState(''), [birth, setBirth] = useState('2000-10-18'), [hour, setHour] = useState('亥时'), [relation, setRelation] = useState(''), [nickname, setNickname] = useState(''), [agreed, setAgreed] = useState(false), [error, setError] = useState(''), [phase, setPhase] = useState(-1), [busy, setBusy] = useState(false); + const [initial] = useState(randomBirth); + const [step, setStep] = useState(0), [name, setName] = useState(''), [birth, setBirth] = useState(initial.birth), [hour, setHour] = useState(initial.hour), [how, setHow] = useState<'random' | 'pick'>('random'), [relation, setRelation] = useState(''), [nickname, setNickname] = useState(''), [boundary, setBoundary] = useState(''), [agreed, setAgreed] = useState(false), [error, setError] = useState(''), [phase, setPhase] = useState(-1), [busy, setBusy] = useState(false), [back, setBack] = useState(false); const [color, setColor] = useState(); + const nameField = useRef(null), birthField = useRef(null), relationGroup = useRef(null); const labels = ['出生资料', '她的底色', '你们的关系', '最终确认']; + const field = error.includes('名字') ? 'name' : error.includes('出生') ? 'birth' : error.includes('关系') ? 'relation' : ''; + // A rejected step puts the cursor where the problem is, so the next key fixes it. + useEffect(() => { if (field === 'name') nameField.current?.focus(); else if (field === 'birth') birthField.current?.focus(); else if (field === 'relation') relationGroup.current?.querySelector('button')?.focus(); }, [field, error]); + const go = (to: number) => { setBack(to < step); setStep(to); }; async function next() { const err = validateCreation(name, birth, step === 2 ? relation : '朋友'); if (err) { setError(err); return; - } setError(''); if (real && step === 0) { setBusy(true); try { setColor(await api('companion/preview', { method: 'POST', body: JSON.stringify({ name, birth, hour }) })); } catch (e) { setError((e as Error).message); return; } finally { setBusy(false); } } setStep(s => s + 1); } + } setError(''); if (real && step === 0) { setBusy(true); try { setColor(await api('companion/preview', { method: 'POST', body: JSON.stringify({ name, birth, hour }) })); } catch (e) { setError((e as Error).message); return; } finally { setBusy(false); } } go(step + 1); } async function create() { const err = validateCreation(name, birth, relation); if (err || !agreed) { setError(err || '请先确认你已了解。'); return; } setBusy(true); setError(''); try { if (real) { setPhase(0); - const identity = await api('companion', { method: 'POST', body: JSON.stringify({ name, birth, hour, relation, nickname }) }); - setPhase(2); onCreate({ ...freshState(identity), messages: [], events: [], memories: [] }); setStep(4); return; + const identity = await api('companion', { method: 'POST', body: JSON.stringify({ name, birth, hour, relation, nickname, ...(boundary.trim() ? { boundary: boundary.trim() } : {}) }) }); + setPhase(2); onCreate({ ...freshState(identity), messages: [], events: [], memories: [] }); go(4); return; } const c = new AbortController(); for (let p = 0; p < 3; p++) { @@ -35,9 +58,9 @@ export function CreationWizard({ onCreate, onEnter, fail, real = false }: { if (fail && p === 1) throw new Error('这一步没完成,资料都还在。可以重试,或返回修改。'); } - const identity: Identity = { id: newId(), name: name.trim(), birth, hour, relation: relation as Identity['relation'], nickname: nickname.trim(), boundary: '尊重彼此的节奏' }; + const identity: Identity = { id: newId(), name: name.trim(), birth, hour, relation: relation as Identity['relation'], nickname: nickname.trim(), boundary: boundary.trim() || '尊重彼此的节奏' }; onCreate(freshState(identity)); - setStep(4); + go(4); } catch (e) { setError((e as Error).message); @@ -45,11 +68,20 @@ export function CreationWizard({ onCreate, onEnter, fail, real = false }: { finally { setBusy(false); } } - return
一扇窗 · 一个开始

{step === 4 ? '她住进来了。' : step === 2 ? '你想和她,怎样相处?' : '在夜色里,留一盏灯。'}

{real ? '资料与对话保存在服务器,重开或换设备都能恢复同一位她。最终确认前不会建档。' : '这是本机演示。你的选择只保存在这个浏览器,没有创建服务器上的真实伴侣。'}

首版只有一位。创建后不提供切换或清空重建。
{labels.map((l, i) => )}
{step < 4 ? `${step + 1} / 4 · ${labels[step]}` : '创建完成'}
- {step === 0 && <>

先认识她的开始

名字由你起,生辰也可以在确认前修改。

setName(e.target.value)} autoComplete="off"/> setBirth(e.target.value)}/>} - {step === 1 && <>

{name.trim()}的底色

底色是倾向,会留下诠释和成长的空间。

} - {step === 2 && <>

由你选择关系

没有预选答案。以后可以在设置中确认修改,记忆会保留。

{['朋友', '恋人'].map(r => )}
setNickname(e.target.value)}/>} - {step === 3 && <>

让这次相识,有一个开始

{[['名字', name], ['生辰', `${birth} · ${hour}`], ['关系', relation], ['称呼', nickname || '暂时不设']].map(([k, v]) =>
{k}{v}
)}
{phase >= 0 &&
    {(real ? ['核对真实排盘', '保存唯一档案', '档案已保存'] : ['排好底色(示例)', '形成最初的小习惯(示例)', '布置房间(示例)']).map((p, i) =>
  • {i < phase ? '✓' : ''}{p}
  • )}
}} - {step === 4 &&

{name.trim()}住进来了

刚开始,还没有共同的日子。聊着聊着就会有了。

} -
{step > 0 && step < 4 && }{step < 3 ? : step === 3 ? : }
; + const reroll = () => { const r = randomBirth(); setBirth(r.birth); setHour(r.hour); setHow('random'); setError(''); }; + const [y, m, d] = birth.split('-'); + const story = STORY[step === 4 ? 4 : step === 3 && phase >= 0 ? (error ? 'fail' : busy ? 'run' : 3) : step]; + // One companion only: the server refuses a second (409). Reopening restores the one that exists; nothing is overwritten. + const exists = real && error.includes('已经有一位她'); + return
初次见面{step < 4 ? ` · 第 ${step + 1} 步,共 4 步` : ' · 第一晚'}

{story[0]}

{story[1]}

{real ? '资料与对话保存在服务器,重开或换设备都能恢复同一位她。最终确认前不会建档。' : '这是本机演示。你的选择只保存在这个浏览器,没有创建服务器上的真实伴侣。'}

首版只有一位。创建后不提供切换或清空重建。
{labels.map((l, i) => )}
{step < 4 ? `${step + 1} / 4 · ${labels[step]}` : '创建完成'}
+ {step === 0 && <>

先认识她的开始

名字由你起,生辰也可以在确认前修改。

setName(e.target.value)} autoComplete="off"/> +
她的生日
{([['random', '随机生成'], ['pick', '我来指定']] as const).map(([k, l]) => )}
+
{ setBirth(e.target.value); setHow('pick'); }}/>
+

公历{y || '—'} 年 {Number(m) || '—'} 月 {Number(d) || '—'} 日 · {hour}

农历与四柱{real ? '下一步由排盘计算' : '演示不排盘'}

+

{how === 'random' ? '已随机生成。可以再随机一次,或换成「我来指定」。' : '确认前都可以改。'}

} + {step === 1 && <>

{name.trim()}的底色

这是倾向,不是台词。她会怎样理解自己、长成什么样,由她在相处和生活里慢慢形成,不按固定模板。

} + {step === 2 && <>

由你选择关系

没有预选答案。以后可以在设置中确认修改,记忆会保留。

{RELATIONS.map(([r, text]) => )}
setNickname(e.target.value)}/>