@dsh-workbench/shared 0.3.6 → 0.3.7

package/src/host/__tests__/preflight-route.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, it, vi } from 'vitest';
+import { preflightHandler } from '../http.js';
+
+const SNAPSHOT = { phase: 'ready', steps: [], at: 1 };
+
+function handlerWith() {
+  const run = vi.fn(async () => SNAPSHOT);
+  return { run, handler: preflightHandler({ run, snapshot: () => SNAPSHOT }) };
+}
+
+describe('preflightHandler（体检那一拍带什么参数）', () => {
+  it('平时（不带 hard）交给宿主自己判新鲜度', async () => {
+    const { run, handler } = handlerWith();
+
+    await handler(new URLSearchParams(''));
+
+    expect(run).toHaveBeenCalledWith({ hard: false });
+  });
+
+  it('?hard=1 一路传到 run（用户按的那颗「重试」）', async () => {
+    const { run, handler } = handlerWith();
+
+    await handler(new URLSearchParams('hard=1'));
+
+    expect(run).toHaveBeenCalledWith({ hard: true });
+  });
+
+  it('不管 run 跑没跑完，回的都是当前快照（页面靠 400ms 轮询看进度）', () => {
+    const { handler } = handlerWith();
+
+    expect(handler(new URLSearchParams(''))).toEqual({ ok: true, ...SNAPSHOT });
+  });
+});

package/src/host/__tests__/shell-text.test.ts

@@ -0,0 +1,44 @@
+import { execFileSync } from 'node:child_process';
+import { describe, expect, it } from 'vitest';
+import { quoteShellArg, tailLines } from '../shell-text.js';
+
+function shellSees(value: string): string {
+  return execFileSync('/bin/sh', ['-c', `printf '%s' ${quoteShellArg(value)}`], {
+    encoding: 'utf8',
+  });
+}
+
+describe('quoteShellArg', () => {
+  it('普通值原样往返', () => {
+    expect(shellSees('example-monorepo')).toBe('example-monorepo');
+  });
+
+  it('含空格的路径不被拆成两个参数', () => {
+    expect(shellSees('/Volumes/My Projects/app')).toBe('/Volumes/My Projects/app');
+  });
+
+  it('单引号被正确转义（否则就是注入面）', () => {
+    expect(shellSees("it's")).toBe("it's");
+  });
+
+  it('shell 元字符按字面量传递', () => {
+    for (const raw of ['$(whoami)', '`id`', 'a; rm -rf /', 'a && b', '*', '"double"', '\\n']) {
+      expect(shellSees(raw), raw).toBe(raw);
+    }
+  });
+});
+
+describe('tailLines', () => {
+  it('取末尾若干行并去掉首尾空行', () => {
+    expect(tailLines('\n a \n b \n', 2)).toBe('a \n b');
+  });
+
+  it('行数不够时全给', () => {
+    expect(tailLines('only', 6)).toBe('only');
+  });
+
+  it('空输入给空串', () => {
+    expect(tailLines(undefined, 3)).toBe('');
+    expect(tailLines('   ', 3)).toBe('');
+  });
+});

package/src/host/board-fact.ts

@@ -0,0 +1,14 @@
+import { insideWorkshop, type BoardFactState, type BoardProbe } from '../lib/board-fact.js';
+
+/**
+ * 把一次探针读数归成椅面归属。
+ * @param probe - 探针读数。
+ * @param workshop - 当前工作区根路径；`null` 表示还不知道当前是哪个工作区。
+ * @returns 外壳不在、或板路径与工作区缺一 → `unknown`；右栏没开或没画出来 → `hidden`；板在本工作区 → `workshop`，否则 `other`。
+ */
+export function boardFactOf(probe: BoardProbe, workshop: string | null): BoardFactState {
+  if (!probe.workbench) return 'unknown';
+  if (!probe.bar || !probe.open || !probe.drawn) return 'hidden';
+  if (probe.board === '' || workshop === null) return 'unknown';
+  return insideWorkshop(workshop, probe.board) ? 'workshop' : 'other';
+}

package/src/host/browser-read.ts

@@ -1,5 +1,6 @@
 import type { DshShell } from '../api/dsh.js';
-import { parseJsonLoose, tailLines } from '../lib/text.js';
+import { parseJsonLoose } from '../lib/text.js';
+import { tailLines } from './shell-text.js';
 import { backgroundLine } from './opencli-window.js';
 import { runShell } from './shell.js';
 

package/src/host/context-ref.ts

@@ -0,0 +1,40 @@
+import { CONTEXT_MARKER_NAME, encodeRef, type ContextRef } from '../api/context-ref.js';
+
+const MARKER = new RegExp(`@${CONTEXT_MARKER_NAME}:([a-z][a-z0-9-]*:[A-Za-z0-9._~%#/-]+)`, 'g');
+
+const TRAILING_PUNCTUATION = /[.,;:!?]+$/;
+
+/**
+ * 把 kind:part/part 文本读回引用。
+ * @param text 待解析文本。
+ * @returns 没冒号、冒号在首尾、种类不是小写字母开头、或冒号后为空时给 undefined；不抛异常。
+ */
+export function decodeRef(text: string): ContextRef | undefined {
+  const at = text.indexOf(':');
+  if (at <= 0 || at === text.length - 1) return undefined;
+  const kind = text.slice(0, at);
+  if (!/^[a-z][a-z0-9-]*$/.test(kind)) return undefined;
+  const parts = text.slice(at + 1).split('/').filter((part) => part !== '');
+  if (parts.length === 0) return undefined;
+  return { kind, parts };
+}
+
+/**
+ * 从一段文本里按出现顺序捞出所有标记引用，同一个引用只留第一次。
+ * @param text 任意文本；null / undefined 当空串。
+ * @returns 解析不出来的标记会被丢掉，所以结果只含合法引用，可能为空数组。
+ */
+export function parseMarkers(text: string): ContextRef[] {
+  const seen = new Set<string>();
+  const refs: ContextRef[] = [];
+  for (const match of String(text ?? '').matchAll(MARKER)) {
+    const raw = match[1].replace(TRAILING_PUNCTUATION, '');
+    const ref = decodeRef(raw);
+    if (ref === undefined) continue;
+    const key = encodeRef(ref);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    refs.push(ref);
+  }
+  return refs;
+}

package/src/{lib → host}/diy-record.ts

@@ -17,7 +17,32 @@ export interface RecordExpect {
 }
 
 /**
- * 一份活着的录制约定：相位 + 谁的会话 + 哪个工作区 / 单元 + 页面 URL 与标题 + 要找的那一次写 + 落盘文件 + 三个时间戳。
+ * 一次「截图」在宿主台账里的那一行：页面上的计数、落图那一刻、落盘路径；没落下来时带 `error` 原文（落成的那条没有它）。
+ */
+export interface RecordShot {
+  readonly n: number;
+  readonly at: number;
+  readonly path: string;
+  readonly error?: string;
+}
+
+/**
+ * 某个页面计数已经试过几次：初拍算一次，失败再试一次；计数一换就从头数。
+ */
+export interface RecordShotTries {
+  readonly n: number;
+  readonly tries: number;
+}
+
+/**
+ * 一张图最多试几次（初拍 + 一次重试）：失败如实报过就停，不每拍重试到底。
+ */
+export const RECORD_SHOT_TRIES = 2;
+
+/**
+ * 一份活着的录制约定：相位 + 谁的会话 + 哪个工作区 / 单元 + 页面 URL 与标题 + 要找的那一次写 +
+ * 落盘文件 + 三个时间戳，以及两份台账：按计数落图的 `shots`（`shotsSeen` 只记落成的那个计数）
+ * 与门铃的 `beats` / `beatMs`（命中几次、最近一次等了多久）。
  */
 export interface RecordState {
   readonly phase: RecordPhase;
@@ -33,6 +58,11 @@ export interface RecordState {
   readonly startedAt: number;
   readonly t0: number | null;
   readonly t1: number | null;
+  readonly shots: readonly RecordShot[];
+  readonly shotsSeen: number;
+  readonly shotTries: RecordShotTries | null;
+  readonly beats: number;
+  readonly beatMs: number;
   readonly at: number;
 }
 
@@ -95,9 +125,26 @@ export interface RecordStore {
   begin(pact: RecordPact): RecordMove;
   started(sessionId: string, at: number, now: number): RecordMove;
   finished(sessionId: string, at: number, now: number): RecordMove;
+  shotTaken(sessionId: string, shot: RecordShot, now: number): RecordMove;
+  shotFailed(sessionId: string, shot: RecordShot, now: number): RecordMove;
+  beat(sessionId: string, ms: number, now: number): RecordMove;
   stop(sessionId: string, now: number): RecordMove;
 }
 
+/**
+ * 这一拍该不该落图：页面计数涨过 `shotsSeen` 才算；同一个计数已经试满就先放下，等他自己再按。
+ * @param state - 当前有效的那份约定。
+ * @param pageShots - 页面浮条上那个「已拍」计数。
+ * @returns 该落的那个计数；不该落给 `null`（没涨 / 试满了 / 不是个正经数）。
+ */
+export function shotDueOf(state: RecordState, pageShots: number): number | null {
+  if (!Number.isFinite(pageShots)) return null;
+  const n = Math.floor(pageShots);
+  if (n <= state.shotsSeen) return null;
+  if (state.shotTries !== null && state.shotTries.n === n && state.shotTries.tries >= RECORD_SHOT_TRIES) return null;
+  return n;
+}
+
 function alive(state: RecordState | null, now: number): RecordState | null {
   if (state === null) return null;
   return now - state.at <= RECORD_STALE_MS ? state : null;
@@ -118,6 +165,19 @@ export function createRecordStore(): RecordStore {
 
   const live = (now: number): RecordState | null => alive(held, now);
 
+  const withShot = (found: RecordState, shot: RecordShot, now: number, error: string | undefined): RecordState => {
+    const row: RecordShot = error === undefined ? shot : { n: shot.n, at: shot.at, path: shot.path, error };
+    const kept = found.shots.filter((one) => one.n !== shot.n);
+    const tries = found.shotTries !== null && found.shotTries.n === shot.n ? found.shotTries.tries : 0;
+    return {
+      ...found,
+      shots: [...kept, row].sort((one, two) => one.n - two.n),
+      shotsSeen: error === undefined ? Math.max(found.shotsSeen, shot.n) : found.shotsSeen,
+      shotTries: error === undefined ? null : { n: shot.n, tries: tries + 1 },
+      at: now,
+    };
+  };
+
   return {
     live,
 
@@ -140,6 +200,11 @@ export function createRecordStore(): RecordStore {
         startedAt: pact.now,
         t0: null,
         t1: null,
+        shots: [],
+        shotsSeen: 0,
+        shotTries: null,
+        beats: 0,
+        beatMs: 0,
         at: pact.now,
       };
       held = state;
@@ -165,6 +230,35 @@ export function createRecordStore(): RecordStore {
       return { ok: true, state };
     },
 
+    shotTaken(sessionId, shot, now) {
+      const found = ownerOf(held, sessionId, now);
+      if (typeof found === 'string') return { ok: false, code: found };
+      const state = withShot(found, shot, now, undefined);
+      held = state;
+      return { ok: true, state };
+    },
+
+    shotFailed(sessionId, shot, now) {
+      const found = ownerOf(held, sessionId, now);
+      if (typeof found === 'string') return { ok: false, code: found };
+      const state = withShot(found, shot, now, shot.error === undefined ? '落图失败' : shot.error);
+      held = state;
+      return { ok: true, state };
+    },
+
+    beat(sessionId, ms, now) {
+      const found = ownerOf(held, sessionId, now);
+      if (typeof found === 'string') return { ok: false, code: found };
+      const state: RecordState = {
+        ...found,
+        beats: found.beats + 1,
+        beatMs: Math.max(0, Math.floor(ms)),
+        at: now,
+      };
+      held = state;
+      return { ok: true, state };
+    },
+
     stop(sessionId, now) {
       const found = ownerOf(held, sessionId, now);
       if (typeof found === 'string') return { ok: false, code: found };

package/src/host/facts.ts

@@ -1,4 +1,5 @@
 import type { UnitManifest } from '../api/unit.js';
+import { FACT_SCOPE_SUFFIX } from '../api/facts.js';
 
 export interface FactChange {
   readonly rev: number;
@@ -67,3 +68,12 @@ export function wroteNow(result: unknown): boolean | undefined {
   const wrote = (value as { wrote?: unknown } | null)?.wrote;
   return typeof wrote === 'boolean' ? wrote : undefined;
 }
+
+/**
+ * 由单元 id 拼出它那一族事实的范围名。
+ * @param unit 单元 id，不带后缀。
+ * @returns <unit>* —— 永远是范围名，不是某一条事实。
+ */
+export function unitFactScope(unit: string): string {
+  return `${unit}${FACT_SCOPE_SUFFIX}`;
+}

package/src/host/git.ts

@@ -1,5 +1,5 @@
 import type { DshShell } from '../api/dsh.js';
-import { quoteShellArg, tailLines } from '../lib/text.js';
+import { quoteShellArg, tailLines } from './shell-text.js';
 import { runShell } from './shell.js';
 
 export type OriginRead =

package/src/host/http.ts

@@ -1,6 +1,6 @@
 import type { DshHostContext, DshRequest, DshResponse } from '../api/dsh.js';
-import { unitFactScope } from '../api/facts.js';
-import { parseCardsReport, parseCrashReport, type PanelStateStore } from '../lib/panel-state.js';
+import { unitFactScope } from './facts.js';
+import { parseCardsReport, parseCrashReport, type PanelStateStore } from './panel-state.js';
 import { ACTIONS_PREFIX, API_PREFIX, DIY_DEBUG_PATH, DIY_RECORD_PATH, PANEL_STATE_PREFIX, PLUGIN_ID, PREFS_PREFIX, PROVISION_PREFIX } from '../config/constants.js';
 import {
   parseProvisionBody,
@@ -228,11 +228,11 @@ export function changesHandler(log: {
 }
 
 export function preflightHandler(preflight: {
-  run(options?: { force?: boolean }): Promise<unknown>;
+  run(options?: { hard?: boolean }): Promise<unknown>;
   snapshot(): unknown;
 }): RouteHandler {
   return (search) => {
-    void preflight.run({ force: flag(search, 'force') });
+    void preflight.run({ hard: flag(search, 'hard') });
     return { ok: true, ...(preflight.snapshot() as Record<string, unknown>) };
   };
 }

package/src/host/long-task.ts

@@ -48,11 +48,16 @@ export interface LongTaskDeps<S extends LongTaskBase> {
   readonly recentMs?: number | undefined;
 }
 
+/**
+ * 一个单元的长任务注册表：`current(workspace)` 是面板那一行要的投影，`live()` 是外壳侧栏那颗
+ * loading 点要的（**不分工作区、不分目标**，把现在活着的每一趟交出来），`stop` 只把中断信号转给生产方。
+ */
 export interface LongTaskRegistry<S extends LongTaskBase> {
   start(options: LongTaskStart): S;
   snapshot(id: string): S | null;
   active(workspace: string, target: string): S | null;
   current(workspace: string): readonly Readonly<Record<string, unknown>>[];
+  live(): readonly S[];
   stop(id: string, by?: string): boolean;
   onChange(listener: (change: LongTaskChange<S>) => void): () => void;
 }
@@ -113,6 +118,10 @@ export function createLongTaskRegistry<S extends LongTaskBase>(deps: LongTaskDep
         .map((snapshot) => ({ ...deps.view(snapshot as S), id: snapshot.id }));
     },
 
+    live() {
+      return [...runs.values()].filter((snapshot) => LIVE.has(snapshot.status)) as S[];
+    },
+
     start(options) {
       const running = this.active(options.workspace, options.target);
       if (running !== null) return running;

package/src/host/opencli-runtime.ts

@@ -1,6 +1,6 @@
 import { OPENCLI_PIN } from '../config/constants.js';
 import type { UnitLibNeed } from '../api/unit.js';
-import { quoteShellArg } from '../lib/text.js';
+import { quoteShellArg } from './shell-text.js';
 
 import { dshHome } from './data-root.js';
 

package/src/host/opencli-window.ts

@@ -1,4 +1,4 @@
-import { quoteShellArg } from '../lib/text.js';
+import { quoteShellArg } from './shell-text.js';
 
 const OPENCLI_WINDOW_ENV = 'OPENCLI_WINDOW=background';
 

package/src/host/opencli.ts

@@ -1,6 +1,7 @@
 import type { DshShell } from '../api/dsh.js';
 import { OPENCLI_MAX_CONCURRENT, OPENCLI_TIMEOUT_MS } from '../config/constants.js';
-import { parseJsonLoose, quoteShellArg, tailLines } from '../lib/text.js';
+import { parseJsonLoose } from '../lib/text.js';
+import { quoteShellArg, tailLines } from './shell-text.js';
 import { helpUrlOf, parseCliErrorEnvelope } from './cli-error.js';
 import { backgroundPrefix } from './opencli-window.js';
 import { runShell } from './shell.js';

package/src/host/plugin-source.ts

@@ -1,5 +1,5 @@
 import type { PluginSource } from '../api/unit.js';
-import { quoteShellArg } from '../lib/text.js';
+import { quoteShellArg } from './shell-text.js';
 import { npmCacheDir, toolchainOpencliDir, vendorPeerLink, vendorPrefix } from '../host/opencli-runtime.js';
 
 export type PluginSourceProblem =

package/src/host/shell-text.ts

@@ -0,0 +1,21 @@
+/**
+ * 把一个值裹成 shell 里的单引号字面量（值里的单引号一并转义），保证元字符按字面量传递。
+ * @param value - 任意值；不是字符串的先 `String()`。
+ * @returns 可安全拼进 `/bin/sh -c` 的一段文本 —— 含空格 / `$()` / `;` / 通配符的值都不会被当成语法。
+ */
+export function quoteShellArg(value: unknown): string {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
+/**
+ * 取一段文本的末尾若干行（如命令输出），顺带去掉首尾空白。
+ * @param text - 原文；`null` / `undefined` 当空串。
+ * @param lines - 最多留几行，默认 6；0 给全篇、负数从开头砍掉那么多行（都是 `slice` 语义），调用方传正数。
+ * @returns 末尾若干行、去首尾空行后的文本；原文行数不够就全给，空输入给空串。
+ */
+export function tailLines(text: string | null | undefined, lines = 6): string {
+  const all = String(text ?? '')
+    .trim()
+    .split('\n');
+  return all.slice(-lines).join('\n');
+}

package/src/{api → host}/unit-declaration.ts

@@ -1,4 +1,4 @@
-import type { UnitEnvNeeds, UnitHostNeeds, UnitManifest } from './unit.js';
+import type { UnitEnvNeeds, UnitHostNeeds, UnitManifest } from '../api/unit.js';
 
 /**
  * 声明协议当前版本；模块清单的 dsh.workbench.apiVersion 要写这个整数。

package/src/host.ts

@@ -1,20 +1,20 @@
 export * from './config/constants.js';
 export * from './api/context-ref.js';
 export * from './api/unit.js';
-export * from './api/unit-declaration.js';
 export * from './api/facts.js';
 export * from './api/long-task.js';
 export * from './lib/text.js';
 export * from './lib/ui.js';
-export * from './lib/panel-state.js';
 export * from './lib/board-fact.js';
-export * from './lib/diy-debug.js';
-export * from './lib/diy-record.js';
 export * from './api/blocker-table.js';
+export * from './host/board-fact.js';
 export * from './host/browser-find.js';
 export * from './host/browser-read.js';
 export * from './host/cli-error.js';
+export * from './host/context-ref.js';
 export * from './host/data-root.js';
+export * from './host/diy-debug.js';
+export * from './host/diy-record.js';
 export * from './host/facts.js';
 export * from './host/git.js';
 export * from './host/http.js';
@@ -22,12 +22,15 @@ export * from './host/long-task.js';
 export * from './host/opencli-runtime.js';
 export * from './host/opencli-window.js';
 export * from './host/opencli.js';
+export * from './host/panel-state.js';
 export * from './host/plugin-ledger.js';
 export * from './host/plugin-source.js';
 export * from './host/provision.js';
+export * from './host/shell-text.js';
 export * from './host/shell.js';
 export * from './host/tool-approval.js';
 export * from './host/tool-kit.js';
+export * from './host/unit-declaration.js';
 export * from './host/unit-face.js';
 export * from './host/unit-libs.js';
 export * from './host/value-handoff.js';

package/src/i18n/en.ts

@@ -40,6 +40,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'session.actions': 'Actions for {name}',
   'status.idle': 'Idle',
   'status.running': 'Running',
+  'status.longTask': 'Long task running',
   'status.waitingApproval': 'Waiting for approval',
   'status.planReview': 'Plan awaiting review',
   'status.waitingAnswer': 'Waiting for your answer',
@@ -53,6 +54,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'project.attention.warning.other': '{n} sessions waiting for you',
   'project.attention.running.one': '1 session running',
   'project.attention.running.other': '{n} sessions running',
+  'project.attention.longTask.one': '1 long task running',
+  'project.attention.longTask.other': '{n} long tasks running',
   'project.attention.done.one': '1 session finished, unread',
   'project.attention.done.other': '{n} sessions finished, unread',
   'project.attention.state.warning': 'Approval',
@@ -441,6 +444,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'record.waiting.note': 'Press "Start recording" on that page, then "Stop recording" when done (it will not switch you back)',
   'record.recording': 'Recording',
   'record.recording.note': 'Press "Stop recording" when done; if the bar is gone press Halt so the agent grabs it first',
+  'record.recording.shots': '; to keep a shot of this moment press "Screenshot" on the bar ({n} taken)',
   'record.finished': 'Recording finished',
   'record.finished.note': 'This run is done — the agent will grab it and wrap up on its own',
   'record.act.cancel': 'Cancel',

package/src/i18n/zh.ts

@@ -38,6 +38,7 @@ export const zh = {
   'session.actions': '{name} 的操作',
   'status.idle': '空闲',
   'status.running': '进行中',
+  'status.longTask': '长任务在跑',
   'status.waitingApproval': '等待审批',
   'status.planReview': '计划待审',
   'status.waitingAnswer': '等待回答',
@@ -51,6 +52,8 @@ export const zh = {
   'project.attention.warning.other': '{n} 个会话在等你点头',
   'project.attention.running.one': '1 个会话在跑',
   'project.attention.running.other': '{n} 个会话在跑',
+  'project.attention.longTask.one': '1 个长任务在跑',
+  'project.attention.longTask.other': '{n} 个长任务在跑',
   'project.attention.done.one': '1 个会话跑完没看',
   'project.attention.done.other': '{n} 个会话跑完没看',
   'project.attention.state.warning': '待审批',
@@ -436,6 +439,7 @@ export const zh = {
   'record.waiting.note': '请在那一页按「开始录制」，做完按「结束录制」（录完不替你切回来）',
   'record.recording': '录制中',
   'record.recording.note': '做完按「结束录制」；浮条没了按「停」，让 agent 先取再收',
+  'record.recording.shots': '；想留一张现场就按浮条上的「截图」（已拍 {n} 张）',
   'record.finished': '录制完成',
   'record.finished.note': '这一段录完了 —— agent 会自己来取并收工，不用你点',
   'record.act.cancel': '取消',

package/src/index.ts

@@ -7,7 +7,6 @@ export * from './api/facts.js';
 export * from './api/host-write.js';
 export * from './api/long-task.js';
 export * from './api/unit-board.js';
-export * from './api/unit-declaration.js';
 export * from './api/unit.js';
 export * from './api/workbench-client.js';
 export * from './api/workbench-contract.js';
@@ -19,6 +18,7 @@ export * from './components/CardAnchor.js';
 export * from './components/CardBoundary.js';
 export * from './components/CardHead.js';
 export * from './components/ChoiceGroup.js';
+export * from './components/ConfirmBar.js';
 export * from './components/Field.js';
 export * from './components/Form.js';
 export * from './components/FormActions.js';
@@ -49,10 +49,7 @@ export * from './i18n/zh.js';
 export * from './lib/blocker-action.js';
 export * from './lib/board-fact.js';
 export * from './lib/busy.js';
-export * from './lib/diy-debug.js';
-export * from './lib/diy-record.js';
 export * from './lib/form-problem.js';
-export * from './lib/panel-state.js';
 export * from './lib/react.js';
 export * from './lib/text.js';
 export * from './lib/ui.js';

package/src/lib/board-fact.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { boardFactOf, boardSituation, insideWorkshop, type BoardProbe } from './board-fact.js';
+import { boardSituation, insideWorkshop, type BoardProbe } from './board-fact.js';
 
 const WORKSHOP = '/w/workbench/diy';
 const FL0XIN = '/w/floxin-app';
@@ -16,38 +16,6 @@ const probe = (over: Partial<BoardProbe> = {}): BoardProbe => ({
 
 const gone = { bar: false, board: '', open: false, drawn: false } as const;
 
-describe('板事实：一份判据，两边共用', () => {
-  it('★★ 画着的就是工坊那块板（含子路径）⇒ workshop', () => {
-    expect(boardFactOf(probe(), WORKSHOP)).toBe('workshop');
-    expect(boardFactOf(probe({ board: `${WORKSHOP}/packages` }), WORKSHOP)).toBe('workshop');
-  });
-
-  it('★★ 画的是别的项目的板 ⇒ other（前缀像但没落在里面也算 other）', () => {
-    expect(boardFactOf(probe({ board: '/w/project' }), WORKSHOP)).toBe('other');
-    expect(boardFactOf(probe({ board: `${WORKSHOP}-other` }), WORKSHOP)).toBe('other');
-  });
-
-  it('★★ 那块板没画在屏上 ⇒ hidden：不挂、没声明开着、量出来不可见，三条里任一条不成立都算', () => {
-    expect(boardFactOf(probe({ bar: false }), WORKSHOP)).toBe('hidden');
-    expect(boardFactOf(probe({ open: false }), WORKSHOP)).toBe('hidden');
-    expect(boardFactOf(probe({ drawn: false }), WORKSHOP)).toBe('hidden');
-  });
-
-  it('★★ 工作台没答话（旧外壳 / 夹具页）⇒ unknown：放行，但不许当成"就是工坊板"', () => {
-    expect(boardFactOf(probe({ workbench: false }), WORKSHOP)).toBe('unknown');
-  });
-
-  it('★ 画着板但说不清是哪块、或不知道工坊在哪 ⇒ unknown', () => {
-    expect(boardFactOf(probe({ board: '' }), WORKSHOP)).toBe('unknown');
-    expect(boardFactOf(probe(), null)).toBe('unknown');
-  });
-
-  it('★★ 顺序要紧：没画在屏上，就别去猜是哪块板', () => {
-    expect(boardFactOf(probe({ board: WORKSHOP, drawn: false }), WORKSHOP)).toBe('hidden');
-    expect(boardFactOf(probe({ workbench: false, bar: false }), WORKSHOP)).toBe('unknown');
-  });
-});
-
 describe('干不了活是为什么：先看人在不在工坊，再看板画没画在屏上', () => {
   it('★★ 在位 ⇒ ok（跟 boardFactOf === "workshop" 是同一个条件）', () => {
     expect(boardSituation(probe(), WORKSHOP)).toBe('ok');

package/src/lib/board-fact.ts

@@ -41,19 +41,6 @@ export function insideWorkshop(root: string, target: string): boolean {
   return target.startsWith(base);
 }
 
-/**
- * 把一次探针读数归成椅面归属。
- * @param probe - 探针读数。
- * @param workshop - 当前工作区根路径；`null` 表示还不知道当前是哪个工作区。
- * @returns 外壳不在、或板路径与工作区缺一 → `unknown`；右栏没开或没画出来 → `hidden`；板在本工作区 → `workshop`，否则 `other`。
- */
-export function boardFactOf(probe: BoardProbe, workshop: string | null): BoardFactState {
-  if (!probe.workbench) return 'unknown';
-  if (!probe.bar || !probe.open || !probe.drawn) return 'hidden';
-  if (probe.board === '' || workshop === null) return 'unknown';
-  return insideWorkshop(workshop, probe.board) ? 'workshop' : 'other';
-}
-
 /**
  * 把探针读数归成左栏那句人话的档位。
  * @param probe - 探针读数。