@dsh-workbench/shared 0.3.11 → 1.0.0-beta.1

package/src/host/supply-port.ts

@@ -0,0 +1,45 @@
+import type { DshHostContext } from '../api/dsh.js';
+import { adaptersOf } from './adapters.js';
+import type { SupplyPort } from './port-types.js';
+export type { SupplyPort } from './port-types.js';
+
+
+export function supplyPortOf(ctx: DshHostContext): SupplyPort {
+  const set = adaptersOf(ctx);
+  const env = set.supply;
+  const modules = set.modules;
+  return {
+    env,
+    modules,
+    resolvePluginSource: (source, environment, options) => env.resolvePluginSource(source, environment, options),
+    libInstallCommand: (options) => env.libInstallCommand(options),
+    pluginInstallPlan: (options) => env.pluginInstallPlan(options),
+    latestVersion: (options) => env.latestVersion(options),
+    missingReleaseParts: (options) => env.missingReleaseParts(options),
+    probeRelease: (options) => env.probeRelease(options),
+    splitNpmSpec: (spec) => env.splitNpmSpec(spec),
+    isolatedHome: () => modules.isolatedHome(),
+    cliCatalogPath: () => modules.cliCatalogPath(),
+    vendorPluginsDir: () => modules.vendorPluginsDir(),
+    opencliInstallCommand: () => modules.opencliInstallCommand(),
+    profileDirOf: (context) => modules.profileDirOf(context),
+    profileModules: (dir) => modules.profileModules(dir),
+    readInstalledModule: (dir, pkg) => modules.readInstalledModule(dir, pkg),
+    readProfilePackage: (dir, pkg) => modules.readProfilePackage(dir, pkg),
+    readBundleManager: (context) => modules.readBundleManager(context),
+    createRegistryNotebook: (dir) => modules.createRegistryNotebook(dir),
+    declarationGaps: (dir) => modules.declarationGaps(dir),
+    moduleDeclarationOf: (dir, pkg) => modules.moduleDeclarationOf(dir, pkg),
+    registryDeclarationOf: (options) => modules.registryDeclarationOf(options),
+    pathDeclarationOf: (spec) => modules.pathDeclarationOf(spec),
+    declarationRefusalOf: (name, raw) => modules.declarationRefusalOf(name, raw),
+    refusalReason: () => modules.refusalReason(),
+    packageRouteOf: (options) => modules.packageRouteOf(options),
+    isNewerVersion: (left, right) => modules.isNewerVersion(left, right),
+    startSelfUpdate: (request, onError) => modules.startSelfUpdate(request, onError),
+  };
+}
+
+export function requireSupply(): SupplyPort {
+  throw new Error('workbenchSupply 未提供');
+}

package/src/host/time.ts

@@ -0,0 +1,22 @@
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc.js';
+
+dayjs.extend(utc);
+
+/**
+ * UTC 时钟（`HH:mm:ss`）：日志与状态行只给人看时分秒，不带日期。
+ * @param value ISO 字符串、时间戳或 Date。
+ * @returns `HH:mm:ss`；非法时间返回 `Invalid Date`。
+ */
+export function clockOf(value: string | number | Date): string {
+  return dayjs(value).utc().format('HH:mm:ss');
+}
+
+/**
+ * 把时间戳/ISO 字符串转成毫秒；非法输入给 `NaN`（调用方据此回退）。
+ * @param value ISO 字符串、时间戳或 Date。
+ * @returns 毫秒时间戳或 `NaN`。
+ */
+export function epochOf(value: string | number | Date): number {
+  return dayjs(value).valueOf();
+}

package/src/host/tokens.ts

@@ -0,0 +1,186 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+
+export const DSH_THEME_PACKAGE = '@deepseek-ai/dsh-client-ui-theme';
+export const SHELL_PACKAGE = '@dsh-workbench/core';
+export const DSW_PREFIX = '--dsw-';
+export const WB_PREFIX = '--wb-';
+
+export interface TokenValues {
+  readonly light: string | null;
+  readonly dark: string | null;
+}
+
+export interface TokenEntry {
+  readonly name: string;
+  readonly values: TokenValues;
+}
+
+export interface TokenSource {
+  readonly package: string;
+  readonly version: string | null;
+  readonly file: string;
+  readonly entries: readonly TokenEntry[];
+}
+
+export interface TokenSet {
+  readonly dsw: TokenSource | null;
+  readonly wb: TokenSource | null;
+}
+
+const BLOCK = /([^{}]*)\{([^{}]*)\}/g;
+const DECLARATION = /(--[a-z0-9-]+)\s*:\s*([^;{}]+)/g;
+const DARK_BLOCK = /data-ds-dark-theme/;
+const VAR_USE = /var\(\s*(--[a-z0-9-]+)\s*(?:,[^()]*)?\)/g;
+
+function rawDefinitionsIn(text: string, prefix: string): Map<string, { light?: string; dark?: string }> {
+  const defs = new Map<string, { light?: string; dark?: string }>();
+  for (const block of text.matchAll(BLOCK)) {
+    const selector = block[1] ?? '';
+    const dark = DARK_BLOCK.test(selector);
+    for (const declaration of (block[2] ?? '').matchAll(DECLARATION)) {
+      const name = declaration[1] ?? '';
+      const value = (declaration[2] ?? '').trim();
+      if (!name.startsWith(prefix) || value === '') continue;
+      const found = defs.get(name) ?? {};
+      const key = dark ? 'dark' : 'light';
+      if (found[key] === undefined) found[key] = value;
+      defs.set(name, found);
+    }
+  }
+  return defs;
+}
+
+function resolved(value: string, scheme: 'light' | 'dark', defs: Map<string, { light?: string; dark?: string }>, depth = 0): string {
+  if (depth >= 4 || !value.includes('var(')) return value;
+  return value.replace(VAR_USE, (whole, name: string) => {
+    const found = defs.get(name);
+    if (found === undefined) return whole;
+    const next = scheme === 'dark' ? found.dark ?? found.light : found.light ?? found.dark;
+    return next === undefined ? whole : resolved(next, scheme, defs, depth + 1);
+  });
+}
+
+export function tokenEntriesIn(text: string, prefix: string): readonly TokenEntry[] {
+  const defs = rawDefinitionsIn(text, prefix);
+  return [...defs.entries()]
+    .map(([name, found]) => ({
+      name,
+      values: {
+        light: found.light === undefined ? null : resolved(found.light, 'light', defs),
+        dark: found.dark === undefined ? null : resolved(found.dark, 'dark', defs),
+      },
+    }))
+    .sort((left, right) => left.name.localeCompare(right.name));
+}
+
+interface PackageManifest {
+  readonly name: string | null;
+  readonly version: string | null;
+  readonly root: string;
+}
+
+function manifestAt(root: string): PackageManifest | null {
+  try {
+    const manifest: unknown = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
+    if (typeof manifest !== 'object' || manifest === null) return null;
+    const record = manifest as { name?: unknown; version?: unknown };
+    return {
+      name: typeof record.name === 'string' ? record.name : null,
+      version: typeof record.version === 'string' ? record.version : null,
+      root,
+    };
+  } catch {
+    return null;
+  }
+}
+
+function findPackage(startDirs: readonly string[], packageName: string): PackageManifest | null {
+  for (const start of startDirs) {
+    if (start.trim() === '') continue;
+    const own = manifestAt(start);
+    if (own !== null && own.name === packageName) return own;
+    let at = resolve(start);
+    for (;;) {
+      const candidate = join(at, 'node_modules', ...packageName.split('/'));
+      const manifest = manifestAt(candidate);
+      if (manifest !== null && (manifest.name === null || manifest.name === packageName)) return manifest;
+      const parent = dirname(at);
+      if (parent === at) break;
+      at = parent;
+    }
+  }
+  return null;
+}
+
+function sourceAt(
+  startDirs: readonly string[],
+  packageName: string,
+  tail: string,
+  prefix: string,
+): TokenSource | null {
+  const manifest = findPackage(startDirs, packageName);
+  if (manifest === null) return null;
+  const file = join(manifest.root, tail);
+  if (!existsSync(file)) return null;
+  return {
+    package: packageName,
+    version: manifest.version,
+    file,
+    entries: tokenEntriesIn(readFileSync(file, 'utf8'), prefix),
+  };
+}
+
+export function readTokens(startDirs: readonly string[]): TokenSet {
+  const dsw = sourceAt(startDirs, DSH_THEME_PACKAGE, join('lib', 'client.js'), DSW_PREFIX);
+  const wb = sourceAt(startDirs, SHELL_PACKAGE, 'client.js', WB_PREFIX);
+  return { dsw, wb };
+}
+
+function distance(left: string, right: string): number {
+  let previous = Array.from({ length: right.length + 1 }, (_unused, index) => index);
+  for (let row = 1; row <= left.length; row += 1) {
+    const current = [row];
+    for (let column = 1; column <= right.length; column += 1) {
+      const same = left[row - 1] === right[column - 1] ? 0 : 1;
+      current.push(
+        Math.min((previous[column] ?? 0) + 1, (current[column - 1] ?? 0) + 1, (previous[column - 1] ?? 0) + same),
+      );
+    }
+    previous = current;
+  }
+  return previous[right.length] ?? 0;
+}
+
+function commonPrefixLength(left: string, right: string): number {
+  const cap = Math.min(left.length, right.length);
+  let at = 0;
+  while (at < cap && left[at] === right[at]) at += 1;
+  return at;
+}
+
+export function nearestTokens(name: string, names: readonly string[], limit = 6): readonly string[] {
+  const wanted = name.trim().toLowerCase();
+  if (wanted === '') return [];
+  const shared = wanted.slice(0, wanted.lastIndexOf('-') + 1);
+  return names
+    .flatMap((one) => {
+      const lower = one.toLowerCase();
+      const typos = lower.length < 3 ? Number.POSITIVE_INFINITY : distance(lower, wanted);
+      if (typos <= 2) return [{ one, typos }];
+      const prefix = commonPrefixLength(lower, wanted);
+      if (prefix < 8) return [];
+      const sameStem = shared.length >= 8 && lower.startsWith(shared);
+      const score = 10 + typos - prefix + (sameStem ? 0 : 20);
+      return score < 20 ? [{ one, typos: score }] : [];
+    })
+    .sort((left, right) => left.typos - right.typos || left.one.length - right.one.length || left.one.localeCompare(right.one))
+    .slice(0, limit)
+    .map((one) => one.one);
+}
+
+export function tokenFamilyOf(name: string): string {
+  const rest = name.startsWith(DSW_PREFIX) ? name.slice(DSW_PREFIX.length) : name.startsWith(WB_PREFIX) ? name.slice(WB_PREFIX.length) : name;
+  const cut = rest.indexOf('-');
+  return cut === -1 ? rest : rest.slice(0, cut);
+}

package/src/host/tool-kit.ts

@@ -1,5 +1,4 @@
 import type { DshToolRunContext } from '../api/dsh.js';
-import { WorkbenchDataError } from './opencli.js';
 
 export function sessionWorkspace(exec: DshToolRunContext | undefined): string | null {
   const cwd = exec?.agent?.session?.header?.cwd;
@@ -25,37 +24,3 @@ export const TEXT_OUTPUT = { schema: { type: 'object', properties: {}, additiona
 export function jsonText(value: unknown): string {
   return JSON.stringify(value);
 }
-
-const UNCLASSIFIED = 'cli-unclassified';
-
-export interface CommandHintNames {
-  readonly plugin: string;
-  readonly suiteId: string;
-}
-
-export type CommandHint = <T>(command: string, run: () => Promise<T>) => Promise<T>;
-
-export function commandHintFor(names: CommandHintNames): CommandHint {
-  return async (command, run) => {
-    try {
-      return await run();
-    } catch (error) {
-      if (!(error instanceof WorkbenchDataError) || error.code !== UNCLASSIFIED) throw error;
-
-      const advice =
-        `这条命令（${command}）在这份 ${names.plugin} 插件里可能不存在（插件版本旧就会缺）：` +
-        `用 workbench_modules_update（id=${names.suiteId}）升级插件，或在面板的模块状态里点更新，再重试。`;
-
-      throw new WorkbenchDataError(error.code, `${error.message}。${advice}`, {
-        ...(error.detail === undefined ? {} : { detail: error.detail }),
-        hint:
-          `升级：workbench_modules_update（id=${names.suiteId}）。` +
-          `终端确认：opencli ${names.plugin} ${command} --help${
-            error.hint === undefined ? '' : `\n${error.hint}`
-          }`,
-        ...(error.helpUrl === undefined ? {} : { helpUrl: error.helpUrl }),
-        ...(error.project === undefined ? {} : { project: error.project }),
-      });
-    }
-  };
-}

package/src/host/unit-face.ts

@@ -1,12 +1,16 @@
 import type { DshHostContext } from '../api/dsh.js';
-import type { UnitManifest } from '../api/unit.js';
+import type { UnitManifest } from '../contract/unit.js';
 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 { ProvisionHandler } from './provision.js';
+import type { UnitCapability } from '../contract/unit-capability.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';
+import type { DataReader } from '../contract/data.js';
+import type { LibReader } from '../contract/lib.js';
+import type { GitReader } from '../contract/git.js';
+import type { CommandReader } from '../contract/command.js';
 
 export interface ToolScopeContext {
   readonly workspace: string | null;
@@ -20,7 +24,11 @@ export interface UnitMountDeps {
   readonly manifests: () => readonly UnitManifest[];
   readonly ownedUnits: () => readonly string[];
   readonly installable?: (() => readonly string[]) | undefined;
-  readonly opencliCommand?: string;
+  readonly data: DataReader;
+  readonly env?: Readonly<Record<string, string | undefined>> | undefined;
+  readonly libs?: LibReader | undefined;
+  readonly git?: GitReader | undefined;
+  readonly commands?: CommandReader | undefined;
   readonly store: WorkspaceStore;
   readonly values?: ValueHandoff | undefined;
   readonly probe?: (

package/src/host/version-range.ts

@@ -0,0 +1,13 @@
+import semver from 'semver';
+
+export type VersionVerdict = 'satisfied' | 'unsatisfied' | 'malformed';
+
+export function checkVersionRange(contract: string | undefined, version: string): VersionVerdict {
+  const spec = contract?.trim() ?? '';
+  if (spec === '') return 'satisfied';
+  const range = semver.validRange(spec);
+  if (range === null) return 'malformed';
+  const parsed = semver.coerce(version);
+  if (parsed === null) return 'malformed';
+  return semver.satisfies(parsed, range) ? 'satisfied' : 'unsatisfied';
+}

package/src/host/version.ts

@@ -0,0 +1,30 @@
+import { readFileSync } from 'node:fs';
+import semver from 'semver';
+
+export function compareVersions(left: string, right: string): number | undefined {
+  const a = semver.valid(left.trim());
+  const b = semver.valid(right.trim());
+  if (a === null || b === null) return undefined;
+  return semver.compare(a, b);
+}
+
+export function isValidVersion(value: string): boolean {
+  return semver.valid(value.trim()) !== null;
+}
+
+export function isNewerVersion(latest: string, installed: string): boolean {
+  if (latest === installed) return false;
+  const compared = compareVersions(latest, installed);
+  return compared === undefined ? true : compared > 0;
+}
+
+export function runningVersionOf(moduleUrl: string): string | undefined {
+  try {
+    const read = JSON.parse(readFileSync(new URL('../../package.json', moduleUrl), 'utf8')) as {
+      readonly version?: unknown;
+    };
+    return typeof read.version === 'string' && read.version !== '' ? read.version : undefined;
+  } catch {
+    return undefined;
+  }
+}

package/src/host.ts

@@ -1,38 +1,75 @@
 export * from './config/constants.js';
 export * from './api/context-ref.js';
-export * from './api/unit.js';
-export * from './api/facts.js';
-export * from './api/long-task.js';
+export * from './contract/unit.js';
+export * from './contract/needs.js';
+export * from './contract/data.js';
+export * from './contract/extension.js';
+export * from './contract/lib.js';
+export * from './contract/git.js';
+export * from './contract/command.js';
+export * from './contract/unit-board.js';
+export * from './contract/workbench-contract.js';
+export * from './contract/blocker.js';
+export * from './contract/facts.js';
+export * from './contract/long-task.js';
 export * from './lib/text.js';
 export * from './lib/ui.js';
 export * from './lib/board-fact.js';
 export * from './api/blocker-table.js';
+export * from './contract/unit-declaration.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';
+export * from './host/lib-capabilities.js';
 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/time.js';
+export * from './host/tokens.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';
 export * from './host/workspace-store.js';
 export * from './host/write-result.js';
+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/data-error.js';
+export * from './host/provision.js';
+export * from './host/channel-plugin.js';
+export * from './host/recipe.js';
+export * from './host/recipe-rules.js';
+export * from './host/release-packages.generated.js';
+export * from './contract/unit-capability.js';
+export * from './contract/plugin-source.js';
+export * from './contract/cli.js';
+export * from './host/cli.js';
+export * from './host/command-name.js';
+export * from './host/browser.js';
+export * from './host/preflight.js';
+export * from './host/platform.js';
+export * from './host/profile-port.js';
+export * from './host/supply-port.js';
+export * from './host/version.js';
+export * from './host/adapter-types.js';
+export * from './host/paths.js';
+export * from './host/plugin.js';
+export * from './host/spec.js';
+export * from './host/plugin-source.js';
+export * from './host/lib-install.js';
+export * from './host/supply-index.js';
+export * from './host/patch.js';
+export * from './host/adapters.js';
+export * from './host/adapter-set.js';
+export * from './host/needs.js';
+export * from './host/extension.js';
+export * from './host/port-types.js';
+export * from './host/version-range.js';
+export * from './host/market-index.js';
+export * from './host/changelog.js';