@@ -28,12 +28,18 @@ window.__ModuleLoader__.load({
2828 }
2929
3030 // #177 词级 diff:经典 LCS 对齐——删除片段标红、新增标绿、公共部分原样。
31- // 中文按字符切分、拉丁词按单词切分(Unicode 分段),CJK 无空格文本同样有
32- // 词粒度效果 。相邻同侧片段合并成 run。输入先截 800 字符;O(n·m) DP 仅在
33- // 小文本启用 (任一侧 > 800 词或 edit run > 200 时返回 null),caller 退回
34- // 原文展示 ,不为极端文本烧内存。
31+ // 分词两段式:Han 段先切出再逐字打散(\p{L} 把整句中文当一个词,必须单列),
32+ // 其余按 Unicode 词边界(拉丁按词、标点独立) 。相邻同侧片段合并成 run。
33+ // 输入先截 800 字符;O(n·m) DP 仅在小文本启用 (任一侧 > 800 词或 edit run
34+ // > 200 时返回 null),caller 退回原文展示 ,不为极端文本烧内存。
3535 function wordDiff ( aText , bText ) {
36- const tokenize = ( s ) => ( s || "" ) . split ( / (? = [ ^ \p{ L} \p{ N} ] ) | (?< = [ ^ \p{ L} \p{ N} ] ) / u) . filter ( Boolean ) ;
36+ const HAN = / ^ [ \u{3400} - \u{4DBF} \u{4E00} - \u{9FFF} \u{F900} - \u{FAFF} ] + $ / u;
37+ const tokenize = ( s ) => ( s || "" )
38+ . split ( / ( [ \u{3400} - \u{4DBF} \u{4E00} - \u{9FFF} \u{F900} - \u{FAFF} ] + ) / u)
39+ . filter ( Boolean )
40+ . flatMap ( ( seg ) => HAN . test ( seg )
41+ ? [ ...seg ]
42+ : seg . split ( / (? = [ ^ \p{ L} \p{ N} ] ) | (?< = [ ^ \p{ L} \p{ N} ] ) / u) . filter ( Boolean ) ) ;
3743 const a = tokenize ( ( aText || "" ) . slice ( 0 , 800 ) ) , b = tokenize ( ( bText || "" ) . slice ( 0 , 800 ) ) ;
3844 const n = a . length , m = b . length ;
3945 if ( n === 0 && m === 0 ) return null ;
@@ -1286,6 +1292,8 @@ window.__ModuleLoader__.load({
12861292 ".mneme-conflict-empty-body{font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary)}" ,
12871293 ".mneme-statuscard--actionable{border-color:color-mix(in srgb,var(--dsw-alias-state-warning,#e6a23c) 55%,transparent);box-shadow:0 0 0 1px color-mix(in srgb,var(--dsw-alias-state-warning,#e6a23c) 35%,transparent)}" ,
12881294 ".mneme-entrybadge{position:absolute;top:-3px;right:-3px;min-width:16px;height:16px;padding:0 4px;border-radius:8px;background:var(--dsw-alias-state-error,#c33);color:var(--dsw-alias-bg-layer-1,#fff);font-size:10.5px;line-height:16px;font-weight:600;text-align:center;box-shadow:0 0 0 2px var(--dsw-alias-bg-layer-1)}" ,
1295+ ".mneme-triggerwrap{position:relative;pointer-events:none}" ,
1296+ ".mneme-triggerwrap .mneme-trigger{pointer-events:auto}" ,
12891297 ".mneme-conflict-jump .mneme-statuscard{border-color:color-mix(in srgb,var(--dsw-alias-state-warning,#e6a23c) 55%,transparent);box-shadow:0 0 0 1px color-mix(in srgb,var(--dsw-alias-state-warning,#e6a23c) 35%,transparent)}" ,
12901298 ".mneme-conflict-jump:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:2px;border-radius:12px}" ,
12911299 // 详情抽屉:sheet 内右侧滑出,覆盖在浏览区之上
@@ -3159,19 +3167,25 @@ window.__ModuleLoader__.load({
31593167 const [ state , setState ] = useState ( { loading : true , error : false , lastRun : null , pending : 0 } ) ;
31603168 useEffect ( ( ) => {
31613169 let cancelled = false ;
3162- apiFetch ( "/api/dsh-mneme/dream-status" )
3163- . then ( ( res ) => { if ( ! res . ok ) throw new Error ( "http" ) ; return res . json ( ) ; } )
3164- . then ( ( d ) => {
3165- if ( cancelled ) return ;
3166- setState ( {
3167- loading : false ,
3168- error : false ,
3169- lastRun : ( d && d . lastRun ) || null ,
3170- pending : Number ( ( d && d . pendingConflicts ) ?? 0 )
3171- } ) ;
3172- } )
3173- . catch ( ( ) => { if ( ! cancelled ) setState ( { loading : false , error : true , lastRun : null , pending : 0 } ) ; } ) ;
3174- return ( ) => { cancelled = true ; } ;
3170+ const loadOnce = ( ) => {
3171+ apiFetch ( "/api/dsh-mneme/dream-status" )
3172+ . then ( ( res ) => { if ( ! res . ok ) throw new Error ( "http" ) ; return res . json ( ) ; } )
3173+ . then ( ( d ) => {
3174+ if ( cancelled ) return ;
3175+ setState ( {
3176+ loading : false ,
3177+ error : false ,
3178+ lastRun : ( d && d . lastRun ) || null ,
3179+ pending : Number ( ( d && d . pendingConflicts ) ?? 0 )
3180+ } ) ;
3181+ } )
3182+ . catch ( ( ) => { if ( ! cancelled ) setState ( { loading : false , error : true , lastRun : null , pending : 0 } ) ; } ) ;
3183+ } ;
3184+ loadOnce ( ) ;
3185+ // #295 评审:裁决完成后队列会广播 mneme:conflicts-changed,这里重取
3186+ // 计数,状态卡的「待确认冲突」不再停留旧值。
3187+ window . addEventListener ( "mneme:conflicts-changed" , loadOnce ) ;
3188+ return ( ) => { cancelled = true ; window . removeEventListener ( "mneme:conflicts-changed" , loadOnce ) ; } ;
31753189 } , [ ] ) ;
31763190 const run = state . lastRun ;
31773191 const num = run ? formatRelativeTime ( run . created_at , t ) : t ( "memory.status.dreamNever" ) ;
@@ -3281,12 +3295,15 @@ window.__ModuleLoader__.load({
32813295 // 队列为空时整块不渲染(不打扰无冲突实例)。
32823296 function ConflictsQueue ( { t } ) {
32833297 const [ items , setItems ] = useState ( null ) ;
3298+ const [ loadError , setLoadError ] = useState ( false ) ;
32843299 const [ busy , setBusy ] = useState ( false ) ;
32853300 const load = ( silent ) => {
32863301 apiFetch ( "/api/dsh-mneme/conflicts" )
32873302 . then ( ( res ) => { if ( ! res . ok ) throw new Error ( "http" ) ; return res . json ( ) ; } )
3288- . then ( ( d ) => { setItems ( d . items || [ ] ) ; if ( ! silent ) announce ( t ( "memory.status.conflictQueue.refreshed" ) ) ; } )
3289- . catch ( ( ) => setItems ( [ ] ) ) ;
3303+ . then ( ( d ) => { setItems ( d . items || [ ] ) ; setLoadError ( false ) ; if ( ! silent ) announce ( t ( "memory.status.conflictQueue.refreshed" ) ) ; } )
3304+ // #295 评审:加载失败 ≠ 没有冲突——错误态渲染错误卡而不是空态教育卡,
3305+ // 不能让 500 把「暂时看不到」伪装成「没有冲突」。
3306+ . catch ( ( ) => { setItems ( [ ] ) ; setLoadError ( true ) ; } ) ;
32903307 } ;
32913308 useEffect ( ( ) => { load ( ) ; } , [ ] ) ;
32923309 // #177:空队列不再整块消失——空态教育卡要渲染(原 return null 已移除)。
@@ -3305,24 +3322,37 @@ window.__ModuleLoader__.load({
33053322 . then ( ( ) => {
33063323 announce ( t ( "memory.status.conflictQueue.resolved" ) . replace ( "{name}" ,
33073324 ( winner === "a" ? ( it . memory_a && it . memory_a . title ) : winner === "b" ? ( it . memory_b && it . memory_b . title ) : "" ) || "" ) ) ;
3325+ // #295 评审:裁决改变了 pending 总数——DreamStatusCards 只在挂载时
3326+ // 读一次 dream-status,不广播的话状态卡停留在旧计数。同页两个组件
3327+ // 用一个 window 事件对齐(比提升状态到 StatusPanel 少动三处)。
3328+ try { window . dispatchEvent ( new CustomEvent ( "mneme:conflicts-changed" ) ) ; } catch { /* 非浏览器环境 */ }
33083329 load ( true ) ;
33093330 } )
33103331 . catch ( ( ) => { } )
33113332 . finally ( ( ) => setBusy ( false ) ) ;
33123333 } ;
3313- const side = ( s , label , sideClass , ops ) => h ( "div" , { className : `mneme-conflict-side ${ sideClass } ` } ,
3334+ const side = ( s , label , sideClass , ops , diffSide ) => h ( "div" , { className : `mneme-conflict-side ${ sideClass } ` } ,
33143335 h ( "div" , { className : "mneme-conflict-sidelabel" } , label ) ,
33153336 s . missing
33163337 ? h ( "div" , { className : "mneme-conflict-missing" } , t ( "memory.status.conflictQueue.missing" ) )
33173338 : h ( react . Fragment , null ,
33183339 h ( "div" , { className : "mneme-conflict-sidetitle" , title : s . title } , s . title || "…" ) ,
3319- // #177:词级 diff 可用(LCS 无损对齐成功)时用高亮视图替代纯文本,
3320- // title 提示颜色语义;否则保留原 snippet。A/B 各渲染整段(diff 同源)。
3340+ // #177:词级 diff 可用(LCS 无损对齐成功)时用高亮视图替代纯文本。
3341+ // 侧别过滤(#295 评审修正):A 侧渲染 same+del(它被删的部分高亮),
3342+ // B 侧渲染 same+ins(它新增的部分高亮)——每列忠实于自己的原文。
3343+ // title 提示颜色语义;diff 不可用时保留原 snippet。
33213344 ops
33223345 ? h ( "div" , { className : "mneme-conflict-diff" , title : t ( "memory.status.conflictQueue.diffTitle" ) } ,
3323- ops . map ( ( o , k ) => o . kind === "same"
3324- ? o . text
3325- : h ( "span" , { key : k , className : `mneme-conflict-mark mneme-conflict-mark--${ o . kind === "del" ? "del" : "ins" } ` } , o . text ) ) )
3346+ ops . map ( ( o , k ) => {
3347+ if ( o . kind === "same" ) return o . text ;
3348+ if ( o . kind === "del" && diffSide === "a" ) {
3349+ return h ( "span" , { key : k , className : "mneme-conflict-mark mneme-conflict-mark--del" } , o . text ) ;
3350+ }
3351+ if ( o . kind === "ins" && diffSide === "b" ) {
3352+ return h ( "span" , { key : k , className : "mneme-conflict-mark mneme-conflict-mark--ins" } , o . text ) ;
3353+ }
3354+ return null ; // 对侧的编辑片段不出现在本列
3355+ } ) )
33263356 : h ( "div" , { className : "mneme-conflict-snippet" } , ( s . content || "" ) . slice ( 0 , 140 ) ) ,
33273357 // #177:预裁决阶段两侧都还活着——「已归档」徽章换成「冻结中」,
33283358 // 原注销记说明(applyHint)挪进 tooltip,不再整段占一行动态区。
@@ -3347,10 +3377,13 @@ window.__ModuleLoader__.load({
33473377 h ( Icon , { name : "refresh" , size : 12 } ) , t ( "memory.status.conflictQueue.refresh" ) ) ) ,
33483378 // #177 空态教育卡:队列没有条目时也渲染(整块此前直接 return null),
33493379 // 解释「什么情况会产生冲突、冻结是什么」——新用户第一次遇见冻结时
3350- // 状态页已有解释在等他。
3351- items . length === 0 && h ( "div" , { className : "mneme-conflict-empty" } ,
3352- h ( "div" , { className : "mneme-conflict-empty-title" } , t ( "memory.status.conflictQueue.emptyTitle" ) ) ,
3353- h ( "div" , { className : "mneme-conflict-empty-body" } , t ( "memory.status.conflictQueue.emptyBody" ) ) ) ,
3380+ // 状态页已有解释在等他。加载失败时显示错误卡而不是空态卡。
3381+ items . length === 0 && ( loadError
3382+ ? h ( "div" , { className : "mneme-conflict-empty" , role : "alert" } ,
3383+ h ( "div" , { className : "mneme-conflict-empty-title" } , t ( "memory.status.error" ) ) )
3384+ : h ( "div" , { className : "mneme-conflict-empty" } ,
3385+ h ( "div" , { className : "mneme-conflict-empty-title" } , t ( "memory.status.conflictQueue.emptyTitle" ) ) ,
3386+ h ( "div" , { className : "mneme-conflict-empty-body" } , t ( "memory.status.conflictQueue.emptyBody" ) ) ) ) ,
33543387 items . map ( ( it ) => {
33553388 const sim = similarityOf ( it . reason ) ;
33563389 const aText = ( it . memory_a && it . memory_a . content ) || "" ;
@@ -3367,8 +3400,8 @@ window.__ModuleLoader__.load({
33673400 h ( "span" , { className : "mneme-conflict-simfill" , style : { width : `${ Math . round ( sim * 100 ) } %` } } ) ) ,
33683401 h ( "span" , null , `${ Math . round ( sim * 100 ) } %` ) ) ,
33693402 h ( "div" , { className : "mneme-conflict-pair" } ,
3370- side ( it . memory_a , t ( "memory.status.conflictQueue.sideA" ) , "mneme-conflict-side--a" , diff ) ,
3371- side ( it . memory_b , t ( "memory.status.conflictQueue.sideB" ) , "mneme-conflict-side--b" , diff ) ) ,
3403+ side ( it . memory_a , t ( "memory.status.conflictQueue.sideA" ) , "mneme-conflict-side--a" , diff , "a" ) ,
3404+ side ( it . memory_b , t ( "memory.status.conflictQueue.sideB" ) , "mneme-conflict-side--b" , diff , "b" ) ) ,
33723405 h ( "div" , { className : "mneme-conflict-actions" } ,
33733406 h ( "span" , { className : "mneme-conflict-hint" , title : t ( "memory.status.conflictQueue.applyHintTitle" ) } ,
33743407 t ( "memory.status.conflictQueue.applyHint" ) ) ,
@@ -4618,18 +4651,22 @@ window.__ModuleLoader__.load({
46184651 }
46194652 function SidebarFallbackTrigger ( { wide, t } ) {
46204653 const pending = useConflictBadgeCount ( t ) ;
4621- return h ( "button" , {
4622- type : "button" ,
4623- className : wide ? "mneme-trigger" : "mneme-trigger mneme-rail" ,
4624- "aria-label" : pending > 0
4625- ? `${ t ( "memory.sidebar.aria" ) } · ${ t ( "memory.status.conflicts" ) } ${ pending } `
4626- : t ( "memory.sidebar.aria" ) ,
4627- title : t ( "memory.panel.open" ) ,
4628- onClick : openLibrary ,
4629- "data-mneme-overlay-opener" : "true"
4630- } ,
4631- h ( IconArchiveOutline20 , { size : wide ? 16 : 18 } ) ,
4632- wide && h ( "span" , { className : "mneme-trigger-label" } , t ( "memory.panel.open" ) ) ,
4654+ // #295 评审:.mneme-trigger 自身 overflow:hidden 且无定位上下文,badge
4655+ // 直接放里面会被裁剪——包一层定位容器,badge 挂在容器上。
4656+ return h ( "div" , { className : "mneme-triggerwrap" } ,
4657+ h ( "button" , {
4658+ type : "button" ,
4659+ className : wide ? "mneme-trigger" : "mneme-trigger mneme-rail" ,
4660+ "aria-label" : pending > 0
4661+ ? `${ t ( "memory.sidebar.aria" ) } · ${ t ( "memory.status.conflicts" ) } ${ pending } `
4662+ : t ( "memory.sidebar.aria" ) ,
4663+ title : t ( "memory.panel.open" ) ,
4664+ onClick : openLibrary ,
4665+ "data-mneme-overlay-opener" : "true"
4666+ } ,
4667+ h ( IconArchiveOutline20 , { size : wide ? 16 : 18 } ) ,
4668+ wide && h ( "span" , { className : "mneme-trigger-label" } , t ( "memory.panel.open" ) )
4669+ ) ,
46334670 h ( ConflictBadge , { pending } )
46344671 ) ;
46354672 }
0 commit comments