sillyspec 3.33.6 → 3.33.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillyspec",
-  "version": "3.33.6",
+  "version": "3.33.7",
   "description": "SillySpec CLI — 流程状态机，让 AI 严格按步骤来",
   "icon": "logo.jpg",
   "homepage": "https://sillyspec.ppdmq.top/",
@@ -24,7 +24,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test:core": "node --test test/preview-migration.test.mjs test/preview-progress.test.mjs test/preview-outlet.test.mjs test/preview-gc.test.mjs test/preview-gate-isolation.test.mjs test/db-engine.test.mjs test/db-concurrency.test.mjs test/db-atomic-write.test.mjs test/platform-sync-schema.test.mjs test/platform-sync-serialization.test.mjs test/change-ownership-guards.test.mjs test/watcher.test.mjs test/watcher-alerts.test.mjs test/watcher-timeline.test.mjs test/sentinel-rules.test.mjs test/handoff.test.mjs test/execution-mode-render.test.mjs test/knowledge-inbox.test.mjs test/knowledge-baseline.test.mjs test/quick-laststep-fourfields-preview.test.mjs test/doctor-align-execute-progress.test.mjs test/test-ledger.test.mjs test/test-bindings.test.mjs test/flow-draft-binding-extract.test.mjs test/gate-snapshot-lifecycle.test.mjs test/gate-snapshot-cleanup.test.mjs test/verify-trace-residual.test.mjs test/platform-creds-fallback.test.mjs test/archive-timeline-bake.test.mjs test/doc-ref-check.test.mjs test/flow-status-json.test.mjs test/flow-status-title.test.mjs test/flow-resume-title.test.mjs test/datetime-timeago.test.mjs test/resume-domain-flip.test.mjs test/fr-regress-cap-drop.test.mjs test/fr-priority-overlap.test.mjs test/archive-commit-suggest-race.test.mjs test/flow-done-fail-brief.test.mjs test/verify-probes-refresh-backup.test.mjs test/taskcard-yaml-triage-validate.test.mjs test/gate-last-reader.test.mjs test/status-multi-active-list.test.mjs test/gate-docs-only.test.mjs test/probe7-fr-prefill.test.mjs test/plan-fill-batch-config.test.mjs test/step-guide-prune.test.mjs test/gate-stage-review-hint.test.mjs test/design-ref-suggest.test.mjs test/flow-friction-batch3.test.mjs test/wave-auto-adopt.test.mjs test/test-incremental-rerun.test.mjs test/knowledge-graph.test.mjs test/explore-graph-guidance.test.mjs test/git-helper-input.test.mjs test/push-plan.test.mjs test/push-cli.test.mjs test/push-skill.test.mjs test/flow-guidance.test.mjs",
+    "test:core": "node --test test/preview-migration.test.mjs test/preview-progress.test.mjs test/preview-outlet.test.mjs test/preview-gc.test.mjs test/preview-gate-isolation.test.mjs test/db-engine.test.mjs test/db-concurrency.test.mjs test/db-atomic-write.test.mjs test/platform-sync-schema.test.mjs test/platform-sync-serialization.test.mjs test/change-ownership-guards.test.mjs test/watcher.test.mjs test/watcher-alerts.test.mjs test/watcher-timeline.test.mjs test/sentinel-rules.test.mjs test/handoff.test.mjs test/execution-mode-render.test.mjs test/knowledge-inbox.test.mjs test/knowledge-baseline.test.mjs test/quick-laststep-fourfields-preview.test.mjs test/doctor-align-execute-progress.test.mjs test/test-ledger.test.mjs test/test-bindings.test.mjs test/flow-draft-binding-extract.test.mjs test/gate-snapshot-lifecycle.test.mjs test/gate-snapshot-cleanup.test.mjs test/verify-trace-residual.test.mjs test/platform-creds-fallback.test.mjs test/archive-timeline-bake.test.mjs test/doc-ref-check.test.mjs test/flow-status-json.test.mjs test/flow-status-title.test.mjs test/flow-resume-title.test.mjs test/datetime-timeago.test.mjs test/resume-domain-flip.test.mjs test/fr-regress-cap-drop.test.mjs test/fr-priority-overlap.test.mjs test/archive-commit-suggest-race.test.mjs test/flow-done-fail-brief.test.mjs test/verify-probes-refresh-backup.test.mjs test/taskcard-yaml-triage-validate.test.mjs test/gate-last-reader.test.mjs test/status-multi-active-list.test.mjs test/gate-docs-only.test.mjs test/probe7-fr-prefill.test.mjs test/plan-fill-batch-config.test.mjs test/step-guide-prune.test.mjs test/gate-stage-review-hint.test.mjs test/design-ref-suggest.test.mjs test/flow-friction-batch3.test.mjs test/wave-auto-adopt.test.mjs test/test-incremental-rerun.test.mjs test/target-files-main-docs-rescue.test.mjs test/knowledge-graph.test.mjs test/explore-graph-guidance.test.mjs test/git-helper-input.test.mjs test/push-plan.test.mjs test/push-cli.test.mjs test/push-skill.test.mjs test/flow-guidance.test.mjs",
     "test": "node test/run-tests.mjs",
     "lint": "node test/check-syntax.mjs",
     "eval:dry": "node eval/run.mjs --dry-run",

package/src/agent-session-log.js

@@ -994,7 +994,10 @@ export function detectAgentLogEntries(opts) {
  * specBase/local.yaml platform 段（url + token，与链路 A 同源）。
  * @returns {{url:string, token:string}|null} 未配置返回 null（合法状态，静默跳过上报）
  */
-function readPlatformPushConfig(specBase, env = process.env) {
+export function readPlatformPushConfig(specBase, env = process.env) {
+  // 2026-10-28-knowledge-hits-cli-push：export 化（签名与行为零变化）——
+  // knowledge-hits.js 写后直报复用同一配置解析（单一源，不复制 local.yaml
+  // 解析逻辑）。
   if (env.SILLYHUB_PLATFORM_URL && env.SILLYHUB_PLATFORM_TOKEN) {
     return { url: env.SILLYHUB_PLATFORM_URL, token: env.SILLYHUB_PLATFORM_TOKEN };
   }

package/src/knowledge-hits.js

@@ -14,16 +14,92 @@
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from 'fs'
 import { runtimeStatePath } from './runtime-paths.js'
 import { join } from 'path'
+import { readPlatformPushConfig } from './agent-session-log.js'
 
 const HITS_FILENAME = 'knowledge-hits.jsonl'
 
+// 直报超时上限（2026-10-28-knowledge-hits-cli-push）：对齐 agent-log PUSH_TIMEOUT_MS
+// 量级——最坏情况下进程退出被活跃 socket 拖住的时长有界。
+const HITS_PUSH_TIMEOUT_MS = 10_000
+
 function hitsFilePath(runtimeDir) {
   return runtimeStatePath(runtimeDir, HITS_FILENAME)
 }
 
+/**
+ * runtimeDir → specBase 反推（剥尾 `.runtime` 段；跨平台：正反斜杠与尾分隔符容忍）。
+ *
+ * 全部 appendKnowledgeHit 调用形态的 runtimeDir 最终都是 `<specBase>/.runtime`
+ * （join(specBase,'.runtime') 或 resolveRuntimeRoot 产物）——统一剥最后一段反推
+ * specBase 供平台配置读取（local.yaml 在 specBase 根）。结果保留输入的分隔符
+ * 形态（不做平台归一——Node fs 对 / 与 \ 双向兼容，归一反而扭曲 POSIX 形态输入）。
+ *
+ * @param {string} runtimeDir
+ * @returns {string} specBase（runtimeDir 末段不是 .runtime 时原样返回——容错面）
+ */
+export function specBaseFromRuntimeDir(runtimeDir) {
+  const raw = String(runtimeDir)
+  const norm = raw.replace(/\\/g, '/').replace(/\/+$/, '')
+  const idx = norm.lastIndexOf('/')
+  const last = idx === -1 ? norm : norm.slice(idx + 1)
+  if (last !== '.runtime') return runtimeDir
+  // \→/ 等长替换、去尾 / 只动末尾——norm 前 idx 字符与原串位置一一对应，
+  // 直接按剥点切片即保留原分隔符形态的 specBase。
+  return raw.slice(0, idx)
+}
+
+/**
+ * 单行遥测直报平台（2026-10-28-knowledge-hits-cli-push FR-01）。
+ *
+ * POST {url}/api/changes/-/hits-sync（Bearer shpsync_ 令牌——workspace 由令牌派生），
+ * body {lines:[line], daemon_local_id:'cli'}；接收端行级幂等（行 sha256 去重，
+ * 平台仓 2026-10-28-knowledge-hits-cli-direct）。best-effort 语义照
+ * pushAgentLogToPlatform 先例：无配置/被禁用静默跳过（返回 pushed:null）；
+ * 网络/非 2xx/超时 warn 一行不抛（返回 pushed:false, reason）——本地行已落盘、
+ * daemon 周期上行与平台按钮 flush 为兜底通道。
+ *
+ * @param {object} p
+ * @param {string} p.specBase - local.yaml 所在 spec 基路径
+ * @param {object} [p.env]    - env（默认 process.env；测试注入用）
+ * @param {string} p.line     - 已落盘的遥测行（JSON 字符串）
+ * @returns {Promise<{pushed:boolean|null, reason?:string}>}
+ */
+export async function pushKnowledgeHitToPlatform({ specBase, env = process.env, line }) {
+  if (env.SILLYSPEC_HITS_PUSH === '0') {
+    return { pushed: null, reason: 'disabled' }
+  }
+  const cfg = readPlatformPushConfig(specBase, env)
+  if (!cfg) return { pushed: null, reason: 'no-config' }
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(), HITS_PUSH_TIMEOUT_MS)
+  try {
+    const res = await fetch(`${cfg.url.replace(/\/+$/, '')}/api/changes/-/hits-sync`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${cfg.token}` },
+      body: JSON.stringify({ lines: [line], daemon_local_id: 'cli' }),
+      signal: controller.signal,
+    })
+    if (!res.ok) {
+      console.warn(`[knowledge-hits-push] → HTTP ${res.status}（本地行已落盘，daemon 兜底）`)
+      return { pushed: false, reason: `http-${res.status}` }
+    }
+    return { pushed: true }
+  } catch (err) {
+    const msg = err && err.name === 'AbortError' ? '超时' : (err && err.message ? err.message : err)
+    console.warn(`[knowledge-hits-push] 直报失败: ${msg}（本地行已落盘，daemon 兜底）`)
+    return { pushed: false, reason: 'network' }
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
 /**
  * 追加一条遥测记录（目录/文件缺失自动创建）。
  *
+ * 2026-10-28-knowledge-hits-cli-push：落盘成功后 void fire 平台直报（FR-01/02）——
+ * 不 await 不抛（失败 warn 一行由 pushKnowledgeHitToPlatform 内部收口），主流程
+ * 同步语义与返回值不变；无配置/被禁用时零行为差异。
+ *
  * @param {string} runtimeDir - .runtime 目录
  * @param {object} hit - 记录对象，常用字段 { type:'inject'|'classify', change, query, matchedFiles, at }
  *   （at 缺省时补当前 ISO 时间；其余字段原样序列化，classify 的 qlId/targetFile 等照写）
@@ -35,7 +111,10 @@ export function appendKnowledgeHit(runtimeDir, hit) {
     record.at = new Date().toISOString()
   }
   mkdirSync(runtimeDir, { recursive: true })
-  appendFileSync(hitsFilePath(runtimeDir), JSON.stringify(record) + '\n', 'utf8')
+  const line = JSON.stringify(record)
+  appendFileSync(hitsFilePath(runtimeDir), line + '\n', 'utf8')
+  // 写后直报（void fire）：本地已落盘，直报成败不影响本函数语义（FR-02）。
+  void pushKnowledgeHitToPlatform({ specBase: specBaseFromRuntimeDir(runtimeDir), line }).catch(() => {})
   return record
 }
 

package/src/verify-postcheck.js

@@ -4806,6 +4806,51 @@ export function reconcileTargetFiles({ cwd, specBase = null, changeName = null,
   if (rescuedCount > 0) {
     notes.push(`对账救赎：${rescuedCount} 个声明文件经近窗提交触及面命中（isolated worktree per-task commit 形态，porcelain 恒空——R9/R11 四连拦根治）`)
   }
+  // 主仓治理文档救赎（坑 target-files-worktree-docs-mismatch，2026-10-26-session-stage-progress
+  // verify 实证）：模块卡等主仓 .sillyspec/ 文档按 CLI 铁律「一律写主仓，绝不写 worktree 副本」
+  // ——worktree 形态 actual（wt diff+porcelain）结构性看不见主仓侧改动，声明主仓治理路径恒落
+  // ②类假红（「写 worktree=产物蒸发，写主仓=对账 missing」两规则打架）。救赎面=主仓 .sillyspec/
+  // 的 status（未提交）∪ baseline..HEAD diff（已提交），仅救赎「声明而 missing」的主仓治理路径
+  // （不扩 undeclared 面——与 R9/R11 窗口救赎同语义）。fail-open：主仓读取失败走既有 missing 判定。
+  if (actual.form === 'worktree') {
+    const govDeclared = declaredPaths.filter((p) => {
+      const clean = String(p).replace(/\\/g, '/').replace(/^NEW:/, '')
+      return clean.startsWith('.sillyspec/')
+    })
+    if (govDeclared.length > 0) {
+      let mainDocsRescued = 0
+      try {
+        const mainFace = new Set()
+        // -uall：未跟踪目录缺省折叠成目录条目（?? .sillyspec/docs/<proj>/ 整目录一行）——
+        // 模块卡常为新建文件，折叠形态对不上文件级声明，逐文件展开（scope-audit 同款口径）
+        const st = gitQuiet(cwd, ['status', '--porcelain', '--untracked-files=all', '--', '.sillyspec/'], { timeout: 30000, trim: false })
+        for (const line of String(st || '').split('\n')) {
+          if (!line || line.length < 4) continue
+          const p = line.slice(3).trim().replace(/^"|"$/g, '')
+          const arrow = p.indexOf(' -> ')
+          const f = (arrow !== -1 ? p.slice(arrow + 4) : p).replace(/\\/g, '/')
+          if (f) mainFace.add(pathKey(f))
+        }
+        if (actual.baseAnchor) {
+          const df = gitQuiet(cwd, ['diff', '--name-only', `${actual.baseAnchor}..HEAD`, '--', '.sillyspec/'], { timeout: 30000 })
+          for (const f of String(df || '').split('\n')) {
+            const t = f.trim().replace(/\\/g, '/')
+            if (t) mainFace.add(pathKey(t))
+          }
+        }
+        for (const p of govDeclared) {
+          const clean = String(p).replace(/\\/g, '/').replace(/^NEW:/, '')
+          if (!actualKeySet.has(pathKey(p)) && mainFace.has(pathKey(clean))) {
+            actualKeySet.add(pathKey(p))
+            mainDocsRescued++
+          }
+        }
+      } catch { /* 主仓治理面读取失败 → 走既有 missing 判定（fail-open 不新造阻断） */ }
+      if (mainDocsRescued > 0) {
+        notes.push(`主仓治理文档救赎：${mainDocsRescued} 个 .sillyspec/ 声明经主仓实际改动面命中（worktree 对账面看不见主仓侧模块卡等治理文档——「治理文档一律写主仓」铁律与 worktree actual 的结构性错配，2026-10-26 实证）`)
+      }
+    }
+  }
   // ①交集（计数进 evidence）：唯一路径口径（多卡声明同文件只计一次）
   for (const path of declaredPaths) {
     if (actualKeySet.has(pathKey(path))) matched.push(path)