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

package/src/host/extension.test.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+import type { DataReader } from '../contract/data.js';
+import type { ExtensionNeed } from '../contract/needs.js';
+import { extensionCallerOf } from './extension.js';
+
+const NEED: ExtensionNeed = {
+  kind: 'extension',
+  runtime: 'opencli',
+  name: 'coding',
+  purpose: '测试',
+};
+
+function failingData(): DataReader {
+  return {
+    read: async () => ({
+      ok: false,
+      error: {
+        code: 'command',
+        message: 'opencli 这条命令没跑通（退出码 1）',
+        detail: "error: unknown command 'issue-statuses'",
+        pageCode: 'cli-unclassified',
+      },
+    }),
+  } as unknown as DataReader;
+}
+
+describe('extensionCallerOf', () => {
+  it('cli-unclassified 补“升级插件”的 message 与 hint，id 用调用方给的 suiteId', async () => {
+    const caller = extensionCallerOf(failingData(), NEED, {
+      suiteId: 'coding-issues',
+    });
+    await expect(caller.json(['issue-statuses'])).rejects.toMatchObject({
+      code: 'cli-unclassified',
+      message: expect.stringContaining('workbench_modules_update（id=coding-issues）'),
+      hint: expect.stringContaining('opencli coding issue-statuses --help'),
+      detail: "error: unknown command 'issue-statuses'",
+    });
+  });
+
+  it('别的码不补“插件版本旧”', async () => {
+    const caller = extensionCallerOf(failingData(), NEED, {
+      suiteId: 'coding-issues',
+    });
+    const data = {
+      read: async () => ({
+        ok: false,
+        error: { code: 'auth', message: '需要登录', pageCode: 'auth-required' },
+      }),
+    } as unknown as DataReader;
+    await expect(
+      extensionCallerOf(data, NEED, { suiteId: 'x' }).json(['issue-statuses']),
+    ).rejects.toMatchObject({ code: 'auth-required', message: '需要登录' });
+    expect(caller).toBeDefined();
+  });
+});

package/src/host/extension.ts

@@ -0,0 +1,57 @@
+import type { DataReader } from '../contract/data.js';
+import type { ExtensionCaller, ExtensionCallOptions, ExtensionValue } from '../contract/extension.js';
+import type { ExtensionNeed } from '../contract/needs.js';
+import { WorkbenchDataError } from './data-error.js';
+
+function cliCodeOf(code: string): string {
+  if (code === 'auth') return 'auth-required';
+  if (code === 'timeout') return 'cli-timeout';
+  if (code === 'parse') return 'cli-bad-output';
+  return 'cli-exec-failed';
+}
+
+export interface ExtensionCallerOptions {
+  readonly suiteId?: string | undefined;
+}
+
+export function extensionCallerOf(
+  data: DataReader,
+  need: ExtensionNeed,
+  callerOptions: ExtensionCallerOptions = {},
+): ExtensionCaller {
+  return {
+    async json(
+      args: readonly string[],
+      options: ExtensionCallOptions = {},
+    ): Promise<ExtensionValue> {
+      const result = await data.read({
+        kind: 'command',
+        adapter: need.runtime,
+        argv: [need.name, ...args],
+        ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }),
+      });
+      if (result.ok) return { value: result.data, at: Date.now() };
+      const code = result.error.pageCode ?? cliCodeOf(result.error.code);
+      const command = [need.name, ...args].join(' ');
+      const advice =
+        code === 'cli-unclassified'
+          ? `这条命令（${command}）在这份 ${need.name} 插件里可能不存在（插件版本旧就会缺）：用 workbench_modules_update（id=${callerOptions.suiteId ?? need.name}）升级，或在面板的模块状态里点更新，再重试。终端确认：opencli ${need.name} ${args[0] ?? ''} --help`
+          : undefined;
+      const hint =
+        advice === undefined
+          ? result.error.hint
+          : result.error.hint === undefined
+            ? advice
+            : `${advice}\n${result.error.hint}`;
+      throw new WorkbenchDataError(
+        code,
+        advice === undefined ? result.error.message : `${result.error.message}。${advice}`,
+        {
+          ...(result.error.detail === undefined ? {} : { detail: result.error.detail }),
+          ...(hint === undefined ? {} : { hint }),
+          ...(result.error.helpUrl === undefined ? {} : { helpUrl: result.error.helpUrl }),
+        },
+      );
+    },
+  };
+}

package/src/host/git.ts

@@ -2,25 +2,17 @@ import type { DshShell } from '../api/dsh.js';
 import { quoteShellArg, tailLines } from '../host/shell-text.js';
 import { runShell } from '../host/shell.js';
 
-export type OriginRead =
-  | { readonly kind: 'ok'; readonly remote: string }
-  | { readonly kind: 'no-origin'; readonly detail?: string }
-  | { readonly kind: 'unknown'; readonly reason: string; readonly detail?: string };
+export type {
+  BranchRead,
+  HeadRead,
+  OriginRead,
+} from '../contract/git.js';
+import type { BranchRead, HeadRead, OriginRead } from '../contract/git.js';
 
 export type OriginReader = (path: string) => Promise<OriginRead>;
 
-export type BranchRead =
-  | { readonly kind: 'ok'; readonly branch: string }
-  | { readonly kind: 'no-branch'; readonly detail?: string | undefined }
-  | { readonly kind: 'unknown'; readonly reason: string; readonly detail?: string | undefined };
-
 export type BranchReader = (path: string) => Promise<BranchRead>;
 
-export type HeadRead =
-  | { readonly kind: 'ok'; readonly commit: string }
-  | { readonly kind: 'no-head'; readonly detail?: string }
-  | { readonly kind: 'unknown'; readonly reason: string; readonly detail?: string };
-
 export type HeadReader = (path: string) => Promise<HeadRead>;
 
 export function createHeadReader(options: {

package/src/host/http.ts

@@ -90,7 +90,7 @@ export function registerApi(ctx: DshHostContext, routes: RouteTable): () => void
       try {
         sendJson(res, 200, await handler(search));
       } catch (error) {
-        if (error instanceof WorkbenchDataError) {
+        if (isDataError(error)) {
           sendJson(res, 200, { ok: false, error: toErrorPayload(error) });
           return;
         }

package/src/host/market-index.ts

@@ -13,6 +13,7 @@ import type {
 } from '../contract/protocol/market-index.js';
 import { MARKET_INDEX_FORMAT } from '../contract/protocol/market-index.js';
 import { marketText } from '../lib/market-index.js';
+import { compareVersions, isValidVersion } from './version.js';
 
 export { marketBranchOk, marketInstallTarget, marketText } from '../lib/market-index.js';
 
@@ -39,7 +40,6 @@ export const MARKET_INDEX_README_LINES: readonly string[] = [
   '',
 ];
 
-const SEMVER = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+([0-9A-Za-z.-]+))?$/;
 const NPM_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
 const GIT_COMMIT = /^[0-9a-f]{40}$/;
 const MAX_ICON_CHARS = 32 * 1024;
@@ -73,37 +73,7 @@ function problem(kind: MarketIndexProblem['kind'], detail: string, at?: string):
 }
 
 export function compareSemver(left: string, right: string): number | undefined {
-  const a = SEMVER.exec(left);
-  const b = SEMVER.exec(right);
-  if (a === null || b === null) return undefined;
-  for (let index = 1; index <= 3; index += 1) {
-    const diff = Number(a[index]) - Number(b[index]);
-    if (diff !== 0) return diff > 0 ? 1 : -1;
-  }
-  const preA = a[4];
-  const preB = b[4];
-  if (preA === undefined && preB === undefined) return 0;
-  if (preA === undefined) return 1;
-  if (preB === undefined) return -1;
-  const leftParts = preA.split('.');
-  const rightParts = preB.split('.');
-  for (let index = 0; index < Math.max(leftParts.length, rightParts.length); index += 1) {
-    const one = leftParts[index];
-    const other = rightParts[index];
-    if (one === undefined) return -1;
-    if (other === undefined) return 1;
-    const oneNumber = /^\d+$/.test(one);
-    const otherNumber = /^\d+$/.test(other);
-    if (oneNumber && otherNumber) {
-      const diff = Number(one) - Number(other);
-      if (diff !== 0) return diff > 0 ? 1 : -1;
-      continue;
-    }
-    if (oneNumber) return -1;
-    if (otherNumber) return 1;
-    if (one !== other) return one > other ? 1 : -1;
-  }
-  return 0;
+  return compareVersions(left, right);
 }
 
 function sourceOf(raw: unknown, at: string): MarketIndexSource | MarketIndexProblem {
@@ -138,7 +108,7 @@ function versionOf(raw: unknown, at: string): MarketIndexVersion | MarketIndexPr
   const record = asRecord(raw);
   if (record === undefined) return problem('version', '版本必须是一个对象', at);
   const version = asText(record['version']);
-  if (!SEMVER.test(version)) return problem('version', `版本号不是合法 SemVer：${JSON.stringify(version)}`, at);
+  if (!isValidVersion(version)) return problem('version', `版本号不是合法 SemVer：${JSON.stringify(version)}`, at);
   const source = sourceOf(record['source'], `${at}.source`);
   if ('kind' in source) return source;
   const timestamp = record['publishTimestamp'];

package/src/host/port-types.ts

@@ -61,6 +61,7 @@ export interface SupplyLatestOptions {
 
 export interface SupplyMissingPartsOptions {
   readonly shell: DshShell;
+  readonly name: string;
   readonly registry: string;
   readonly version: string;
   readonly force?: boolean;

package/src/host/release-packages.generated.ts

@@ -0,0 +1,10 @@
+export const RELEASE_PACKAGES = [
+  '@dsh-workbench/adapter-probe',
+  '@dsh-workbench/adapter-profile',
+  '@dsh-workbench/adapter-runtime',
+  '@dsh-workbench/adapter-supply',
+  '@dsh-workbench/adapters-default',
+  '@dsh-workbench/core',
+  '@dsh-workbench/module-tools',
+  '@dsh-workbench/shared',
+] as const;

package/src/host/tool-kit.ts

@@ -1,5 +1,4 @@
 import type { DshToolRunContext } from '../api/dsh.js';
-import { WorkbenchDataError } from './data-error.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

@@ -8,6 +8,9 @@ import type { ApprovalCall, ApprovalFacts, ApprovalPolicy } from '../host/tool-a
 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;
@@ -22,6 +25,10 @@ export interface UnitMountDeps {
   readonly ownedUnits: () => readonly string[];
   readonly installable?: (() => readonly string[]) | undefined;
   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

@@ -1,71 +1,13 @@
-import { compareVersions } from './version.js';
+import semver from 'semver';
 
 export type VersionVerdict = 'satisfied' | 'unsatisfied' | 'malformed';
 
-function readable(version: string): boolean {
-  return compareVersions(version, '0.0.0') !== undefined;
-}
-
-function segmentsOf(version: string): number[] | undefined {
-  if (!readable(version)) return undefined;
-  return version.split('.').map((part) => Number.parseInt(part, 10));
-}
-
-function caretUpper(base: readonly number[]): string {
-  const [major = 0, minor = 0, patch = 0] = base;
-  if (major > 0) return `${major + 1}.0.0`;
-  return minor > 0 ? `0.${minor + 1}.0` : `0.0.${patch + 1}`;
-}
-
-function tildeUpper(base: readonly number[]): string {
-  const [major = 0, minor = 0] = base;
-  return `${major}.${minor + 1}.0`;
-}
-
-function comparator(token: string, version: string): boolean | undefined {
-  const match = /^(>=|<=|>|<|=|\^|~)?\s*(.+)$/.exec(token.trim());
-  if (match === null) return undefined;
-  const [, operator = '', raw = ''] = match;
-  const base = segmentsOf(raw.trim());
-  if (base === undefined) return undefined;
-  const at = (other: string): number | undefined => compareVersions(version, other);
-  switch (operator) {
-    case '^':
-      return (at(raw) ?? -1) >= 0 && (at(caretUpper(base)) ?? 1) < 0;
-    case '~':
-      return (at(raw) ?? -1) >= 0 && (at(tildeUpper(base)) ?? 1) < 0;
-    default:
-      break;
-  }
-  const compared = at(raw.trim());
-  if (compared === undefined) return undefined;
-  switch (operator) {
-    case '>=':
-      return compared >= 0;
-    case '<=':
-      return compared <= 0;
-    case '>':
-      return compared > 0;
-    case '<':
-      return compared < 0;
-    case '=':
-    case '':
-      return compared === 0;
-    default:
-      return undefined;
-  }
-}
-
 export function checkVersionRange(contract: string | undefined, version: string): VersionVerdict {
   const spec = contract?.trim() ?? '';
   if (spec === '') return 'satisfied';
-  if (!readable(version)) return 'malformed';
-  const tokens = spec.split(/\s+/).filter((token) => token !== '');
-  if (tokens.length === 0) return 'satisfied';
-  for (const token of tokens) {
-    const verdict = comparator(token, version);
-    if (verdict === undefined) return 'malformed';
-    if (!verdict) return 'unsatisfied';
-  }
-  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

@@ -1,4 +1,22 @@
 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 {
@@ -10,21 +28,3 @@ export function runningVersionOf(moduleUrl: string): string | undefined {
     return undefined;
   }
 }
-
-export function compareVersions(a: string, b: string): number | undefined {
-  const na = a.split('.').map((part) => Number.parseInt(part, 10));
-  const nb = b.split('.').map((part) => Number.parseInt(part, 10));
-  if (na.some(Number.isNaN) || nb.some(Number.isNaN)) return undefined;
-  for (let index = 0; index < Math.max(na.length, nb.length); index += 1) {
-    const left = na[index] ?? 0;
-    const right = nb[index] ?? 0;
-    if (left !== right) return left > right ? 1 : -1;
-  }
-  return 0;
-}
-
-export function isNewerVersion(latest: string, installed: string): boolean {
-  if (latest === installed) return false;
-  const compared = compareVersions(latest, installed);
-  return compared === undefined ? true : compared > 0;
-}

package/src/host.ts

@@ -3,6 +3,10 @@ export * from './api/context-ref.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';
@@ -41,6 +45,7 @@ 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';
@@ -63,6 +68,7 @@ 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';

package/src/i18n/en.ts

@@ -277,6 +277,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.discover.loading': 'Reading the index',
   'panels.discover.lead': 'Browse modules from an index source; install and go.',
   'panels.discover.addSource': 'Add',
+  'panels.discover.addingSource': 'Adding…',
   'panels.discover.addFirstSource': 'Add index source',
   'panels.discover.removeSource': 'Remove',
   'panels.discover.removeSourceNamed': 'Remove {url}',

package/src/i18n/zh.ts

@@ -274,6 +274,7 @@ export const zh = {
   'panels.discover.loading': '正在读取索引',
   'panels.discover.lead': '从索引源浏览模块；装上就能用。',
   'panels.discover.addSource': '添加',
+  'panels.discover.addingSource': '正在添加…',
   'panels.discover.addFirstSource': '添加索引源',
   'panels.discover.removeSource': '移除',
   'panels.discover.removeSourceNamed': '移除 {url}',

package/src/index.ts

@@ -37,6 +37,10 @@ export * from './config/constants.js';
 export * from './config/storage.js';
 export * from './contract/blocker.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/facts.js';
 export * from './contract/long-task.js';
 export * from './contract/protocol/bundle-install.js';