dsh-retrace 0.4.148 → 0.4.151
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -14
- package/README.zh.md +18 -10
- package/bin/retrace.mjs +0 -0
- package/lib/adapter/dsh-writer.js +2 -2
- package/lib/adapter/dsh.js +8 -508
- package/lib/archaeology-cli.js +3 -3
- package/lib/boot-pin.js +1 -1
- package/lib/client-i18n.js +22 -13
- package/lib/client.bundle.js +3 -3
- package/lib/client.js +136 -205
- package/lib/close-guard-client.js +2 -2
- package/lib/dynamic-client.js +3 -3
- package/lib/dynamic-host.js +8 -257
- package/lib/host-core.js +2 -193
- package/lib/http.js +3 -132
- package/lib/index.js +365 -862
- package/lib/marker-carrier.js +4 -4
- package/lib/platform/session-paths.js +11 -43
- package/lib/prewrite-guard.js +0 -28
- package/lib/span-semantics.js +1 -1
- package/lib/versioning.js +34 -2
- package/package.json +20 -16
- package/lib/adapter/compaction-backend.js +0 -92
- package/lib/adapter/register-compaction-backend.js +0 -93
- package/lib/auto-fold-scheduler.js +0 -519
- package/lib/badge.js +0 -65
- package/lib/cache-metrics.js +0 -358
- package/lib/context-level.js +0 -139
- package/lib/core-contract.js +0 -77
- package/lib/fold-auto.js +0 -621
- package/lib/fold-boundary.js +0 -1051
- package/lib/fold-core-text.js +0 -52
- package/lib/fold-core.js +0 -191
- package/lib/fold-summary.js +0 -168
- package/lib/hw3-fallback.js +0 -262
- package/lib/identity/code-assign.js +0 -228
- package/lib/identity/dedupe.js +0 -168
- package/lib/identity/shortcode.js +0 -782
- package/lib/identity/sidebar-badge.js +0 -270
- package/lib/identity-check-cli.js +0 -379
- package/lib/ledger-guard.js +0 -491
- package/lib/token-estimate.js +0 -91
package/lib/http.js
CHANGED
|
@@ -64,9 +64,6 @@ import { dshAdapter } from './adapter/dsh.js'
|
|
|
64
64
|
import { isFoldRange, isLoopbackRequest, originAllowed, remoteAllowed, withoutClientSpan } from './request-guard.js'
|
|
65
65
|
// span 显式状态 → 业务层判定输入(与 index.js harness 入口同一处理)
|
|
66
66
|
import { spanMissArgsOf } from './span-semantics.js'
|
|
67
|
-
/* @public-strip:start */
|
|
68
|
-
import { resolveFoldAuto } from './fold-auto.js'
|
|
69
|
-
/* @public-strip:end */
|
|
70
67
|
import { runningSessions, sessionRunningState, guardSurfaceOf } from './close-guard.js'
|
|
71
68
|
import { latestByBoundary, readSummaries, renderSummariesMarkdown } from './summary-store.js'
|
|
72
69
|
import { boundaryTreeOf } from './boundary-tree.js'
|
|
@@ -149,8 +146,7 @@ function sendError(res, error, log = () => {}) {
|
|
|
149
146
|
|
|
150
147
|
/** Route one request. `seam` is the versioning seam (lib/versioning.js). */
|
|
151
148
|
export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback, hooks = {}, log = () => {}, extraOps = {} }) {
|
|
152
|
-
// extraOps = 客户端半会用、但**不在编辑器 API 上**的 op
|
|
153
|
-
// setBadgeTitle / initBadgeTitles / badgeMap)。真回归:
|
|
149
|
+
// extraOps = 客户端半会用、但**不在编辑器 API 上**的 op(标题相关:sessionBadge / badgeMap 等只读接口)。真回归:
|
|
154
150
|
// 这些 op 曾只挂 harness,而 App 走 HTTP ⇒ 客户端 callOp('badgeMap') 拿到 **404**。
|
|
155
151
|
//
|
|
156
152
|
// ⚠️ **不要**把 extraOps 展开进 api:index.js 那边是"先声明 holder、再在更深闭包里
|
|
@@ -460,61 +456,23 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
|
|
|
460
456
|
})
|
|
461
457
|
return
|
|
462
458
|
}
|
|
463
|
-
//
|
|
464
|
-
// (写入器只放行显式用户折叠;自动层走
|
|
459
|
+
// 自动收起默认关闭闸的来源判定:HTTP fold = 客户端用户显式发起 ⇒ 打 userInitiated
|
|
460
|
+
// (写入器只放行显式用户折叠;自动层走 foldOneChunk,不经过这里)。
|
|
465
461
|
if (op === 'fold') args = { ...args, userInitiated: true }
|
|
466
462
|
// 编辑操作前从文件算遮蔽(绕开 host 稀疏 events,用户方案)
|
|
467
463
|
// recall mode 改 tail(遮蔽目标轮及之后全部)——与 index.js harness 入口
|
|
468
464
|
// 同语义(HTTP 入口此前漏改仍 round,两入口分叉违反"编辑走哪个入口都生效")
|
|
469
|
-
/* @public-strip:start */
|
|
470
|
-
if ((op === 'recall' || op === 'editAndResend' || op === 'regenerate' || op === 'fold') && !args?.span) {
|
|
471
|
-
/* @public-strip:else
|
|
472
465
|
if ((op === 'recall' || op === 'editAndResend' || op === 'regenerate') && !args?.span) {
|
|
473
|
-
@public-strip:end */
|
|
474
466
|
try {
|
|
475
|
-
/* @public-strip:start */
|
|
476
|
-
// fold 自动边界/轮首回退统一走 lib/fold-auto.js resolveFoldAuto
|
|
477
|
-
// (与 index.js harness 入口同一实现,零分叉)。
|
|
478
|
-
// 自动边界 = 合格块判定(候选过滤+最小门槛+相邻小块合并);
|
|
479
|
-
// 未达门槛 → 与 harness 入口同文案同错误码(两入口零分叉)。
|
|
480
|
-
if (op === 'fold') {
|
|
481
|
-
const resolved = await resolveFoldAuto({ ...args, sessionId, env: process.env }, dshAdapter, log)
|
|
482
|
-
if (resolved?.foldRejected) {
|
|
483
|
-
const r = resolved.foldRejected
|
|
484
|
-
sendJson(res, 200, {
|
|
485
|
-
ok: false,
|
|
486
|
-
error: {
|
|
487
|
-
code: 'fold-block-below-threshold',
|
|
488
|
-
message: `暂无可折块:最早候选未达块质量门槛(${r.reason};内容节点 ${r.contentNodes}${Number.isFinite(r.minContentNodes) ? ` < ${r.minContentNodes}` : ''},预估释放 ${r.estTokens} token${Number.isFinite(r.minFoldTokens) ? ` < ${r.minFoldTokens}` : ''})——保持现状,等后续内容加入再折`,
|
|
489
|
-
},
|
|
490
|
-
})
|
|
491
|
-
return
|
|
492
|
-
}
|
|
493
|
-
if (resolved?.end !== undefined) args = resolved // 自动边界/回退已解析(可能含 span)
|
|
494
|
-
}
|
|
495
|
-
const target = op === 'fold' ? Number(args?.start) : (typeof args?.seq === 'number' ? args.seq : args?.messageId)
|
|
496
|
-
/* @public-strip:else
|
|
497
467
|
const target = typeof args?.seq === 'number' ? args.seq : args?.messageId
|
|
498
|
-
@public-strip:end */
|
|
499
468
|
if (target !== undefined && target !== null && !args?.span) {
|
|
500
|
-
/* @public-strip:start */
|
|
501
|
-
const mode = op === 'recall' || (op === 'editAndResend' && args?.fromScratch) ? 'tail'
|
|
502
|
-
: op === 'fold' ? 'range'
|
|
503
|
-
: 'round'
|
|
504
|
-
const opts = op === 'fold' ? { endSeq: Number(args?.end) } : undefined
|
|
505
|
-
/* @public-strip:else
|
|
506
469
|
const mode = op === 'recall' || (op === 'editAndResend' && args?.fromScratch) ? 'tail' : 'round'
|
|
507
|
-
@public-strip:end */
|
|
508
470
|
// 与 index.js harness 入口对齐——**单次**
|
|
509
471
|
// spanProbeFromFile(span + 文件快照事实一次读回)。旧实现 spanFromFile
|
|
510
472
|
// 主调 + span null 才补 spanProbeFromFile = 同一请求两次读文件,两次快照
|
|
511
473
|
// 之间文件可能被 flush(TOCTOU:span 与 facts 来自不同快照,判定可能自相
|
|
512
474
|
// 矛盾);一次 probe 结果内部自洽,两入口零分叉。
|
|
513
|
-
/* @public-strip:start */
|
|
514
|
-
const probe = await dshAdapter.spanProbeFromFile(sessionId, target, mode, opts)
|
|
515
|
-
/* @public-strip:else
|
|
516
475
|
const probe = await dshAdapter.spanProbeFromFile(sessionId, target, mode)
|
|
517
|
-
@public-strip:end */
|
|
518
476
|
if (probe?.span) {
|
|
519
477
|
args = { ...args, span: probe.span }
|
|
520
478
|
// regenerate 的重发原文 = 该轮前置
|
|
@@ -531,48 +489,12 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
|
|
|
531
489
|
// `else if (op !== 'fold') {` 那一行上——整行(含收尾 `}` 与开头 `{`)被删掉后,
|
|
532
490
|
// 分支体被上层 if 吸收成死代码(HTTP 入口状态判定全失效,语法却仍合法)。
|
|
533
491
|
// 折叠的分支差异改用**块级替换**(私有分支 / 公开分支各自完整、括号自洽)。
|
|
534
|
-
/* @public-strip:start */
|
|
535
|
-
if (op === 'fold') {
|
|
536
|
-
// 折叠(fold)有独立语义与文案,不走状态/事实下传(host-core.fold 自判)
|
|
537
|
-
} else {
|
|
538
|
-
const miss = spanMissArgsOf(probe)
|
|
539
|
-
if (miss) args = { ...args, ...miss }
|
|
540
|
-
}
|
|
541
|
-
/* @public-strip:else
|
|
542
492
|
const miss = spanMissArgsOf(probe)
|
|
543
493
|
if (miss) args = { ...args, ...miss }
|
|
544
|
-
@public-strip:end */
|
|
545
494
|
}
|
|
546
495
|
}
|
|
547
496
|
} catch { /* span 计算失败 fallback 内部 */ }
|
|
548
497
|
}
|
|
549
|
-
/* @public-strip:start */
|
|
550
|
-
// fold 摘要与 span 来源解耦——调用方前置 span 也生成摘要(与 harness 一致:
|
|
551
|
-
// 区间读 args.start/args.end,不依赖 span 块成败;span 与 end 同源时无副作用)
|
|
552
|
-
// 结构化摘要优先(trio + serializeTrio 文本 content),与 harness 入口一致。
|
|
553
|
-
if (op === 'fold' && !args?.summary) {
|
|
554
|
-
try {
|
|
555
|
-
const s = Number(args?.start)
|
|
556
|
-
const e = Number(args?.end)
|
|
557
|
-
if (Number.isInteger(s) && Number.isInteger(e)) {
|
|
558
|
-
const trio = await dshAdapter.trioFromFile(sessionId, s, e)
|
|
559
|
-
if (trio) {
|
|
560
|
-
// 修订链:superseded-by 指旧卡(两入口与 harness 一致)
|
|
561
|
-
const sup = Number(args?.supersedeMarkerSeq)
|
|
562
|
-
if (Number.isInteger(sup) && sup > 0 && trio['roadmap-card']) {
|
|
563
|
-
trio['roadmap-card'].supersededBy = sup
|
|
564
|
-
trio['roadmap-card'].supersedesNote = `本结论取代 seq ${sup} 的旧结论(旧卡仍在,可审计)`
|
|
565
|
-
}
|
|
566
|
-
const { serializeTrio } = await import('./fold-core.js')
|
|
567
|
-
args = { ...args, summary: serializeTrio(trio), trio }
|
|
568
|
-
} else {
|
|
569
|
-
const summary = await dshAdapter.summaryFromFile(sessionId, s, e)
|
|
570
|
-
if (summary) args = { ...args, summary }
|
|
571
|
-
}
|
|
572
|
-
}
|
|
573
|
-
} catch { /* 摘要失败不阻断 */ }
|
|
574
|
-
}
|
|
575
|
-
/* @public-strip:end */
|
|
576
498
|
try {
|
|
577
499
|
const result = await opFn(args)
|
|
578
500
|
sendJson(res, 200, result)
|
|
@@ -669,34 +591,6 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
|
|
|
669
591
|
if (segments.includes('git') && op === 'init') {
|
|
670
592
|
return handleJsonPost(req, res, (args) => seam.gitInit(String(args?.sessionId ?? '')))
|
|
671
593
|
}
|
|
672
|
-
/* @public-strip:start */
|
|
673
|
-
// contextLevel(会话上下文用量体检 + 折叠建议,纯读)
|
|
674
|
-
if (op === 'contextLevel') {
|
|
675
|
-
return handleJsonPost(req, res, async (args) => {
|
|
676
|
-
const level = await dshAdapter.contextLevelFromFile(String(args?.sessionId ?? ''), { window: Number(args?.window) || undefined, env: process.env })
|
|
677
|
-
if (!level) throw new Error('会话文件不可读')
|
|
678
|
-
return level // handleJsonPost 包 {ok:true, value}
|
|
679
|
-
})
|
|
680
|
-
}
|
|
681
|
-
// unfold(视图层展开数据,纯读)与 fold(api op,走 handlePost)
|
|
682
|
-
if (op === 'unfold') {
|
|
683
|
-
return handleJsonPost(req, res, async (args) => {
|
|
684
|
-
const markerSeq = Number(args?.markerSeq)
|
|
685
|
-
if (!Number.isInteger(markerSeq) || markerSeq < 0) throw new Error('unfold 需要 fold marker 的 seq')
|
|
686
|
-
const content = await dshAdapter.unfoldContentFromFile(String(args?.sessionId ?? ''), markerSeq)
|
|
687
|
-
// 链完整性检查拒绝展开(该块已被上层折叠块覆盖)→ 与 harness 入口**同一** code/message
|
|
688
|
-
// (载荷生成在 fold-boundary.unfoldRefusalError,两入口不分叉)
|
|
689
|
-
if (content?.refused) {
|
|
690
|
-
const { unfoldRefusalError } = await import('./fold-boundary.js')
|
|
691
|
-
const err = new Error(unfoldRefusalError(content).message)
|
|
692
|
-
err.code = content.reason
|
|
693
|
-
throw err
|
|
694
|
-
}
|
|
695
|
-
if (!content) throw new Error('指定 seq 不是遮蔽载体(marker / checkpoint)或无遮蔽内容')
|
|
696
|
-
return content
|
|
697
|
-
})
|
|
698
|
-
}
|
|
699
|
-
/* @public-strip:end */
|
|
700
594
|
// 关闭守卫 V2:POST 形状与 harness 动态桥(retrace.runningState)
|
|
701
595
|
// 对齐——client 的 callOp 通道无论走 wire 还是 HTTP 都拿到同一形状。
|
|
702
596
|
if (op === 'runningState') {
|
|
@@ -734,29 +628,6 @@ export function createRetraceHttpHandler(ctx, { sessions, agents, seam, rollback
|
|
|
734
628
|
})
|
|
735
629
|
}
|
|
736
630
|
|
|
737
|
-
/* @public-strip:start */
|
|
738
|
-
// P1 折叠预览(纯读,与 harness retrace.foldPreview 一致——两入口同可达;
|
|
739
|
-
// 错误码与 harness 对齐:非法区间=bad-request,端点非 surface/不可读=range-not-surface)
|
|
740
|
-
if (op === 'foldPreview') {
|
|
741
|
-
return handleJsonPost(req, res, async (args) => {
|
|
742
|
-
// 校验已在 validate 里做过(原始整数);这里直接取用,不再 Number() 强转。
|
|
743
|
-
const s = args.start
|
|
744
|
-
const e = args.end
|
|
745
|
-
const trio = await dshAdapter.trioFromFile(String(args?.sessionId ?? ''), s, e)
|
|
746
|
-
if (!trio) {
|
|
747
|
-
const err = new Error('区间端点不在当前 surface 或会话不可读(已被遮蔽/非节点/无文件)')
|
|
748
|
-
err.code = 'range-not-surface'
|
|
749
|
-
throw err
|
|
750
|
-
}
|
|
751
|
-
const { serializeTrio } = await import('./fold-core.js')
|
|
752
|
-
return { trio, previewText: serializeTrio(trio) }
|
|
753
|
-
}, {
|
|
754
|
-
validate: (args) => (isFoldRange(args, { requireEnd: true })
|
|
755
|
-
? null
|
|
756
|
-
: { code: 'bad-request', message: 'foldPreview 需要原始整数区间 [start..end](end ≥ start)' }),
|
|
757
|
-
})
|
|
758
|
-
}
|
|
759
|
-
/* @public-strip:end */
|
|
760
631
|
// 通用分发(handles every `createEditorApi` op, including 0.4.124's
|
|
761
632
|
// `unhide`): `api[op]` — recall / editAndResend / regenerate / **unhide** /
|
|
762
633
|
// fold… 都从这里出去。
|