@marsken/dsh-studio 0.1.10 → 0.1.12

package/docs/compatibility.md

@@ -6,7 +6,7 @@
 
 | 项 | 值 |
 | --- | --- |
-| dsh-studio | `package.json` `version: 0.1.10` |
+| dsh-studio | `package.json` `version: 0.1.12` |
 | DeepSeek Harness | `0.2.2-rc.1`（`dsh --version`） |
 | Node | `v24.22.2`（Linux 目标机）；本机 Windows `v24.19.0` |
 | 目标系统 | Ubuntu 24.04，`dsh web` 监听 `18080`，nginx `:80` 反代并注入 `dsh-auth-*` cookie |

package/docs/publish.md

@@ -127,6 +127,8 @@ token 只写进临时 npmrc（放在仓库外或 `tmp/` 且不提交），发完
 | --- | --- | --- |
 | `0.1.0` | 2026-11-13 | 首个公开版：看板 / 需求 / 用例回归 / 效能 / 设计评审四期 |
 | `0.1.1` | 2026-11-13 | 补三张 README 截图（npm 页可看图）；默认值与文档去掉公司内网信息 |
+| `0.1.12` | 2026-11-15 | 真实 token 成本（读会话日志 + 价目表计价） |
+| `0.1.11` | 2026-11-15 | 需求变更影响面（接口 + 面板）、可跑用例口径修正、成本口径文档 |
 | `0.1.10` | 2026-11-15 | shell/db 用例可跑、GitLab 核对结果常驻显示、事件带 truncated、角色归并 |
 | `0.1.9` | 2026-11-14 | 准出门禁提示「代码事实核对不通过」（只提醒，不拦） |
 | `0.1.8` | 2026-11-14 | 卡进「待评审」时自动核对代码事实，对不上就写进 history 并记 gate/blocked |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marsken/dsh-studio",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "description": "DSH Studio: role-based multi-agent workspace (product / architect / developer / QA) with a live work board, GitLab + Feishu connection settings, all configurable from the web GUI.",
   "main": "index.js",
@@ -11,7 +11,9 @@
   "scripts": {
     "test": "node --test tests/repo.test.mjs tests/store-boot.test.mjs tests/client-units.test.mjs tests/notify.test.mjs",
     "check": "node --check index.js && node --check client.src.js && node --test tests/repo.test.mjs tests/store-boot.test.mjs tests/client-units.test.mjs tests/notify.test.mjs",
-    "smoke:store": "node scripts/smoke-store.mjs"
+    "smoke:store": "node scripts/smoke-store.mjs",
+    "mock:gitlab": "node tools/mock-gitlab.mjs",
+    "verify:gitlab": "node tools/verify-gitlab-facts.mjs"
   },
   "exports": {
     ".": "./index.js",

package/src/host/domain.js

@@ -1,6 +1,7 @@
 /** dsh-studio 的领域层：板列、卡片/需求/发布的数据形状与清洗、默认配置、编号生成。纯函数，可单测。 */
 import { createHash, randomBytes } from 'node:crypto'
 import { sanitizeDbCase } from './db-runner.js'
+import { sanitizePrices } from './usage.js'
 import { sanitizeWebhooks } from './webhooks.js'
 import { sanitizeCaseShell } from './shell-case.js'
 import { LIMIT_DEFAULTS, sanitizeLimits } from './limits.js'
@@ -465,17 +466,16 @@ export function sanitizeSla(raw) {
   }
   return out
 }
-
-/** 成本预算：跑多少轮、机上多少小时，超过 warnAt% 就在界面标黄。 */
+/** 成本预算 + 价目表（元/百万 token；空表只报 token 不报钱）。 */
 export function sanitizeCosts(raw) {
   const input = raw !== null && typeof raw === 'object' ? raw : {}
   const budgetRuns = Number(input.budgetRuns)
-  const budgetHours = Number(input.budgetHours)
-  const warnAt = Number(input.warnAt)
+  const budgetHours = Number(input.budgetHours), warnAt = Number(input.warnAt)
   return {
     budgetRuns: Number.isFinite(budgetRuns) && budgetRuns > 0 ? Math.min(Math.round(budgetRuns), 100000) : 500,
     budgetHours: Number.isFinite(budgetHours) && budgetHours > 0 ? Math.min(Math.round(budgetHours), 100000) : 80,
     warnAt: Number.isFinite(warnAt) && warnAt > 0 ? Math.max(10, Math.min(Math.round(warnAt), 100)) : 80,
+    prices: sanitizePrices(input.prices), // 元/百万 token；空表只报 token 不报钱
   }
 }
 export function cleanId(value, prefix) {

package/src/host/impact.js

@@ -13,7 +13,9 @@ export function casesOfTasks(tasks, limit = 40) {
         key: `${task.id}:${item.id}`,
         title: String(item.title ?? '').slice(0, 160),
         result: String(item.result ?? 'pending'),
-        http: item.http === true,
+        // 能自动跑的判断要和执行器一致：接口 / shell / 数据库任一都算。
+        http: item.http !== null && item.http !== undefined,
+        runnable: item.http != null || item.shell != null || item.db != null,
       })
     }
   }
@@ -26,7 +28,7 @@ export function impactSummary(tasks) {
   return {
     cards: (Array.isArray(tasks) ? tasks : []).length,
     cases: cases.length,
-    runnable: cases.filter(item => item.http).length,
+    runnable: cases.filter(item => item.runnable === true).length,
     failing: cases.filter(item => item.result === 'fail').length,
   }
 }

package/src/host/routes/insights.js

@@ -2,6 +2,8 @@ import {
   buildDashboard,
 } from '../executor.js'
 import { runSummary } from '../dispatcher.js'
+import { collectSessionUsage, aggregateUsage } from '../session-usage.js'
+import { costOf } from '../usage.js'
 const INJECTED = ['getDispatcher', "buildAnalytics","buildMetrics","burndownReport","sendJson","workloadReport"]
 let host = {
   getDispatcher: () => undefined,
@@ -74,9 +76,12 @@ export async function handleInsightsRoute({ method, route, req, res, store, url
     const level = Math.max(runRate, hourRate) >= 100
       ? 'over'
       : Math.max(runRate, hourRate) >= budget.warnAt ? 'warn' : 'ok'
+    // 真实 token 用量：读 studio-* 会话日志，按卡 / 按专家汇总；价目表为空时只给 token。
+    const usage = aggregateUsage(await collectSessionUsage(), store.snapshot().tasks, budget.prices ?? [], costOf)
     host.sendJson(res, 200, {
       ok: true,
       costs: summary,
+      usage,
       budget: {
         ...budget,
         runs,

package/src/host/routes/requirements.js

@@ -7,6 +7,7 @@ import {
   sanitizeRequirementPool,
   text,
 } from '../domain.js'
+import { casesOfTasks, impactSummary } from '../impact.js'
 import {
   ensureReqFolder,
   mutateReqDoc,
@@ -405,7 +406,25 @@ export async function handleRequirementRoute({ method, route, req, res, store, u
     host.sendJson(res, 200, { ok: true, requirement: result, state: host.publicState(store) })
     return true
   }
-  if (method === 'POST' && route === '/requirement/pull') {
+  if (method === 'POST' && route === '/requirement/impact') {
+  // 需求一改，这条需求下面的卡和用例就要重看。这里只算、不改数据。
+  const body = await host.readJsonBody(req)
+  const id = String(body.id ?? '')
+  const snapshot = store.snapshot()
+  const requirement = (snapshot.requirements ?? []).find(item => item.id === id)
+  if (requirement === undefined) throw new Error(`no requirement ${id}`)
+  const tasks = (snapshot.tasks ?? []).filter(task => task.requirementId === id)
+  const summary = impactSummary(tasks)
+  const cases = casesOfTasks(tasks, 60)
+  host.sendJson(res, 200, {
+    ok: true,
+    summary,
+    cases,
+    cards: tasks.map(task => ({ id: task.id, code: task.code ?? '', title: task.title ?? '', status: task.status ?? '' })),
+  })
+  return true
+}
+if (method === 'POST' && route === '/requirement/pull') {
     const body = await host.readJsonBody(req)
     const result = await pullFeishuDoc(body.url ?? body.docUrl ?? '')
     host.sendJson(res, 200, { ok: true, ...result })

package/src/host/session-usage.js

@@ -0,0 +1,100 @@
+// 从 dsh 的会话日志里读用量：<home>/.dsh/sessions/<ws>/studio-<taskId>-<expert>/session.v4.jsonl.zstd
+// 用 zstd 解压（宿主上本来就有），按 mtime 缓存，避免每刷新一次效能页都重解一遍。
+import { execFile } from 'node:child_process'
+import { promisify } from 'node:util'
+import { readdir, stat } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+import { parseUsageLines, summarizeUsage } from './usage.js'
+
+const run = promisify(execFile)
+const CACHE = new Map()
+
+export function sessionsRoot() {
+  return join(homedir(), '.dsh', 'sessions')
+}
+
+/** studio-<taskId>-<expertId>：taskId 形如 t-01a3c8d3，剩下都算专家。 */
+export function parseSessionName(name) {
+  const match = /^studio-(t-[a-z0-9]+)-(.+)$/.exec(String(name ?? ''))
+  if (match === null) return null
+  return { taskId: match[1], expert: match[2] }
+}
+
+async function readFileUsage(file) {
+  let mtimeMs = 0
+  try { mtimeMs = (await stat(file)).mtimeMs } catch { return null }
+  const cached = CACHE.get(file)
+  if (cached !== undefined && cached.mtimeMs === mtimeMs) return cached.usage
+  let usage = []
+  try {
+    const { stdout } = await run('zstd', ['-dc', file], { maxBuffer: 256 * 1024 * 1024 })
+    usage = parseUsageLines(stdout.split('\n'))
+  } catch {
+    // 没装 zstd 或者文件坏了：当作读不到，不抛，页面上显示未知
+    usage = []
+  }
+  CACHE.set(file, { mtimeMs, usage })
+  return usage
+}
+
+/** 扫一遍所有 studio-* 会话，返回 [{ taskId, expert, at, usage }]。 */
+export async function collectSessionUsage(root = sessionsRoot()) {
+  const out = []
+  let workspaces = []
+  try { workspaces = await readdir(root) } catch { return out }
+  for (const workspace of workspaces) {
+    const dir = join(root, workspace)
+    let entries = []
+    try { entries = await readdir(dir) } catch { continue }
+    for (const entry of entries) {
+      const parsed = parseSessionName(entry)
+      if (parsed === null) continue
+      const usage = await readFileUsage(join(dir, entry, 'session.v4.jsonl.zstd'))
+      if (usage === null || usage.length === 0) continue
+      out.push({ taskId: parsed.taskId, expert: parsed.expert, usage })
+    }
+  }
+  return out
+}
+
+/** 按卡 / 按专家汇总 token 与钱；prices 来自 config.costs.prices。 */
+export function aggregateUsage(sessions, tasks, prices, costOf) {
+  const byCard = new Map()
+  const byExpert = new Map()
+  const totals = { calls: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+  for (const session of sessions) {
+    const summary = summarizeUsage(session.usage)
+    const money = costOf(prices, session.usage)
+    for (const key of ['calls', 'input', 'output', 'cacheRead', 'cacheWrite', 'total']) totals[key] += summary[key]
+    const card = byCard.get(session.taskId) ?? { taskId: session.taskId, ...{ calls: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }, cost: 0, unknownCalls: 0 }
+    for (const key of ['calls', 'input', 'output', 'cacheRead', 'cacheWrite', 'total']) card[key] += summary[key]
+    if (money.cost !== null) card.cost += money.cost
+    card.unknownCalls += money.unknownCalls
+    byCard.set(session.taskId, card)
+    const expert = byExpert.get(session.expert) ?? { expert: session.expert, calls: 0, total: 0, cost: 0, unknownCalls: 0 }
+    expert.calls += summary.calls
+    expert.total += summary.total
+    if (money.cost !== null) expert.cost += money.cost
+    expert.unknownCalls += money.unknownCalls
+    byExpert.set(session.expert, expert)
+  }
+  const taskOf = new Map((Array.isArray(tasks) ? tasks : []).map((task) => [String(task.id ?? ''), task]))
+  const cards = [...byCard.values()].map((card) => {
+    const task = taskOf.get(card.taskId)
+    return { ...card, code: String(task?.code ?? ''), title: String(task?.title ?? ''), project: String(task?.project ?? '') }
+  }).sort((a, b) => b.total - a.total)
+  const round = (value) => Math.round(value * 10000) / 10000
+  return {
+    totals: {
+      ...totals,
+      // 有算不出价的调用且一分钱都没算出来时，给 null（未知），不要报成 0
+      cost: cards.reduce((sum, card) => sum + card.unknownCalls, 0) > 0 && cards.reduce((sum, card) => sum + card.cost, 0) === 0
+        ? null
+        : round(cards.reduce((sum, card) => sum + card.cost, 0)),
+      unknownCalls: cards.reduce((sum, card) => sum + card.unknownCalls, 0),
+    },
+    cards: cards.slice(0, 50),
+    experts: [...byExpert.values()].map((row) => ({ ...row, cost: round(row.cost) })).sort((a, b) => b.total - a.total),
+  }
+}

package/src/host/usage.js

@@ -0,0 +1,124 @@
+// 会话用量解析：从 dsh 的 session.v4.jsonl 里把每次模型调用的 token 取出来。
+// 纯函数，方便单测；读文件那半在 session-usage.js。
+//
+// 日志形状（实测）：
+//   {"type":"assistant/message","seq":19,"time":...,"data":{"turn":1,"step":1,"message":{...},
+//    "usage":{"inputTokens":3033,"outputTokens":116,"cacheReadTokens":17024,"cacheWriteTokens":0,"totalTokens":20173},
+//    "stream":[{"type":"chunk","chunk":{"type":"usage",...}}]}}
+// 同一条消息里 usage 会出现两次（消息体 + 流式 chunk），所以只认 assistant/message 上的那一份。
+
+/** 从日志里挑出一条记录对应的用量；不是 assistant/message 就返回 null。 */
+export function usageOfEntry(entry) {
+  if (entry === null || typeof entry !== 'object') return null
+  if (entry.type !== 'assistant/message') return null
+  const data = entry.data ?? {}
+  const usage = data.usage ?? data.message?.usage ?? null
+  if (usage === null || typeof usage !== 'object') return null
+  const number = (value) => {
+    const parsed = Number(value)
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : 0
+  }
+  const input = number(usage.inputTokens)
+  const output = number(usage.outputTokens)
+  const cacheRead = number(usage.cacheReadTokens)
+  const cacheWrite = number(usage.cacheWriteTokens)
+  return {
+    at: Number(entry.time) || 0,
+    turn: Number(data.turn) || 0,
+    model: String(data.model ?? entry.model ?? ''),
+    input,
+    output,
+    cacheRead,
+    cacheWrite,
+    total: number(usage.totalTokens) || input + output + cacheRead + cacheWrite,
+  }
+}
+
+/** 解析整个 jsonl（已解压的行数组），返回每条消息的用量。坏行跳过，不抛。 */
+export function parseUsageLines(lines) {
+  const out = []
+  // 模型名不挂在每条消息上：它在会话头 / 请求上下文里（data.header.config.model 或 data.model），
+  // 所以一边扫一边记，后面没有 model 的消息沿用最近一次看到的。
+  let model = ''
+  for (const line of Array.isArray(lines) ? lines : []) {
+    const trimmed = String(line ?? '').trim()
+    if (trimmed === '' || trimmed[0] !== '{') continue
+    let entry = null
+    try { entry = JSON.parse(trimmed) } catch { continue }
+    const declared = entry?.data?.model ?? entry?.data?.header?.config?.model
+    if (typeof declared === 'string' && declared !== '') model = declared
+    const usage = usageOfEntry(entry)
+    if (usage !== null) out.push({ ...usage, model: usage.model === '' ? model : usage.model })
+  }
+  return out
+}
+
+/** 汇总：token 数按类型分开，别把缓存命中混进普通输入。 */
+export function summarizeUsage(entries) {
+  const list = Array.isArray(entries) ? entries : []
+  const sum = (field) => list.reduce((total, item) => total + (Number(item?.[field]) || 0), 0)
+  return {
+    calls: list.length,
+    input: sum('input'),
+    output: sum('output'),
+    cacheRead: sum('cacheRead'),
+    cacheWrite: sum('cacheWrite'),
+    total: sum('total'),
+  }
+}
+
+/** 订阅套餐通道：*-coding / *-token-plan —— 走包月额度，token 照记但不算钱。 */
+export function isSubscriptionModel(model) {
+  return /-(coding|token-plan)$/.test(String(model ?? ''))
+}
+
+/**
+ * 价目表按 model 查：prices 来自 config.costs.prices（单位：元 / 百万 token）。
+ * 查不到就返回 null —— 宁可显示"未知"，也不能按 0 算成免费。
+ */
+export function priceOf(prices, model) {
+  const name = String(model ?? '')
+  if (name === '') return null
+  const list = Array.isArray(prices) ? prices : []
+  const hit = list.find((item) => String(item?.model ?? '') === name)
+  if (hit === undefined) return null
+  return {
+    input: Number(hit.input) || 0,
+    output: Number(hit.output) || 0,
+    cacheRead: Number(hit.cacheRead) || 0,
+    cacheWrite: Number(hit.cacheWrite) || 0,
+  }
+}
+
+/**
+ * 算钱：命中价目表才给数字，订阅通道给 0（明确"不额外收费"），
+ * 其它情况给 null（未知）。
+ */
+export function costOf(prices, entries) {
+  const list = Array.isArray(entries) ? entries : []
+  if (list.length === 0) return { cost: 0, priced: true, unknownCalls: 0 }
+  let cost = 0
+  let unknownCalls = 0
+  for (const item of list) {
+    if (isSubscriptionModel(item.model)) continue
+    const price = priceOf(prices, item.model)
+    if (price === null) { unknownCalls += 1; continue }
+    const million = 1000000
+    cost += (Number(item.input) || 0) / million * price.input
+    cost += (Number(item.output) || 0) / million * price.output
+    cost += (Number(item.cacheRead) || 0) / million * price.cacheRead
+    cost += (Number(item.cacheWrite) || 0) / million * price.cacheWrite
+  }
+  return { cost: unknownCalls > 0 && cost === 0 ? null : Math.round(cost * 10000) / 10000, priced: unknownCalls === 0, unknownCalls }
+}
+
+export function sanitizePrices(raw) {
+  if (!Array.isArray(raw)) return []
+  return raw.slice(0, 50).map((item) => ({
+    model: String(item?.model ?? '').trim().slice(0, 80),
+    input: Number(item?.input) || 0,
+    output: Number(item?.output) || 0,
+    cacheRead: Number(item?.cacheRead) || 0,
+    cacheWrite: Number(item?.cacheWrite) || 0,
+  })).filter((item) => item.model !== '')
+}