@dsh-workbench/shared 0.1.9 → 0.1.11

package/src/host/unit-face.ts

@@ -4,7 +4,7 @@ import type { RouteTable } from '../host/http.js';
 import type { LongTaskBase, LongTaskHost, LongTaskRegistry } from '../host/long-task.js';
 import type { ProvisionHandler } from '../host/provision.js';
 import type { UnitCapability } from './unit-libs.js';
-import type { ApprovalCall, ApprovalFacts } from '../host/tool-approval.js';
+import type { ApprovalCall, ApprovalFacts, ApprovalPolicy } from '../host/tool-approval.js';
 import type { ValueHandoff } from '../host/value-handoff.js';
 import type { WorkspaceStore } from '../host/workspace-store.js';
 
@@ -57,6 +57,7 @@ export interface UnitMountResult {
   readonly approvalDetail?:
     | ((call: ApprovalCall) => ApprovalFacts | undefined | Promise<ApprovalFacts | undefined>)
     | undefined;
+  readonly needsApproval?: ApprovalPolicy | undefined;
 }
 
 export interface UnitHostFace {

package/src/host/unit-libs.ts

@@ -27,7 +27,7 @@ export interface UnitPluginState {
 
 export interface UnitCapability {
   readonly unit: string;
-  readonly status: "ok" | "missing-commands" | "missing-plugin" | "unchecked";
+  readonly status: "ok" | "failed" | "missing-commands" | "missing-plugin" | "unchecked";
   readonly plugin?: string;
   readonly required: readonly string[];
   readonly missing: readonly string[];

package/src/i18n/en.ts

@@ -10,6 +10,20 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'project.none': 'No project',
   'project.empty': 'No projects yet. Use “Add project” below.',
   'project.add': 'Add project…',
+  'project.search.label': 'Search workspaces',
+  'project.search.placeholder': 'Search workspaces (folder / name / path)',
+  'project.search.empty': 'No workspace matches “{query}”.',
+  'project.rename.row': 'Rename “{name}”',
+  'project.rename.current': 'Give this workspace a display name…',
+  'project.rename.title': 'Give “{name}” a display name',
+  'project.rename.description': 'Shown after the folder name. It renames the workspace itself.',
+  'project.rename.field': 'Display name',
+  'project.rename.placeholder': 'e.g. Workbench shell',
+  'project.rename.hint': 'Empty = folder name only',
+  'project.rename.save': 'Save',
+  'project.rename.saving': 'Saving…',
+  'project.rename.cancel': 'Cancel',
+  'project.rename.failed': 'Rename failed. Try again.',
   'session.new': 'New session',
   'session.new.label': 'Start a session in the current project',
   'session.empty': 'No sessions in this project yet.',
@@ -35,11 +49,13 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.enabled': 'enabled in this project',
   'panels.disabled': 'not enabled in this project',
   'panels.choose': 'Choose modules',
+  'panels.buildModule': 'Build a module',
   'panels.failed': 'Could not save the change. Try again.',
   'panels.hintEffect': 'Disabling = the agent cannot reach that data',
   'panels.dragHint': 'Drag to reorder',
   'panels.unknownStep': 'No suite provides this view',
   'panels.labelWithHint': '{label} ({hint})',
+  'panels.dep.failed': '⚠ failed to start',
   'panels.dep.missingPlugin': '⚠ not ready yet',
   'panels.dep.missingCommands': '⚠ needs an update',
   'panels.dep.unchecked': '⚠ cannot check',
@@ -235,6 +251,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'blocker.exec.hint': 'Make sure opencli is installed and on PATH (which opencli).',
   'blocker.unknown.title': 'Something went wrong',
   'panels.reading': 'Reading the panel setup…',
+  'panels.cardBroken': 'This module will not render: {unit} ({reason})',
+  'panels.cardRetry': 'Retry',
   'panels.empty': 'No modules on the panel yet',
   'panels.emptyHint': 'You can also just tell the agent: “add a module to the panel”.',
   'env.title': 'Preparing the workbench',
@@ -273,6 +291,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'env.step.warm': 'Warming up site sessions',
   'env.warm.done': '{n} site(s) warmed up',
   'env.warm.short': 'Not warmed this time — harmless; the panel heals on first read',
+  'env.unit.failed': 'This module cannot start',
+  'env.unit.failedHint': 'It failed while assembling itself; other modules are unaffected.',
   'env.unit.missingPlugin': 'This module is not ready yet',
   'env.unit.missingCommandsHint': 'Updating it should fix this.',
   'env.unit.unchecked': 'Cannot check: no shell channel',

package/src/i18n/merge.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { mergeMessages } from './merge.js';
+import { mergeMessages, mergeMessagesSkipping } from './merge.js';
 
 const base = { zh: { 'board.title': '看板' }, en: { 'board.title': 'Board' } };
 
@@ -58,3 +58,64 @@ describe('mergeMessages', () => {
     ).toThrow(/是空的/);
   });
 });
+
+describe('mergeMessagesSkipping', () => {
+  const good = {
+    unit: 'issues',
+    messages: { zh: { 'issues.mine': '我的缺陷' }, en: { 'issues.mine': 'My defects' } },
+  };
+  const bad = {
+    unit: 'cmdb',
+    messages: { zh: { 'wrong.prefix': '错了' }, en: { 'wrong.prefix': 'nope' } },
+  };
+  const later = {
+    unit: 'builds',
+    messages: { zh: { 'builds.recent': '最近构建' }, en: { 'builds.recent': 'Recent builds' } },
+  };
+
+  it('★ 一份坏文案只废它自己：好的照并、坏的报出来', () => {
+    const { dictionaries, problems } = mergeMessagesSkipping(base, [good, bad, later]);
+
+    expect(dictionaries.zh).toEqual({
+      'board.title': '看板',
+      'issues.mine': '我的缺陷',
+      'builds.recent': '最近构建',
+    });
+    expect(dictionaries.en['builds.recent']).toBe('Recent builds');
+    expect(problems).toHaveLength(1);
+    expect(problems[0]?.unit).toBe('cmdb');
+    expect(problems[0]?.reason).toMatch(/必须以 "cmdb\." 开头/);
+  });
+
+  it('★ 坏的在前、好的在后：后面那份不受影响（不会因为前者坏就整批拒收）', () => {
+    const { dictionaries, problems } = mergeMessagesSkipping(base, [bad, good]);
+
+    expect(dictionaries.zh['issues.mine']).toBe('我的缺陷');
+    expect(problems.map((item) => item.unit)).toEqual(['cmdb']);
+  });
+
+  it('都好时与 mergeMessages 逐字一致、没有问题', () => {
+    const { dictionaries, problems } = mergeMessagesSkipping(base, [good, later]);
+
+    expect(dictionaries).toEqual(mergeMessages(base, [good, later]));
+    expect(problems).toEqual([]);
+  });
+
+  it('与外壳自己的键撞名的那份被跳过，且报的是撞名的双方', () => {
+    const clash = {
+      unit: 'board',
+      messages: { zh: { 'board.title': '看板改' }, en: { 'board.title': 'Board!' } },
+    };
+    const { dictionaries, problems } = mergeMessagesSkipping(base, [clash]);
+
+    expect(dictionaries.zh['board.title']).toBe('看板');
+    expect(problems[0]?.reason).toMatch(/文案键冲突：board\.title 由 外壳 与 board/);
+  });
+
+  it('没带文案的那份直接跳过，不算问题', () => {
+    const { dictionaries, problems } = mergeMessagesSkipping(base, [{ unit: 'nothing' }]);
+
+    expect(dictionaries).toEqual(base);
+    expect(problems).toEqual([]);
+  });
+});

package/src/i18n/merge.ts

@@ -52,3 +52,39 @@ export function mergeMessages(
 
   return { zh, en };
 }
+
+export interface MessagesProblem {
+  readonly unit: string;
+  readonly reason: string;
+}
+
+export interface MessagesMerge {
+  readonly dictionaries: Dictionaries;
+  readonly problems: readonly MessagesProblem[];
+}
+
+function reasonOf(error: unknown): string {
+  if (error instanceof Error) return error.message;
+  return typeof error === 'string' ? error : String(error);
+}
+
+export function mergeMessagesSkipping(
+  base: Dictionaries,
+  contributions: readonly MessagesContribution[],
+): MessagesMerge {
+  let dictionaries = base;
+  const accepted: MessagesContribution[] = [];
+  const problems: MessagesProblem[] = [];
+
+  for (const item of contributions) {
+    if (item.messages === undefined) continue;
+    try {
+      dictionaries = mergeMessages(base, [...accepted, item]);
+      accepted.push(item);
+    } catch (error) {
+      problems.push({ unit: item.unit, reason: reasonOf(error) });
+    }
+  }
+
+  return { dictionaries, problems };
+}

package/src/i18n/zh.ts

@@ -8,6 +8,20 @@ export const zh = {
   'project.none': '未选择项目',
   'project.empty': '还没有项目。用下面的「添加项目」选一个目录。',
   'project.add': '添加项目…',
+  'project.search.label': '搜索工作区',
+  'project.search.placeholder': '搜索工作区（目录名 / 中文名 / 路径）',
+  'project.search.empty': '没有匹配「{query}」的工作区。',
+  'project.rename.row': '改「{name}」的中文名',
+  'project.rename.current': '改当前工作区的中文名…',
+  'project.rename.title': '给「{name}」配一个中文名',
+  'project.rename.description': '显示在目录名后面。改的是工作区本身的名字。',
+  'project.rename.field': '中文名',
+  'project.rename.placeholder': '例如：工作台外壳',
+  'project.rename.hint': '留空 = 只显示目录名',
+  'project.rename.save': '保存',
+  'project.rename.saving': '保存中…',
+  'project.rename.cancel': '取消',
+  'project.rename.failed': '改名失败了，再试一次。',
   'session.new': '新会话',
   'session.new.label': '在当前项目新建会话',
   'session.empty': '这个项目还没有会话。',
@@ -33,11 +47,13 @@ export const zh = {
   'panels.enabled': '这个项目已启用',
   'panels.disabled': '这个项目未启用',
   'panels.choose': '选择模块',
+  'panels.buildModule': '造一个模块',
   'panels.failed': '改配置失败了，再试一次。',
   'panels.hintEffect': '停用 = agent 拿不到相关数据',
   'panels.dragHint': '拖动调整顺序',
   'panels.unknownStep': '这一层没有套件提供',
   'panels.labelWithHint': '{label}（{hint}）',
+  'panels.dep.failed': '⚠ 起不来',
   'panels.dep.missingPlugin': '⚠ 还没装好',
   'panels.dep.missingCommands': '⚠ 需要更新',
   'panels.dep.unchecked': '⚠ 检测不了',
@@ -231,6 +247,8 @@ export const zh = {
   'blocker.exec.hint': '确认 opencli 已安装且在 PATH 里（which opencli）。',
   'blocker.unknown.title': '出了点问题',
   'panels.reading': '正在读取面板配置…',
+  'panels.cardBroken': '这个模块起不来：{unit}（{reason}）',
+  'panels.cardRetry': '重试',
   'panels.empty': '面板里还没有模块',
   'panels.emptyHint': '也可以直接跟 agent 说：「把某个模块加到面板」。',
   'env.title': '准备工作台',
@@ -269,6 +287,8 @@ export const zh = {
   'env.step.warm': '预热站点登录态',
   'env.warm.done': '已预热 {n} 个站点',
   'env.warm.short': '这次没热上 —— 不影响用，面板第一次读取会自己补',
+  'env.unit.failed': '这个模块起不来',
+  'env.unit.failedHint': '它自己装配时报了错，别的模块不受影响。',
   'env.unit.missingPlugin': '这个模块还没装好',
   'env.unit.missingCommandsHint': '更新之后就能用了。',
   'env.unit.unchecked': '检测不了：拿不到执行通道',

package/src/index.ts

@@ -14,6 +14,7 @@ export * from './components/Activity.js';
 export * from './components/ApprovalDetail.js';
 export * from './components/ApprovalPlan.js';
 export * from './components/Card.js';
+export * from './components/CardBoundary.js';
 export * from './components/CardHead.js';
 export * from './components/ChoiceGroup.js';
 export * from './components/LongTaskRow.js';

package/src/lib/react.ts

@@ -6,6 +6,8 @@ export const h = react.createElement;
 
 export const Fragment = react.Fragment;
 
+export const Component = react.Component;
+
 export const useState = react.useState;
 export const useEffect = react.useEffect;
 export const useLayoutEffect = react.useLayoutEffect;