@dsh-workbench/shared 1.1.8 → 1.1.10

package/src/host/registry-declaration.ts

@@ -0,0 +1,70 @@
+import type { DshShell } from '../api/dsh.js';
+import { runShell } from './shell.js';
+import { quoteShellArg } from './shell-text.js';
+import { parseJsonLoose } from '../lib/text.js';
+import { VERSION_CHECK_TIMEOUT_MS, VERSION_CHECK_TTL_MS } from '../config/constants.js';
+
+function recordOf(value: unknown): Readonly<Record<string, unknown>> | undefined {
+  return typeof value === 'object' && value !== null ? (value as Readonly<Record<string, unknown>>) : undefined;
+}
+
+export interface RegistryDshLookup {
+  readonly readable: boolean;
+  readonly raw: unknown;
+}
+
+export interface RegistryLookup {
+  registryDshOf(options: RegistryDshOptions): Promise<RegistryDshLookup>;
+  registryDeclarationOf(options: RegistryDeclarationOptions): Promise<unknown | undefined>;
+}
+
+interface RegistryDshOptions {
+  readonly shell: DshShell;
+  readonly name: string;
+  readonly registry?: string | undefined;
+  readonly force?: boolean;
+  readonly cacheDir?: string | undefined;
+}
+
+interface RegistryDeclarationOptions extends RegistryDshOptions {
+  readonly registry: string;
+}
+
+export function createRegistryLookup(): RegistryLookup {
+  const cache = new Map<string, { at: number; raw: unknown }>();
+  return {
+    registryDshOf: (options) => dshOf(cache, options),
+    registryDeclarationOf: async (options) => {
+      const found = await dshOf(cache, options);
+      return found.readable ? recordOf(found.raw)?.workbench : undefined;
+    },
+  };
+}
+
+async function dshOf(cache: Map<string, { at: number; raw: unknown }>, options: {
+  shell: DshShell;
+  name: string;
+  registry?: string | undefined;
+  force?: boolean;
+  cacheDir?: string | undefined;
+}): Promise<RegistryDshLookup> {
+  const { shell, name, registry, force = false, cacheDir } = options;
+  const key = `${registry ?? ''}|${name}`;
+  const hit = cache.get(key);
+  if (!force && hit !== undefined && Date.now() - hit.at < VERSION_CHECK_TTL_MS) {
+    return { readable: true, raw: hit.raw };
+  }
+
+  const at = registry === undefined ? '' : ` --registry ${quoteShellArg(registry)}`;
+  const cached = cacheDir === undefined ? '' : ` --cache ${quoteShellArg(cacheDir)}`;
+  const result = await runShell(
+    shell,
+    `npm view ${quoteShellArg(name)} dsh --json${at}${cached}`,
+    { timeoutMs: VERSION_CHECK_TIMEOUT_MS },
+  ).catch(() => undefined);
+  const parsed = result?.exitCode === 0 ? parseJsonLoose(result.stdout) : undefined;
+  if (parsed === undefined) return { readable: false, raw: undefined };
+  cache.set(key, { at: Date.now(), raw: parsed });
+  return { readable: true, raw: parsed };
+}
+

package/src/host/release-probe.ts

@@ -0,0 +1,202 @@
+import type { DshShell } from '../api/dsh.js';
+import type { PluginRelease } from '../contract/unit.js';
+
+import { RELEASE_PACKAGES } from './release-packages.generated.js';
+import { VERSION_CHECK_TIMEOUT_MS, VERSION_CHECK_TTL_MS } from '../config/constants.js';
+import { isValidVersion } from './version.js';
+import { parseJsonLoose } from '../lib/text.js';
+import { quoteShellArg } from './shell-text.js';
+import { runShell } from './shell.js';
+
+function cacheFlag(cacheDir: string | undefined): string {
+  return cacheDir === undefined ? '' : ` --cache ${quoteShellArg(cacheDir)}`;
+}
+
+export function parseLedgerVersion(
+  stdout: string,
+  name: string,
+): string | undefined {
+  const parsed = parseJsonLoose(stdout);
+  if (typeof parsed !== "object" || parsed === null) return undefined;
+  const entry = (parsed as { dependencies?: Record<string, unknown> })
+    .dependencies?.[name];
+  if (typeof entry !== "object" || entry === null) return undefined;
+  const version = (entry as { version?: unknown }).version;
+  return typeof version === "string" && isValidVersion(version.trim())
+    ? version.trim()
+    : undefined;
+}
+
+function parseVersion(stdout: string): string | undefined {
+  const value = stdout.trim();
+  return isValidVersion(value) ? value : undefined;
+}
+
+interface CacheEntry {
+  readonly at: number;
+  readonly value: string | undefined;
+}
+
+
+export interface ReleaseProbe {
+  latestVersion(options: LatestVersionOptions): Promise<string | undefined>;
+  missingReleaseParts(options: MissingPartsOptions): Promise<readonly string[]>;
+  probeRelease(options: ProbeReleaseOptions): Promise<PluginRelease | undefined>;
+  reset(): void;
+}
+
+export function createReleaseProbe(): ReleaseProbe {
+  const latestCache = new Map<string, CacheEntry>();
+  const existsCache = new Map<string, ExistsEntry>();
+
+  return {
+    latestVersion: async (options) => latestVersionOf(latestCache, options),
+    missingReleaseParts: async (options) => missingPartsOf(latestCache, existsCache, options),
+    probeRelease: async (options) => probeOf(latestCache, options),
+    reset: () => {
+      latestCache.clear();
+      existsCache.clear();
+    },
+  };
+}
+
+interface LatestVersionOptions {
+  readonly shell: DshShell;
+  readonly name: string;
+  readonly registry: string;
+  readonly force?: boolean;
+  readonly cacheDir?: string | undefined;
+}
+
+interface MissingPartsOptions {
+  readonly shell: DshShell;
+  readonly name: string;
+  readonly registry: string;
+  readonly version: string;
+  readonly force?: boolean;
+  readonly cacheDir?: string | undefined;
+}
+
+interface ProbeReleaseOptions {
+  readonly shell: DshShell;
+  readonly package: string;
+  readonly registry?: string | undefined;
+  readonly force?: boolean;
+  readonly cacheDir?: string | undefined;
+  readonly prefix?: string | undefined;
+}
+
+async function latestVersionOf(latestCache: Map<string, CacheEntry>, options: {
+  shell: DshShell;
+  name: string;
+  registry: string;
+  force?: boolean;
+  cacheDir?: string | undefined;
+}): Promise<string | undefined> {
+  const { shell, name, registry, force = false, cacheDir } = options;
+  const key = `${registry}|${name}`;
+  const hit = latestCache.get(key);
+  if (!force && hit !== undefined && Date.now() - hit.at < VERSION_CHECK_TTL_MS)
+    return hit.value;
+
+  const result = await runShell(
+    shell,
+    `npm view ${quoteShellArg(name)} version --registry ${quoteShellArg(registry)}${cacheFlag(cacheDir)}`,
+    { timeoutMs: VERSION_CHECK_TIMEOUT_MS },
+  ).catch(() => undefined);
+  const read = result?.exitCode === 0 ? parseVersion(result.stdout) : undefined;
+  latestCache.set(key, { at: Date.now(), value: read });
+  return read;
+}
+
+interface ExistsEntry {
+  readonly at: number;
+  readonly value: boolean;
+}
+
+
+async function versionExists(
+  existsCache: Map<string, ExistsEntry>,
+  options: {
+  shell: DshShell;
+  name: string;
+  version: string;
+  registry: string;
+  force?: boolean;
+  cacheDir?: string | undefined;
+}): Promise<boolean> {
+  const { shell, name, version, registry, force = false, cacheDir } = options;
+  const key = `${registry}|${name}@${version}`;
+  const hit = existsCache.get(key);
+  if (!force && hit !== undefined && (hit.value || Date.now() - hit.at < VERSION_CHECK_TTL_MS))
+    return hit.value;
+
+  const result = await runShell(
+    shell,
+    `npm view ${quoteShellArg(`${name}@${version}`)} version --registry ${quoteShellArg(registry)}${cacheFlag(cacheDir)}`,
+    { timeoutMs: VERSION_CHECK_TIMEOUT_MS },
+  ).catch(() => undefined);
+  const value = result?.exitCode === 0 && parseVersion(result.stdout) !== undefined;
+  existsCache.set(key, { at: Date.now(), value });
+  return value;
+}
+
+async function missingPartsOf(
+  latestCache: Map<string, CacheEntry>,
+  existsCache: Map<string, ExistsEntry>,
+  options: {
+  shell: DshShell;
+  name: string;
+  registry: string;
+  version: string;
+  force?: boolean;
+  cacheDir?: string | undefined;
+}): Promise<readonly string[]> {
+  const { shell, name, registry, version, force = false, cacheDir } = options;
+  const checked = await Promise.all(
+    RELEASE_PACKAGES.filter((part) => part !== name).map(async (part) => ({
+      part,
+      present: await versionExists(existsCache, { shell, name: part, version, registry, force, cacheDir }),
+    })),
+  );
+  return checked.filter((entry) => !entry.present).map((entry) => entry.part);
+}
+
+async function probeOf(
+  latestCache: Map<string, CacheEntry>,
+  options: {
+  shell: DshShell;
+  package: string;
+  registry?: string | undefined;
+  force?: boolean;
+  cacheDir?: string | undefined;
+  prefix?: string | undefined;
+}): Promise<PluginRelease | undefined> {
+  const { shell, package: pkg, registry, force = false, cacheDir, prefix } = options;
+  if (pkg === "") return undefined;
+
+  const ledger = await runShell(
+    shell,
+    `npm ls --prefix ${quoteShellArg(prefix ?? '')} ${quoteShellArg(pkg)} --json --depth=0${cacheFlag(cacheDir)}`,
+    { timeoutMs: VERSION_CHECK_TIMEOUT_MS },
+  ).catch(() => undefined);
+  const installed =
+    ledger === undefined ? undefined : parseLedgerVersion(ledger.stdout, pkg);
+  if (installed === undefined) return undefined;
+
+  const source =
+    registry === undefined || registry.trim() === ""
+      ? undefined
+      : registry.trim();
+  const latest =
+    source === undefined
+      ? undefined
+      : await latestVersionOf(latestCache, { shell, name: pkg, registry: source, force, cacheDir });
+
+  return {
+    installed,
+    ...(latest === undefined ? {} : { latest }),
+  };
+}
+
+

package/src/host/shell.ts

@@ -1,6 +1,5 @@
 import type { DshShell } from '../api/dsh.js';
 import { GIT_TIMEOUT_MS } from '../config/constants.js';
-import { quoteShellArg } from './shell-text.js';
 
 export interface ShellResult {
   readonly exitCode: number | null;
@@ -41,11 +40,3 @@ export async function runShell(
     truncated: result.stdout.truncated || result.stderr.truncated,
   };
 }
-
-export function backgroundPrefix(): readonly string[] {
-  return [quoteShellArg('env'), quoteShellArg('OPENCLI_WINDOW=background')];
-}
-
-export function backgroundLine(command: string, argv: readonly string[]): string {
-  return [...backgroundPrefix(), quoteShellArg(command), ...argv.map(quoteShellArg)].join(' ');
-}

package/src/host/spec.ts

@@ -28,5 +28,5 @@ export function localDirOf(spec: string): string | undefined {
 }
 
 export function refusalReason(): string {
-  return '这个包既不是工作台的模块，也不是 opencli 的插件，装了也用不上';
+  return '这个包既不是工作台的模块，也不是运行时的插件，装了也用不上';
 }

package/src/host/supply-index.ts

@@ -1,5 +1,5 @@
 import type { ExtensionNeed, LibNeed, Need, SupplySource } from '../contract/needs.js';
-import { npmRegistryOf } from './plugin-source.js';
+import { npmRegistryOf } from './npm-registry.js';
 
 export interface SupplyDeclaration {
   readonly id: string;
@@ -8,6 +8,7 @@ export interface SupplyDeclaration {
 
 export interface SupplyIndexOptions {
   readonly env?: Readonly<Record<string, string | undefined>>;
+  readonly packagePrefix?: string | undefined;
 }
 
 export interface SupplyEntry {
@@ -61,8 +62,8 @@ function text(value: string | undefined): string {
   return value === undefined ? '' : value.trim();
 }
 
-function conventionPackage(name: string): string {
-  return `opencli-plugin-${name}`;
+function conventionPackage(name: string, prefix: string): string {
+  return `${prefix}${name}`;
 }
 
 function nativeSourcePackage(source: SupplySource): string {
@@ -71,13 +72,13 @@ function nativeSourcePackage(source: SupplySource): string {
   return `local:${text(source.env) || text(source.path)}`;
 }
 
-function packageOf(need: ExtensionNeed | LibNeed): string {
+function packageOf(need: ExtensionNeed | LibNeed, prefix: string): string {
   if (need.kind === 'lib') return text(need.name);
   const first = need.sources?.[0];
-  if (first === undefined) return conventionPackage(need.name);
+  if (first === undefined) return conventionPackage(need.name, prefix);
   if (first.kind === 'npm') {
     const pkg = text(first.package);
-    return pkg === '' ? conventionPackage(need.name) : pkg;
+    return pkg === '' ? conventionPackage(need.name, prefix) : pkg;
   }
   return nativeSourcePackage(first);
 }
@@ -180,6 +181,7 @@ export function buildSupplyIndex(
   options: SupplyIndexOptions = {},
 ): SupplyIndex {
   const env = options.env ?? {};
+  const prefix = options.packagePrefix ?? '';
   const entries = new Map<string, MutableEntry>();
   const byName = new Map<string, MutableEntry>();
   const conflicts: SupplyConflict[] = [];
@@ -206,7 +208,7 @@ export function buildSupplyIndex(
   for (const declaration of declarations) {
     for (const need of declaration.needs ?? []) {
       if (need.kind !== 'extension' && need.kind !== 'lib') continue;
-      const pkg = packageOf(need);
+      const pkg = packageOf(need, prefix);
       const entry = ensure(need.kind, pkg);
       if (!entry.names.includes(need.name)) entry.names.push(need.name);
       if (need.kind === 'extension') {

package/src/host/supply-port.ts

@@ -8,20 +8,30 @@ export function supplyPortOf(ctx: DshHostContext): SupplyPort {
   const set = adaptersOf(ctx);
   const env = set.supply;
   const modules = set.modules;
+  const pluginPackagePrefix = modules.pluginPackagePrefix;
+  const pluginManifestFile = modules.pluginManifestFile;
+  const cliCatalogPath = modules.cliCatalogPath;
+  const vendorPluginsDir = modules.vendorPluginsDir;
+  const runtimeInstallCommand = modules.runtimeInstallCommand;
   return {
     env,
     modules,
     resolvePluginSource: (source, environment, options) => env.resolvePluginSource(source, environment, options),
     libInstallCommand: (options) => env.libInstallCommand(options),
+    libUninstallCommand: (options) => env.libUninstallCommand(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),
+    isolatedRoot: () => modules.isolatedRoot(),
     isolatedHome: () => modules.isolatedHome(),
-    cliCatalogPath: () => modules.cliCatalogPath(),
-    vendorPluginsDir: () => modules.vendorPluginsDir(),
-    opencliInstallCommand: () => modules.opencliInstallCommand(),
+    ...(pluginPackagePrefix === undefined ? {} : { pluginPackagePrefix: () => pluginPackagePrefix() }),
+    ...(pluginManifestFile === undefined ? {} : { pluginManifestFile: () => pluginManifestFile() }),
+    ...(cliCatalogPath === undefined ? {} : { cliCatalogPath: () => cliCatalogPath() }),
+    ...(vendorPluginsDir === undefined ? {} : { vendorPluginsDir: () => vendorPluginsDir() }),
+    ...(runtimeInstallCommand === undefined ? {} : { runtimeInstallCommand: () => runtimeInstallCommand() }),
+    afterLibInstall: () => modules.afterLibInstall(),
     profileDirOf: (context) => modules.profileDirOf(context),
     profileModules: (dir) => modules.profileModules(dir),
     readInstalledModule: (dir, pkg) => modules.readInstalledModule(dir, pkg),

package/src/host/unit-face.ts

@@ -11,13 +11,14 @@ 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';
+import type { HostKit } from './host-kit.js';
 
 export interface ToolScopeContext {
   readonly workspace: string | null;
   readonly preset: string | null;
 }
 
-export interface UnitMountDeps {
+export interface UnitMountDeps extends HostKit {
   readonly manifest: UnitManifest;
   readonly ctx: DshHostContext;
   readonly logger?: { info?(message: string): void; warn?(message: string): void } | undefined;

package/src/host/version.ts

@@ -19,12 +19,17 @@ export function isNewerVersion(latest: string, installed: string): boolean {
 }
 
 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;
+  for (const depth of ['../../package.json', '../package.json']) {
+    try {
+      const read = JSON.parse(readFileSync(new URL(depth, moduleUrl), 'utf8')) as {
+        readonly version?: unknown;
+        readonly name?: unknown;
+      };
+      if (typeof read.name !== 'string' || !read.name.startsWith('@dsh-workbench/')) continue;
+      return typeof read.version === 'string' && read.version !== '' ? read.version : undefined;
+    } catch {
+      continue;
+    }
   }
+  return undefined;
 }

package/src/host.ts

@@ -19,6 +19,31 @@ export * from './lib/git-address.js';
 export * from './api/blocker-table.js';
 export * from './contract/unit-declaration.js';
 export * from './host/board-fact.js';
+export * from './host/bundle-manager.js';
+export * from './host/installed-module.js';
+export * from './host/local-declaration.js';
+export * from './host/registry-declaration.js';
+export * from './host/release-probe.js';
+export * from './host/package-kind.js';
+export * from './host/package-content.js';
+export * from './host/package-route.js';
+export * from './host/lib-install.js';
+export * from './host/module-root.js';
+export * from './host/dsh-plugins.js';
+export * from './host/profile-registries.js';
+export * from './host/host-actions.js';
+export {
+  configSyncAction,
+  configSyncApply,
+  configSyncHandler,
+  configSyncSnapshot,
+  mergeBlocks,
+  normalizeBlock,
+  readPatchBlocks,
+  syncRows,
+  type ConfigSyncDeps,
+} from './host/config-sync.js';
+export * from './host/profile-create.js';
 export * from './host/context-ref.js';
 export * from './host/diy-debug.js';
 export * from './host/diy-record.js';
@@ -27,6 +52,12 @@ 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/flow/types.js';
+export * from './host/flow/expr.js';
+export * from './host/flow/check.js';
+export * from './host/flow/run.js';
+export * from './host/flow/kit.js';
+export * from './host/host-kit.js';
 export * from './host/panel-state.js';
 export * from './host/plugin-ledger.js';
 export * from './host/time.js';
@@ -34,7 +65,6 @@ export * from './host/tokens.js';
 export * from './host/tool-approval.js';
 export * from './host/tool-kit.js';
 export * from './host/unit-face.js';
-export * from './host/opencli-runner.js';
 export * from './host/lib-runners.js';
 export * from './host/value-handoff.js';
 export * from './host/workspace-store.js';
@@ -45,9 +75,7 @@ export * from './host/shell-text.js';
 export * from './host/shell.js';
 export * from './host/data-error.js';
 export * from './host/install-failure.js';
-export * from './host/runtime-links.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';
@@ -55,7 +83,6 @@ 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';
@@ -66,8 +93,8 @@ 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 type { PluginSourceCommand, PluginSourceOptions, ResolvedPluginSource } from './contract/plugin-source.js';
+export * from './host/npm-registry.js';
 export * from './host/supply-index.js';
 export * from './host/patch.js';
 export * from './host/adapters.js';
@@ -75,6 +102,7 @@ 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/adapter-contract.js';
 export * from './host/version-range.js';
 export * from './host/market-index.js';
 export * from './host/market-index-claim.js';

package/src/i18n/{index.test.ts → __tests__/index.test.ts}

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest';
-import { en } from './en.js';
-import { dictionaries } from './index.js';
-import { zh } from './zh.js';
+import { en } from '../en.js';
+import { dictionaries } from '../index.js';
+import { zh } from '../zh.js';
 
 describe('dictionaries', () => {
   it('同时导出两种语言，且就是那两份字典', () => {

package/src/i18n/{merge.test.ts → __tests__/merge.test.ts}

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { mergeMessages, mergeMessagesSkipping } from './merge.js';
+import { mergeMessages, mergeMessagesSkipping } from '../merge.js';
 
 const base = { zh: { 'board.title': '看板' }, en: { 'board.title': 'Board' } };
 

package/src/i18n/{zh.test.ts → __tests__/zh.test.ts}

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import { en } from './en.js';
-import { zh } from './zh.js';
+import { en } from '../en.js';
+import { zh } from '../zh.js';
 
 function placeholders(text: string): string[] {
   return [...text.matchAll(/\{(\w+)\}/g)].map((match) => match[1] ?? '').sort();