thincoder 0.12.59 → 0.12.61

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.
Files changed (192) hide show
  1. package/CHANGELOG.md +62 -4
  2. package/README.md +10 -8
  3. package/bin/thincoder.mjs +99 -133
  4. package/package.json +6 -4
  5. package/src/abort-provenance.mjs +116 -0
  6. package/src/acp/bridge.mjs +45 -21
  7. package/src/acp.mjs +6 -1
  8. package/src/advisor/citations.mjs +83 -21
  9. package/src/advisor/compaction.mjs +174 -0
  10. package/src/advisor/loop.mjs +293 -0
  11. package/src/advisor/messages.mjs +59 -137
  12. package/src/advisor/project-context.mjs +194 -0
  13. package/src/advisor/repos.mjs +17 -40
  14. package/src/advisor/run.mjs +156 -359
  15. package/src/advisor/truncate.mjs +57 -0
  16. package/src/advisor.mjs +27 -7
  17. package/src/agent/completion.mjs +17 -11
  18. package/src/agent/dispatch.mjs +145 -27
  19. package/src/agent/helpers.mjs +107 -13
  20. package/src/agent/record-results.mjs +55 -11
  21. package/src/agent/relay-prefix.mjs +39 -0
  22. package/src/agent/run-stages.mjs +242 -0
  23. package/src/agent/setup-reminders.mjs +69 -0
  24. package/src/agent/setup.mjs +107 -127
  25. package/src/agent/spawn-child.mjs +55 -13
  26. package/src/agent-tools/advisor-async.mjs +346 -0
  27. package/src/agent-tools/advisor-settle.mjs +231 -0
  28. package/src/agent-tools/advisor.mjs +167 -116
  29. package/src/agent-tools/async-settle.mjs +191 -0
  30. package/src/agent-tools/batch-segment.mjs +195 -0
  31. package/src/agent-tools/consult.mjs +139 -107
  32. package/src/agent-tools/design-token.mjs +117 -0
  33. package/src/agent-tools/digest-budget.mjs +76 -0
  34. package/src/agent-tools/eng.mjs +24 -29
  35. package/src/agent-tools/escalate-async.mjs +289 -0
  36. package/src/agent-tools/read-history.mjs +166 -32
  37. package/src/agent-tools/recent-changes.mjs +2 -1
  38. package/src/agent-tools/review-streak.mjs +93 -0
  39. package/src/agent-tools/settings.mjs +137 -34
  40. package/src/agent-tools/subagent-actions.mjs +180 -133
  41. package/src/agent-tools/subagent-async.mjs +184 -177
  42. package/src/agent-tools/subagent-panel.mjs +160 -0
  43. package/src/agent-tools/subagent-run.mjs +205 -0
  44. package/src/agent-tools/subagent-scheduler.mjs +100 -27
  45. package/src/agent-tools/subagent-spawn.mjs +453 -0
  46. package/src/agent-tools/subagent.mjs +256 -578
  47. package/src/agent-tools/verify.mjs +119 -292
  48. package/src/agent-tools.mjs +1 -0
  49. package/src/agent.mjs +89 -205
  50. package/src/cli/distill-command.mjs +12 -6
  51. package/src/cli/make-agent.mjs +26 -8
  52. package/src/cli/memory-command.mjs +4 -3
  53. package/src/cli/permission.mjs +2 -2
  54. package/src/cli/setup-wizard.mjs +42 -17
  55. package/src/completions.mjs +114 -0
  56. package/src/config-migrate.mjs +70 -0
  57. package/src/config.mjs +180 -63
  58. package/src/context.mjs +5 -147
  59. package/src/conventions.mjs +223 -0
  60. package/src/crash-reports.mjs +128 -0
  61. package/src/distill.mjs +11 -11
  62. package/src/expand-home.mjs +16 -0
  63. package/src/explore-distill.mjs +155 -0
  64. package/src/generate-title.mjs +1 -1
  65. package/src/hooks.mjs +7 -3
  66. package/src/memory/code-index.mjs +9 -3
  67. package/src/memory/code-sync.mjs +72 -32
  68. package/src/memory/core.mjs +6 -193
  69. package/src/memory/delete.mjs +236 -0
  70. package/src/memory/docs.mjs +68 -54
  71. package/src/memory/file-walk.mjs +109 -0
  72. package/src/memory/schema.mjs +15 -3
  73. package/src/memory.mjs +3 -1
  74. package/src/model-ref.mjs +66 -0
  75. package/src/model-specs.mjs +42 -8
  76. package/src/peer-domains.mjs +265 -0
  77. package/src/peer-instances.mjs +231 -0
  78. package/src/prompt-overlays.mjs +82 -0
  79. package/src/prompts/advisor-design.md +18 -75
  80. package/src/prompts/advisor-round1.md +14 -67
  81. package/src/prompts/advisor-round2.md +15 -51
  82. package/src/prompts/advisor-round3.md +15 -51
  83. package/src/prompts/common.md +115 -0
  84. package/src/prompts/consult-base.md +5 -23
  85. package/src/prompts/discipline-engineering.md +217 -0
  86. package/src/prompts/discipline-normal.md +179 -0
  87. package/src/prompts/persona-coder.md +21 -0
  88. package/src/prompts/persona-eng-coder.md +37 -0
  89. package/src/prompts/persona-eng-designer.md +55 -0
  90. package/src/prompts/persona-engineering.md +54 -0
  91. package/src/prompts/persona-explore.md +15 -0
  92. package/src/prompts/persona-normal.md +27 -0
  93. package/src/prompts/persona-plan.md +26 -0
  94. package/src/provider/anthropic.mjs +4 -4
  95. package/src/provider/core.mjs +18 -98
  96. package/src/provider/errors.mjs +101 -0
  97. package/src/provider/google.mjs +5 -6
  98. package/src/provider/index.mjs +2 -1
  99. package/src/provider/list-models.mjs +93 -0
  100. package/src/provider/rate.mjs +2 -1
  101. package/src/provider/responses.mjs +5 -3
  102. package/src/provider/retry.mjs +8 -45
  103. package/src/provider/sse.mjs +3 -4
  104. package/src/proxy.mjs +9 -14
  105. package/src/session-gc.mjs +214 -0
  106. package/src/session-guard.mjs +47 -0
  107. package/src/session-rename.mjs +38 -0
  108. package/src/session-slots.mjs +188 -60
  109. package/src/session.mjs +104 -124
  110. package/src/token-ttl.mjs +274 -0
  111. package/src/tools/{system.mjs → bash.mjs} +19 -221
  112. package/src/tools/checklist-sync.mjs +181 -0
  113. package/src/tools/checklist.mjs +52 -39
  114. package/src/tools/edit-batch.mjs +109 -10
  115. package/src/tools/edit-diff.mjs +110 -27
  116. package/src/tools/edit.md +17 -12
  117. package/src/tools/execute.mjs +31 -4
  118. package/src/tools/file.mjs +41 -16
  119. package/src/tools/git.md +1 -1
  120. package/src/tools/git.mjs +23 -34
  121. package/src/tools/glob-dialect.mjs +130 -0
  122. package/src/tools/glob.md +3 -3
  123. package/src/tools/grep.md +1 -1
  124. package/src/tools/index.mjs +9 -8
  125. package/src/tools/ops.mjs +188 -3
  126. package/src/tools/patch.mjs +3 -3
  127. package/src/tools/question.md +4 -0
  128. package/src/tools/question.mjs +26 -0
  129. package/src/tools/read.md +1 -2
  130. package/src/tools/read_image.md +1 -1
  131. package/src/tools/search.mjs +236 -0
  132. package/src/tools/shared.mjs +14 -13
  133. package/src/tools/wait_for.md +22 -0
  134. package/src/tui/agent-turn.mjs +36 -228
  135. package/src/tui/ansi.mjs +2 -0
  136. package/src/tui/clipboard.mjs +7 -1
  137. package/src/tui/cmd-advisor.mjs +3 -2
  138. package/src/tui/cmd-config.mjs +142 -30
  139. package/src/tui/cmd-eng.mjs +28 -40
  140. package/src/tui/cmd-exit.mjs +6 -8
  141. package/src/tui/cmd-mcp.mjs +8 -2
  142. package/src/tui/cmd-model.mjs +14 -12
  143. package/src/tui/cmd-new.mjs +3 -2
  144. package/src/tui/cmd-reindex.mjs +7 -0
  145. package/src/tui/cmd-session.mjs +19 -4
  146. package/src/tui/cmd-submodel.mjs +8 -5
  147. package/src/tui/cmd-think.mjs +10 -10
  148. package/src/tui/cmd-undo.mjs +4 -3
  149. package/src/tui/cmd-upgrade.mjs +19 -4
  150. package/src/tui/config-helpers.mjs +28 -16
  151. package/src/tui/distill-cmd.mjs +1 -1
  152. package/src/tui/index.mjs +40 -38
  153. package/src/tui/interaction.mjs +3 -3
  154. package/src/tui/key-handler.mjs +61 -17
  155. package/src/tui/key-modes.mjs +86 -8
  156. package/src/tui/layout.mjs +18 -10
  157. package/src/tui/model-catalog.mjs +89 -0
  158. package/src/tui/model-picker.mjs +498 -0
  159. package/src/tui/mouse.mjs +52 -9
  160. package/src/tui/pickers.mjs +28 -392
  161. package/src/tui/render-frame.mjs +32 -16
  162. package/src/tui/render-loop.mjs +2 -0
  163. package/src/tui/render-segments.mjs +12 -9
  164. package/src/tui/render.mjs +37 -5
  165. package/src/tui/slash-commands.mjs +2 -2
  166. package/src/tui/startup.mjs +4 -0
  167. package/src/tui/subagent-blocks.mjs +106 -295
  168. package/src/tui/subagent-children.mjs +162 -0
  169. package/src/tui/subagent-freeze.mjs +169 -0
  170. package/src/tui/subagent-panel.mjs +24 -31
  171. package/src/tui/suspension-drive.mjs +297 -0
  172. package/src/tui/tool-args.mjs +7 -5
  173. package/src/tui/tool-display.mjs +143 -0
  174. package/src/tui/tool-events.mjs +56 -185
  175. package/src/tui/tui-lifecycle.mjs +46 -4
  176. package/src/tui/update-notice.mjs +4 -0
  177. package/src/tui/wizard.mjs +61 -21
  178. package/src/tui/wrapped-spawn.mjs +38 -0
  179. package/src/prompts/coder.md +0 -56
  180. package/src/prompts/discipline.md +0 -102
  181. package/src/prompts/eng-coder.md +0 -44
  182. package/src/prompts/engineering-sub.md +0 -34
  183. package/src/prompts/engineering.md +0 -340
  184. package/src/prompts/explore.md +0 -21
  185. package/src/prompts/main.md +0 -56
  186. package/src/prompts/methodology-template.md +0 -58
  187. package/src/prompts/plan.md +0 -16
  188. package/src/prompts/system.md +0 -63
  189. package/src/tools/pdf-parse-text.mjs +0 -497
  190. package/src/tools/pdf-parse-xref.mjs +0 -499
  191. package/src/tools/pdf.mjs +0 -155
  192. package/src/tools/read_pdf.md +0 -21
@@ -2,6 +2,7 @@
2
2
  * provider/sse.mjs — SSE stream reader
3
3
  * Extracted from core.mjs. Parses Server-Sent Events for LLM chat responses.
4
4
  */
5
+ import { abortError, timeoutError } from "../abort-provenance.mjs"
5
6
 
6
7
  /**
7
8
  * Normalize provider cache fields into DeepSeek-style prompt_cache_hit/miss_tokens.
@@ -174,7 +175,7 @@ export async function readSSE(response, { onToken, onReasoning, rules, signal, f
174
175
  const armIdle = () => {
175
176
  if (idleTimer) clearTimeout(idleTimer)
176
177
  idleTimer = setTimeout(() => {
177
- try { response.body?.destroy(new Error(`SSE idle timeout: no data for ${READ_IDLE_MS / 1000}s`)) } catch { /* already gone */ }
178
+ try { response.body?.destroy(timeoutError(`SSE idle timeout: no data for ${READ_IDLE_MS / 1000}s`, "provider", "sse-idle")) } catch { /* already gone */ }
178
179
  }, READ_IDLE_MS)
179
180
  idleTimer.unref?.()
180
181
  }
@@ -183,9 +184,7 @@ export async function readSSE(response, { onToken, onReasoning, rules, signal, f
183
184
  for await (const chunk of response.body) {
184
185
  armIdle()
185
186
  if (signal?.aborted) {
186
- const e = new DOMException("The operation was aborted", "AbortError")
187
- e.reason = signal.reason
188
- throw e
187
+ throw abortError(signal, "provider", "stream-read")
189
188
  }
190
189
  buffer += decoder.decode(chunk, { stream: true })
191
190
  // UTF-8 BOM 剥除(2026-08-31 会诊 #12):某些网关/负载均衡在流首注入 \uFEFF,
package/src/proxy.mjs CHANGED
@@ -6,6 +6,7 @@ import { connect } from "node:net";
6
6
  import { connect as tlsConnect } from "node:tls";
7
7
  import { PassThrough } from "node:stream";
8
8
  import { URL } from "node:url";
9
+ import { abortError, timeoutError } from "./abort-provenance.mjs";
9
10
 
10
11
  const FETCH_TIMEOUT = 15_000
11
12
 
@@ -52,12 +53,6 @@ export function injectProxy(providers, config) {
52
53
  }
53
54
  }
54
55
 
55
- function abortError(signal) {
56
- const e = new DOMException("The operation was aborted", "AbortError")
57
- e.reason = signal?.reason
58
- return e
59
- }
60
-
61
56
  /**
62
57
  * 在已建立的 socket 上发 HTTP 请求,响应头到齐即 resolve(流式)。
63
58
  * 返回 Response-like: { ok, status, headers: Headers, body: PassThrough(异步迭代), text(): Promise<string> }
@@ -76,15 +71,15 @@ export function streamHttpResponse(sock, urlStr, opts = {}, timeout = FETCH_TIME
76
71
  const headers = opts.headers ?? {}
77
72
  const signal = opts.signal
78
73
 
79
- if (signal?.aborted) { sock.destroy(); return reject(abortError(signal)) }
74
+ if (signal?.aborted) { sock.destroy(); return reject(abortError(signal, "provider", "proxy")) }
80
75
 
81
76
  const body = new PassThrough()
82
77
  let settled = false
83
78
  let headerBuf = ""
84
79
  let idleTimer = null
85
80
 
86
- const timer = setTimeout(() => fail(new Error("Response timeout")), timeout)
87
- const onAbort = () => { sock.destroy(); fail(abortError(signal)) }
81
+ const timer = setTimeout(() => fail(timeoutError("Response timeout", "provider", "proxy-header")), timeout)
82
+ const onAbort = () => { sock.destroy(); fail(abortError(signal, "provider", "proxy")) }
88
83
  signal?.addEventListener("abort", onAbort, { once: true })
89
84
 
90
85
  function cleanup() {
@@ -101,7 +96,7 @@ export function streamHttpResponse(sock, urlStr, opts = {}, timeout = FETCH_TIME
101
96
  /** body 阶段空闲看门狗:每次数据到达重置;无数据超时 → 断流(流式消费方抛错) */
102
97
  function armIdle() {
103
98
  clearTimeout(idleTimer)
104
- if (bodyIdleMs > 0) idleTimer = setTimeout(() => body.destroy(new Error("Response body timeout (idle)")), bodyIdleMs)
99
+ if (bodyIdleMs > 0) idleTimer = setTimeout(() => body.destroy(timeoutError("Response body timeout (idle)", "provider", "proxy-body-idle")), bodyIdleMs)
105
100
  }
106
101
 
107
102
  sock.on("data", (d) => {
@@ -190,11 +185,11 @@ export function tunnelHttps(urlStr, opts, proxyUri, timeout = FETCH_TIMEOUT) {
190
185
  const headerTimeoutMs = Number.isFinite(opts?._headerTimeoutMs) ? opts._headerTimeoutMs : 60_000
191
186
  const bodyIdleMs = opts?._bodyIdleMs ?? 120_000
192
187
 
193
- if (signal?.aborted) return reject(abortError(signal))
188
+ if (signal?.aborted) return reject(abortError(signal, "provider", "proxy"))
194
189
 
195
190
  const sock = connect({ host: proxy.hostname, port: Number(proxy.port) || 3128 })
196
191
  const timer = setTimeout(() => { sock.destroy(); reject(new Error("Proxy CONNECT timeout")) }, timeout)
197
- const onAbort = () => { sock.destroy(); reject(abortError(signal)) }
192
+ const onAbort = () => { sock.destroy(); reject(abortError(signal, "provider", "proxy")) }
198
193
  signal?.addEventListener("abort", onAbort, { once: true })
199
194
  sock.on("connect", () => sock.write(`CONNECT ${target.hostname}:${target.port || 443} HTTP/1.1\r\nHost: ${target.hostname}\r\n\r\n`))
200
195
 
@@ -229,14 +224,14 @@ function tcpConnectProxy(proxyUri, signal, timeout) {
229
224
  return new Promise((resolve, reject) => {
230
225
  const proxy = new URL(proxyUri)
231
226
  const sock = connect({ host: proxy.hostname, port: Number(proxy.port) || 3128 })
232
- if (signal?.aborted) { sock.destroy(); return reject(abortError(signal)) }
227
+ if (signal?.aborted) { sock.destroy(); return reject(abortError(signal, "provider", "proxy")) }
233
228
  const onAbort = () => sock.destroy()
234
229
  signal?.addEventListener("abort", onAbort, { once: true })
235
230
  const timer = setTimeout(() => { sock.destroy(); reject(new Error("Proxy CONNECT timeout")) }, timeout)
236
231
  const onError = (e) => { clearTimeout(timer); reject(new Error(`Proxy CONNECT failed (${e.code ?? e.message})`)) }
237
232
  const onClose = () => {
238
233
  clearTimeout(timer)
239
- reject(signal?.aborted ? abortError(signal) : new Error("Proxy connection closed before tunnel established"))
234
+ reject(signal?.aborted ? abortError(signal, "provider", "proxy") : new Error("Proxy connection closed before tunnel established"))
240
235
  }
241
236
  sock.once("connect", () => {
242
237
  clearTimeout(timer)
@@ -0,0 +1,214 @@
1
+ /**
2
+ * session-gc.mjs — 会话目录残留 GC + 冷 cwd 报告/删除(SESSION.md §12,2026-09-06)。
3
+ *
4
+ * F1 残留 GC(自动):进程启动时对当前 cwd hash 前缀做一次轻量清理——.corrupted /
5
+ * .unreadable / .manifest.corrupted / .bak-* 保留 30 天,孤儿 .tmp 保留 7 天
6
+ *(mtime < now − retention 才删,等于保留期保留——older-than 边界语义)。
7
+ * 安全(N1):活跃槽(主文件在 + manifest slotSessions[N] 属主活)的现场一律保留;
8
+ * manifest 主文件 / end marker / 数据主文件永不进入候选(后缀预过滤只匹配残留后缀)。
9
+ *
10
+ * F2 冷 cwd(手动——12.2.4 三步,v1 不自动删 manifest):
11
+ * 判定:manifest mtime 距今 > 90 天 且 无任何活跃数据文件(.json.N 不存在或全部属死主);
12
+ * 报告:thincoder session gc --dry-run(跨 cwd 枚举,不删除);
13
+ * 删除:thincoder session gc --confirm <hash|--all>(整前缀清空——manifest+marker+
14
+ * .json.N 死主数据+裸 v1 {hash}.json(§12.7 D-V1)+残留;删除前重校验冷态——
15
+ * TOCTOU 防护 T12)。
16
+ *
17
+ * 拆分理由(§12.3 review #1):session-slots.mjs 已在 500 行硬限零余量,GC 是独立决策
18
+ * ("何时清何种残留"),独立成模块;原语(sessionPath/isProcessAlive)自 session-slots
19
+ * import,启动钩子(session.mjs resumeSlot 包装)只一行调用。
20
+ */
21
+
22
+ import { readdirSync, readFileSync, statSync, unlinkSync, existsSync } from "node:fs"
23
+ import { join, dirname, basename } from "node:path"
24
+ import { configDir } from "./config.mjs"
25
+ import { sessionPath, isProcessAlive } from "./session-slots.mjs"
26
+
27
+ /** 保留期(§12.2.2):损坏现场(.corrupted/.unreadable/.manifest.corrupted)与并发轮转
28
+ * 备份(.bak-*)30 天;孤儿 .tmp 7 天(崩溃现场恢复窗口)。 */
29
+ export const RESIDUE_RETENTION_MS = 30 * 24 * 3600 * 1000
30
+ export const ORPHAN_TMP_RETENTION_MS = 7 * 24 * 3600 * 1000
31
+ /** 冷 cwd 阈值(§12.2.4):manifest mtime 距今 > 90 天(保守——正常开发会频繁触碰)。 */
32
+ export const COLD_CWD_RETENTION_MS = 90 * 24 * 3600 * 1000
33
+
34
+ function sessionsDir() { return join(configDir, "sessions") }
35
+
36
+ /** 残留分类(§12.2.2 后缀表):name 须以 `${prefix}.` 开头(prefix = `${hash}.json`)。
37
+ * 返回 { retention, slot, tmp } 或 null(主文件/end marker/他前缀——不动)。
38
+ * slot = 关联槽号(`.N.` 段),无则 null(如 .manifest.corrupted)。 */
39
+ function classifyResidue(name, prefix) {
40
+ if (!name.startsWith(prefix + ".")) return null
41
+ const slotMatch = name.slice(prefix.length).match(/^\.(\d+)\./)
42
+ const slot = slotMatch ? Number(slotMatch[1]) : null
43
+ if (name.endsWith(".corrupted") || name.endsWith(".unreadable")) return { retention: RESIDUE_RETENTION_MS, slot, tmp: false }
44
+ if (/\.bak-\d+$/.test(name)) return { retention: RESIDUE_RETENTION_MS, slot, tmp: false }
45
+ if (name.endsWith(".tmp")) return { retention: ORPHAN_TMP_RETENTION_MS, slot, tmp: true }
46
+ return null
47
+ }
48
+
49
+ /** 活跃槽集合(§12.4 T3/T12 操作定义):.json.N 主文件存在 且 manifest slotSessions[N]
50
+ * 属主进程存活。manifest 缺失/损坏 → 空集(无活跃槽——不阻碍残留清理)。 */
51
+ function liveSlots(dir, prefix, aliveFn) {
52
+ const active = new Set()
53
+ try {
54
+ const m = JSON.parse(readFileSync(join(dir, `${prefix}.manifest`), "utf8"))
55
+ for (const [n, owner] of Object.entries(m.slotSessions ?? {})) {
56
+ if (!/^\d+$/.test(n) || !owner) continue
57
+ if (!existsSync(join(dir, `${prefix}.${n}`))) continue
58
+ const pid = parseInt(String(owner).split("-")[0])
59
+ if (pid && aliveFn(pid)) active.add(Number(n))
60
+ }
61
+ } catch { /* manifest 不可读 → 无活跃槽 */ }
62
+ return active
63
+ }
64
+
65
+ /**
66
+ * 残留 GC(§12.2.3——单 cwd 前缀,不跨 cwd 扫描):返回 { candidates, deleted }
67
+ * (dryRun 时 candidates 照列、deleted 为空——只列不删,N2 可预览)。
68
+ * 扫描先按后缀预过滤(N4——只 stat 残留候选),再对候选做活跃槽/孤儿/保留期判定。
69
+ */
70
+ export function gcResidue({ dir = sessionsDir(), prefix, now = Date.now(), dryRun = false, aliveFn = isProcessAlive } = {}) {
71
+ const result = { candidates: [], deleted: [] }
72
+ let entries
73
+ try { entries = readdirSync(dir) } catch { return result }
74
+ const candidates = []
75
+ for (const name of entries) {
76
+ const c = classifyResidue(name, prefix)
77
+ if (c) candidates.push({ name, ...c })
78
+ }
79
+ if (!candidates.length) return result
80
+ const active = liveSlots(dir, prefix, aliveFn)
81
+ for (const c of candidates) {
82
+ if (c.slot !== null && active.has(c.slot)) continue // N1:活跃槽现场一律保留(T3)
83
+ const p = join(dir, c.name)
84
+ if (c.tmp && existsSync(p.slice(0, -".tmp".length))) continue // 非孤儿 .tmp(主文件在——写中/回退候选)
85
+ let st
86
+ try { st = statSync(p) } catch { continue }
87
+ if (st.mtimeMs >= now - c.retention) continue // 边界:older-than 才删,等于保留期保留(§12.4)
88
+ result.candidates.push(c.name)
89
+ if (!dryRun) {
90
+ try { unlinkSync(p); result.deleted.push(c.name) } catch { /* 占用/竞态——跳过 */ }
91
+ }
92
+ }
93
+ return result
94
+ }
95
+
96
+ const scheduledPrefixes = new Set()
97
+
98
+ /** 启动钩子(§12 review #8——N4):GC 延后到进程启动完成后空闲执行(setImmediate),
99
+ * 不阻塞启动路径;每进程每前缀一次(Set 去重——resumeSlot 可多次进入)。 */
100
+ export function scheduleSessionGC(cwd) {
101
+ let base
102
+ try { base = sessionPath(cwd) } catch { return }
103
+ if (scheduledPrefixes.has(base)) return
104
+ scheduledPrefixes.add(base)
105
+ setImmediate(() => {
106
+ try { gcResidue({ dir: dirname(base), prefix: basename(base) }) } catch { /* 清理失败静默——不影响主流程 */ }
107
+ })
108
+ }
109
+
110
+ /**
111
+ * 冷 cwd 枚举(§12.2.4 步骤 1/2——跨 cwd 报告面,仅手动命令调用):候选 =
112
+ * manifest mtime 距今 > 90 天 且 无活跃数据文件(.json.N 主文件不存在或全部属死主进程)。
113
+ * 返回 [{ hash, prefix, manifestMtime, dataFiles, files }](files = 整前缀全部文件——
114
+ * 含裸 v1 `{hash}.json`,§12.7 D-V1——dataFiles 仅 .json.N,v1 不参与冷态判定)。
115
+ */
116
+ export function listColdCwds({ dir = sessionsDir(), now = Date.now(), aliveFn = isProcessAlive } = {}) {
117
+ let entries
118
+ try { entries = readdirSync(dir) } catch { return [] }
119
+ const cold = []
120
+ for (const name of entries) {
121
+ if (!name.endsWith(".json.manifest")) continue // end marker(.manifest.cli/.vscode)与 .manifest.corrupted 天然排除
122
+ const prefix = name.slice(0, -".manifest".length) // `${hash}.json`
123
+ let st
124
+ try { st = statSync(join(dir, name)) } catch { continue }
125
+ if (st.mtimeMs >= now - COLD_CWD_RETENTION_MS) continue // 近期活跃(<90 天阈值——T10)
126
+ let m
127
+ try { m = JSON.parse(readFileSync(join(dir, name), "utf8")) } catch { continue } // 损坏 manifest 不判冷(.corrupted 归残留 GC)
128
+ const dataFiles = entries.filter((e) => e.startsWith(prefix + ".") && /^\d+$/.test(e.slice(prefix.length + 1)))
129
+ const hasLive = dataFiles.some((e) => {
130
+ const owner = m.slotSessions?.[e.slice(prefix.length + 1)]
131
+ const pid = parseInt(String(owner ?? "").split("-")[0])
132
+ return !!(pid && aliveFn(pid))
133
+ })
134
+ if (hasLive) continue // 有活跃数据文件 → 非冷(T12)
135
+ cold.push({
136
+ hash: prefix.slice(0, -".json".length),
137
+ prefix,
138
+ manifestMtime: st.mtimeMs,
139
+ dataFiles: dataFiles.length,
140
+ files: entries.filter((e) => e.startsWith(prefix + ".") || e === prefix), // 整前缀清空含裸 v1 {hash}.json(§12.7 D-V1)
141
+ })
142
+ }
143
+ return cold
144
+ }
145
+
146
+ /**
147
+ * 删除指定冷 cwd 的整个前缀(§12.2.4 步骤 3——manifest+end marker+.json.N 死主数据+
148
+ * 裸 v1 {hash}.json(§12.7 D-V1)+残留;只删 manifest 留数据文件会制造孤儿数据,整前缀清空才真正释放)。
149
+ * 删除前重跑冷 cwd 判定(TOCTOU 防护,T12——期间变活跃则拒绝)。
150
+ */
151
+ export function deleteColdCwd(hash, { dir = sessionsDir(), now = Date.now(), aliveFn = isProcessAlive } = {}) {
152
+ const target = listColdCwds({ dir, now, aliveFn }).find((c) => c.hash === hash)
153
+ if (!target) return { ok: false, reason: "not-cold", deleted: [] }
154
+ const deleted = []
155
+ for (const name of target.files) {
156
+ try { unlinkSync(join(dir, name)); deleted.push(name) } catch { /* 占用/竞态——跳过 */ }
157
+ }
158
+ return { ok: true, deleted }
159
+ }
160
+
161
+ /**
162
+ * `thincoder session gc` 子命令分发(§12.2.3/12.2.4 手动面——F2 执行入口仅 CLI,
163
+ * VS Code 端无 shell 子命令通道,review #7):
164
+ * --dry-run 报告当前 cwd 残留候选 + 跨 cwd 冷候选(只列不删,N2 预览)
165
+ * --confirm <hash> 删除指定冷 cwd 整前缀(警告 + 文件清单 + TOCTOU 重校验)
166
+ * --confirm --all 逐冷 cwd 同型警告删除
167
+ * 返回进程退出码(0/1)。dir/prefix/now/out/err/aliveFn 为测试注入缝(默认生产行为)。
168
+ */
169
+ export function runSessionGc(args, { dir = sessionsDir(), prefix = null, cwd = process.cwd(), now = Date.now(), out = console.log, err = console.error, aliveFn = isProcessAlive } = {}) {
170
+ const dryRun = args.includes("--dry-run")
171
+ const confirmIdx = args.indexOf("--confirm")
172
+ const hasConfirm = confirmIdx >= 0
173
+ const confirmTarget = hasConfirm ? args[confirmIdx + 1] : null
174
+ // --dry-run 与 --confirm 互斥(review 🔵#4——同给时不得静默忽略 confirm;无值 --confirm 同为用法错误)
175
+ if (args[0] !== "gc" || (!dryRun && !hasConfirm) || (dryRun && hasConfirm) || (hasConfirm && !confirmTarget)) {
176
+ err("Usage: thincoder session gc --dry-run | --confirm <hash> | --confirm --all")
177
+ return 1
178
+ }
179
+
180
+ if (dryRun) {
181
+ out("Session GC dry-run — no files will be deleted.")
182
+ // 当前 cwd 残留(§12.2.3 删除面——自动 GC 的预览)
183
+ let p = prefix
184
+ if (!p) { try { p = basename(sessionPath(cwd)) } catch { p = null } }
185
+ const residue = p ? gcResidue({ dir, prefix: p, now, dryRun: true, aliveFn }) : { candidates: [] }
186
+ out(`Residue candidates for current project (${p ?? "unknown"}): ${residue.candidates.length}`)
187
+ for (const name of residue.candidates) out(` ${name}`)
188
+ }
189
+
190
+ const cold = listColdCwds({ dir, now, aliveFn })
191
+ if (dryRun) {
192
+ out(`Cold project candidates (manifest idle > 90 days, no live data files): ${cold.length}`)
193
+ for (const c of cold) {
194
+ out(` ${c.hash} manifest mtime ${new Date(c.manifestMtime).toISOString()} data files ${c.dataFiles} total files ${c.files.length}`)
195
+ }
196
+ if (cold.length) out('Run "thincoder session gc --confirm <hash>" (or --confirm --all) to permanently delete a cold project prefix.')
197
+ return 0
198
+ }
199
+
200
+ // --confirm:删除前警告(N2 可逆——文件清单 + 永久删除提示);deleteColdCwd 内部重校验冷态(TOCTOU)
201
+ const targets = confirmTarget === "--all" ? cold : cold.filter((c) => c.hash === confirmTarget)
202
+ if (!targets.length) {
203
+ err(`Refused: ${confirmTarget} is not a cold project (active, recent, or unknown) — nothing deleted.`)
204
+ return 1
205
+ }
206
+ for (const t of targets) {
207
+ out(`WARNING: 此操作永久删除该 cwd 的全部会话历史 (hash ${t.hash}, ${t.files.length} files):`)
208
+ for (const name of t.files) out(` ${name}`)
209
+ const r = deleteColdCwd(t.hash, { dir, now, aliveFn })
210
+ if (!r.ok) { err(`Refused: ${t.hash} is no longer cold (became active) — skipped.`) ; continue }
211
+ out(`Deleted ${r.deleted.length} files for ${t.hash}.`)
212
+ }
213
+ return 0
214
+ }
@@ -0,0 +1,47 @@
1
+ /**
2
+ * session-guard.mjs — F2 轮转守卫(2026-08-31 会诊 F2 🔴;2026-09-08 DESIGN-TOKEN-
3
+ * SETTLEMENT D1 自 session-slots.mjs 提取——session-slots 再越 500 行硬限,本守卫约 41
4
+ * 行随迁,verbatim 零语义变):saveSession 与 token-ttl persistEngTokens 共用同一份。
5
+ * 写前校验磁盘槽文件是否本进程会话的现场——磁盘文件 sessionStart 与本进程会话不符
6
+ * (另一进程/会话的现场)/版本更新/异 cwd → 先轮转 .bak 保留再写。检查按 mtime 缓存
7
+ * (agent._slotMtime):文件自上次检查/自写未变就跳过全量解析——每次保存都
8
+ * readFileSync+JSON.parse 多 MB 会话 → O(n²) 退化。文件存在但不可读(损坏/半写)→
9
+ * 改名 .corrupted 保留现场。返回轮转的 .bak 路径或 null。
10
+ */
11
+
12
+ import { existsSync, readFileSync, renameSync, statSync } from "node:fs"
13
+ import { basename } from "node:path"
14
+
15
+ export function guardForeignSlotFile(agent, p, slot) {
16
+ try {
17
+ if (!existsSync(p)) return null
18
+ const st = statSync(p)
19
+ if (st.mtimeMs === (agent._slotMtime ?? -1)) return null
20
+ const disk = JSON.parse(readFileSync(p, "utf8"))
21
+ // version>2 的新版文件无论 sessionStart 一律轮转(loadSlotFile 对 v3 返回 null 不动
22
+ // 文件——若其 sessionStart 为 null,旧版首次保存会静默覆盖;轮转 .bak 保证新版文件
23
+ // 保留)。磁盘文件 cwd 不匹配(异项目文件误落本路径)同样轮转——与 loadSlotFile/
24
+ // legacy 读的"别人的文件不动"原则对齐。
25
+ const diskIsNewer = typeof disk?.version === "number" && disk.version > 2
26
+ const diskStart = disk?.sessionStart ?? null
27
+ const myStart = agent._sessionStart ?? null
28
+ const diskForeign = typeof disk?.cwd === "string" && disk.cwd.toLowerCase() !== agent.cwd.toLowerCase()
29
+ if (diskIsNewer || diskForeign || (diskStart && diskStart !== myStart)) {
30
+ const bak = `${p}.bak-${Date.now()}`
31
+ renameSync(p, bak)
32
+ console.error(`[session] slot ${slot} holds ${diskIsNewer ? `a newer-version file (v${disk.version})` : diskForeign ? `a foreign-cwd file (${disk.cwd})` : `another session (start ${diskStart}, ours ${myStart})`} — preserved as ${basename(bak)}`)
33
+ agent._slotMtime = st.mtimeMs
34
+ return bak
35
+ }
36
+ agent._slotMtime = st.mtimeMs
37
+ return null
38
+ } catch {
39
+ // 文件存在但不可读(损坏/半写):改名 .corrupted 保留现场(2026-09-01 advisor 🔵——
40
+ // 与自身 loadSlotFile 的 .corrupted 约定 + VS Code saveSessionToSlot 对齐;.bak 保留
41
+ // 给 F2 轮转路径,损坏现场不再混入轮转后缀)。
42
+ if (existsSync(p)) {
43
+ try { renameSync(p, `${p}.corrupted`) } catch {}
44
+ }
45
+ return null
46
+ }
47
+ }
@@ -0,0 +1,38 @@
1
+ /**
2
+ * session-rename.mjs — 槽位重命名(标题写路径)。2026-09-06 自 session-slots.mjs 拆出:
3
+ * §12.2.5 契约改(boolean → { ok, reason })使 session-slots.mjs 超 500 行硬限
4
+ *(§12.3 授权——"若 >500 则按 §10.6 先例拆文件,一并拆出 renameSlot")。
5
+ * 原语(slotPath/manifest 读写)自 session-slots.mjs import;session.mjs re-export
6
+ * renameSlot 保持既有调用点(cmd-session.mjs / 测试经 session.mjs)不变。
7
+ */
8
+
9
+ import { readFileSync, existsSync, statSync } from "node:fs"
10
+ import { slotPath, loadManifest, saveManifest, slotDigest, writeSessionFile } from "./session-slots.mjs"
11
+
12
+ /** Rename a slot: update the slot file's title + the manifest metadata (shared with VS Code).
13
+ * 2026-09-01 会诊 glm 🟡:写回前按 mtime 门控重读——原实现读全量→改 title→整文件写回,
14
+ * 窗口内并发方的最新保存会被旧数据覆盖(丢消息);mtime 变了即放弃本次重命名。
15
+ * 2026-09-06 §12.2.5:契约 boolean → { ok, reason? }(file-missing/parse-failure/mtime-conflict/invalid-slot,F3 失败可见);_stat = mtime-conflict 测试缝(默认 statSync)。 */
16
+ export function renameSlot(cwd, slot, title, _stat = statSync) {
17
+ const n = Number(slot)
18
+ if (!Number.isInteger(n) || n < 1) return { ok: false, reason: "invalid-slot" }
19
+ const p = slotPath(cwd, n)
20
+ if (!existsSync(p)) return { ok: false, reason: "file-missing" }
21
+ let data
22
+ try {
23
+ data = JSON.parse(readFileSync(p, "utf8"))
24
+ } catch {
25
+ return { ok: false, reason: "parse-failure" }
26
+ }
27
+ const t0 = _stat(p).mtimeMs
28
+ data.title = title
29
+ // 读与写之间文件被并发方改过 → 放弃(保留并发内容,重命名下次重试)
30
+ if (_stat(p).mtimeMs !== t0) return { ok: false, reason: "mtime-conflict" }
31
+ writeSessionFile(p, data)
32
+ const m = loadManifest(cwd)
33
+ if (m.slots[n]) {
34
+ m.slots[n] = slotDigest(data)
35
+ saveManifest(cwd, m)
36
+ }
37
+ return { ok: true }
38
+ }