@dsh-workbench/shared 1.1.14-beta.1 → 1.1.14

package/src/host.ts

@@ -47,7 +47,9 @@ export * from './host/profile-create.js';
 export * from './host/context-ref.js';
 export * from './host/diy-debug.js';
 export * from './host/diy-record.js';
+export * from './host/env-policy.js';
 export * from './host/facts.js';
+export * from './host/fs-write.js';
 export * from './host/git.js';
 export * from './host/http.js';
 export * from './host/lib-capabilities.js';
@@ -76,6 +78,15 @@ export * from './host/cli-error.js';
 export * from './host/data-root.js';
 export * from './host/shell-text.js';
 export * from './host/shell.js';
+export * from './host/seam/intent.js';
+export * from './host/seam/policy.js';
+export * from './host/seam/env.js';
+export * from './host/seam/denial.js';
+export * from './host/seam/run.js';
+export * from './host/seam/exec.js';
+export * from './host/seam/process.js';
+export * from './host/seam/unit-seam.js';
+export * from './host/seam/service.js';
 export * from './host/data-error.js';
 export * from './host/install-failure.js';
 export * from './host/provision.js';

package/src/i18n/en.ts

@@ -594,9 +594,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'env.title': 'Preparing the workbench',
   'env.checking': 'Getting the runtime ready…',
   'env.installing': 'Installing background tools — the first run takes a moment…',
-  'env.installingToolchain': 'Installing the workbench’s own npm / pnpm — the first run downloads them, so it can take a while.',
+  'env.installingToolchain': 'Installing the workbench’s own pnpm — the first run downloads it, so it can take a while.',
   'env.failed': 'One step away',
-  'env.elapsed': 'Waiting {seconds}s',
   'env.stepFailed.install': 'install failed',
   'env.stepFailed.path': 'installed but not found',
   'env.stepFailed.shell': 'cannot reach the command line',
@@ -615,14 +614,15 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'env.fix.whyShell': 'The workbench cannot reach the command line on this machine, so it cannot fetch data \u2014 you cannot install this from here; someone needs to fix the background environment.',
   'env.fix.whyHost': 'The workbench runs a few checks on the command line and collects what they return; this time the command went out and nothing came back. The tools themselves are most likely fine \u2014 reinstalling Node / npm / pnpm will not help.',
   'env.fix.step': 'Run this in a terminal, then hit Retry:',
+  'env.fix.stepRetry': 'Hit Retry to try again; if it still fails you can enter the workbench anyway and restart it once the install succeeds.',
   'env.fix.stepPath': 'Open a new terminal window (or make sure npm\u2019s global bin directory is on PATH), then hit Retry.',
   'env.fix.stepShell': 'Restart the workbench (or dsh); if it keeps happening, the workbench still cannot reach the command line.',
   'env.fix.stepHost': 'Quit the workbench completely (including the tray icon), clear the dsh-* leftovers in the system temp folder, then open it again. If it keeps happening, update dsh.',
   'env.fix.permission': 'Permission denied: rerun with sudo, or point npm\u2019s global directory at your home.',
   'env.fix.network': 'Network unreachable: check your network or proxy, then retry.',
   'env.fix.details': 'Details (for troubleshooting)',
-  'env.log': 'Detailed output',
   'env.retry': 'Retry',
+  'env.failed.continue': 'Enter workbench anyway',
   'env.wake': 'Open browser',
   'env.wake.opening': 'Opening the browser…',
   'env.wake.browserOpen': 'The browser is already running but the extension is not connected — check that it is enabled.',

package/src/i18n/zh.ts

@@ -590,9 +590,8 @@ export const zh = {
   'env.title': '准备工作台',
   'env.checking': '正在准备运行环境…',
   'env.installing': '正在安装后台工具，第一次会慢一点…',
-  'env.installingToolchain': '正在装工作台自己那份 npm / pnpm —— 第一次要下载，慢一点正常。',
+  'env.installingToolchain': '正在装工作台自己那份 pnpm —— 第一次要下载，慢一点正常。',
   'env.failed': '还差一步就能用了',
-  'env.elapsed': '已等待 {seconds} 秒',
   'env.stepFailed.install': '装不上',
   'env.stepFailed.path': '装了但还找不到',
   'env.stepFailed.shell': '连不上命令行',
@@ -611,14 +610,15 @@ export const zh = {
   'env.fix.whyShell': '工作台拿不到这台机器的命令行，所以取不了数据 —— 这一步你装不了，需要有人处理后台环境。',
   'env.fix.whyHost': '工作台要靠命令行跑几条检查，再把结果收回来；这次命令发出去了，结果一直没回来。工具本身多半是好的 —— 重装 Node / npm / pnpm 不会有帮助。',
   'env.fix.step': '在终端里运行下面这条命令，装好之后点「重试」：',
+  'env.fix.stepRetry': '点「重试」再装一次；还装不上也可以先进入工作台 —— 装好之后重启工作台就会用上。',
   'env.fix.stepPath': '新开一个终端窗口（或确认 npm 的全局 bin 目录在 PATH 里），然后点「重试」。',
   'env.fix.stepShell': '重启一次工作台（或 dsh）；如果反复出现，说明工作台还是拿不到命令行。',
   'env.fix.stepHost': '完全退出工作台（托盘图标也要退），清掉系统临时目录里 dsh- 开头的残留，再重新打开；反复出现就升级 dsh。',
   'env.fix.permission': '权限不够：在命令前加 sudo 重跑，或先把 npm 的全局目录配到你的用户目录。',
   'env.fix.network': '网络不通：检查网络或代理设置后重试。',
   'env.fix.details': '详细输出（排障用）',
-  'env.log': '详细输出',
   'env.retry': '重试',
+  'env.failed.continue': '先进入工作台',
   'env.wake': '打开浏览器',
   'env.wake.opening': '正在打开浏览器…',
   'env.wake.browserOpen': '浏览器已经开着，但扩展没连上 —— 检查扩展是否启用。',

package/src/testing/fake-adapter-set.ts

@@ -115,7 +115,6 @@ const runtimePreset = (capabilities: RuntimePort['capabilities'] extends never ?
   runners: () => ({}),
   health: () => ({}),
   seed: () => undefined,
-  warnUnwritableRoot: () => undefined,
 });
 
 const plugins: PluginSurface = {

package/src/testing/host-fakes.ts

@@ -1,5 +1,12 @@
 import { setTimeout as delay } from 'node:timers/promises';
 import type { DshShell } from '../api/dsh.js';
+import type {
+  ProcessChild,
+  ProcessExitEvent,
+  ProcessHost,
+  ProcessSpawnOptions,
+  ProcessStream,
+} from '../host/seam/exec.js';
 
 export interface ShellCall {
   command: string;
@@ -8,6 +15,7 @@ export interface ShellCall {
   onExpiry?: string;
   stdoutMaxBytes?: number;
   env?: Readonly<Record<string, string>>;
+  sandboxPolicy?: unknown;
 }
 
 export interface ShellReply {
@@ -18,6 +26,7 @@ export interface ShellReply {
   aborted?: boolean;
   truncated?: boolean;
   failWith?: Error;
+  sandbox?: { mode?: string; denied?: boolean; enforcement?: string; runnerFailed?: boolean } | undefined;
 }
 
 const tick = (): Promise<void> => delay(0);
@@ -53,6 +62,7 @@ export function createFakeShell(replies: ShellReply[] | ((call: ShellCall, index
             aborted: reply.aborted ?? false,
             stdout: { text: reply.stdout ?? '', truncated: reply.truncated === true },
             stderr: { text: reply.stderr ?? '', truncated: false },
+            ...(reply.sandbox === undefined ? {} : { sandbox: reply.sandbox }),
           };
         },
       };
@@ -80,3 +90,119 @@ export function createFakeLogger() {
     warnings,
   };
 }
+
+export interface FakeProcessReply {
+  readonly stdout?: string;
+  readonly stderr?: string;
+  readonly exitCode?: number | null;
+  readonly signal?: string | null;
+  readonly error?: Error;
+  readonly hang?: boolean;
+}
+
+export interface FakeProcessChild extends ProcessChild {
+  readonly writes: readonly string[];
+  readonly killed: readonly string[];
+  readonly unrefed: boolean;
+  finish(code?: number | null, signal?: string | null): void;
+  emitStdout(chunk: string): void;
+  emitStderr(chunk: string): void;
+  fail(error: Error): void;
+}
+
+export function createFakeProcesses(
+  replies: FakeProcessReply[] | ((call: ProcessSpawnOptions, index: number) => FakeProcessReply) = [],
+) {
+  const calls: ProcessSpawnOptions[] = [];
+  const children: FakeProcessChild[] = [];
+  const host: ProcessHost = {
+    spawn(options) {
+      const index = calls.length;
+      calls.push(options);
+      const reply = typeof replies === 'function' ? replies(options, index) : (replies[index] ?? {});
+      const outListeners: Array<(chunk: string) => void> = [];
+      const errListeners: Array<(chunk: string) => void> = [];
+      const exitListeners: Array<(event: ProcessExitEvent) => void> = [];
+      const errorListeners: Array<(error: Error) => void> = [];
+      const writes: string[] = [];
+      const killed: string[] = [];
+      let unrefed = false;
+      let finished = false;
+      const emitStdout = (chunk: string): void => {
+        for (const listener of outListeners) listener(chunk);
+      };
+      const emitStderr = (chunk: string): void => {
+        for (const listener of errListeners) listener(chunk);
+      };
+      const finish = (code: number | null = 0, signal: string | null = null): void => {
+        if (finished) return;
+        finished = true;
+        for (const listener of exitListeners) listener({ code, signal });
+      };
+      const child: FakeProcessChild = {
+        pid: 4242 + index,
+        stdin: { write: (chunk: string) => writes.push(chunk) },
+        stdout: streamOf(outListeners),
+        stderr: streamOf(errListeners),
+        writes,
+        killed,
+        get unrefed() {
+          return unrefed;
+        },
+        finish,
+        emitStdout,
+        emitStderr,
+        fail(error) {
+          for (const listener of errorListeners) listener(error);
+        },
+        onExit(listener) {
+          exitListeners.push(listener);
+          return () => {
+            const at = exitListeners.indexOf(listener);
+            if (at >= 0) exitListeners.splice(at, 1);
+          };
+        },
+        onError(listener) {
+          errorListeners.push(listener);
+          return () => {
+            const at = errorListeners.indexOf(listener);
+            if (at >= 0) errorListeners.splice(at, 1);
+          };
+        },
+        unref() {
+          unrefed = true;
+        },
+        kill(signal) {
+          killed.push(signal ?? 'SIGTERM');
+          queueMicrotask(() => finish(null, signal ?? 'SIGTERM'));
+        },
+      };
+      children.push(child);
+      if (reply.hang !== true) {
+        queueMicrotask(() => {
+          if (reply.error !== undefined) {
+            child.fail(reply.error);
+            return;
+          }
+          if (reply.stdout !== undefined) emitStdout(reply.stdout);
+          if (reply.stderr !== undefined) emitStderr(reply.stderr);
+          finish(reply.exitCode ?? 0, reply.signal ?? null);
+        });
+      }
+      return child;
+    },
+  };
+  return { host, calls, children };
+}
+
+function streamOf(listeners: Array<(chunk: string) => void>): ProcessStream {
+  return {
+    onData(listener) {
+      listeners.push(listener);
+      return () => {
+        const at = listeners.indexOf(listener);
+        if (at >= 0) listeners.splice(at, 1);
+      };
+    },
+  };
+}

package/dist/lib/unit-plugin.d.ts

@@ -1,28 +0,0 @@
-import type { UnitClientFace } from '../components/board-module.js';
-/**
- * 浏览器面注册需要的那点上下文：`get` / `effect`。
- */
-export interface UnitClientContextLike {
-    get<T = unknown>(name: string): T | undefined;
-    effect(effect: () => void | (() => void), label?: string): () => void;
-}
-/**
- * 一个浏览器插件导出的两件：`inject` / `apply`。
- */
-export interface UnitClientPlugin {
-    readonly inject: readonly string[];
-    apply(ctx: UnitClientContextLike): void;
-}
-/**
- * 把「浏览器面注册进外壳」这段在每个模块里都一样的接线收成一份。
- * 把它直接当插件导出用：`export const { inject, apply } = defineUnitClientPlugin({ … })`。
- * @param options.unit 单元 id。
- * @param options.face 这个单元的浏览器面。
- * @param options.label 清理标签里用的名字；默认用 `unit`。
- * @returns `{ inject, apply }`；`apply` 里取 `workbenchUnits`、缺了就 warn 一声。
- */
-export declare function defineUnitClientPlugin(options: {
-    readonly unit: string;
-    readonly face: UnitClientFace;
-    readonly label?: string | undefined;
-}): UnitClientPlugin;

package/dist/lib/unit-plugin.js

@@ -1,23 +0,0 @@
-/**
- * 把「浏览器面注册进外壳」这段在每个模块里都一样的接线收成一份。
- * 把它直接当插件导出用：`export const { inject, apply } = defineUnitClientPlugin({ … })`。
- * @param options.unit 单元 id。
- * @param options.face 这个单元的浏览器面。
- * @param options.label 清理标签里用的名字；默认用 `unit`。
- * @returns `{ inject, apply }`；`apply` 里取 `workbenchUnits`、缺了就 warn 一声。
- */
-export function defineUnitClientPlugin(options) {
-    const { unit, face } = options;
-    const label = options.label ?? unit;
-    return {
-        inject: ['workbenchUnits'],
-        apply(ctx) {
-            const units = ctx.get('workbenchUnits');
-            if (units === undefined) {
-                console.warn(`[${unit}] 外壳没有提供 workbenchUnits 服务：这张卡片装不进来`);
-                return;
-            }
-            ctx.effect(() => units.registerUnit(face), `${label}: 注册 ${unit}`);
-        },
-    };
-}