@dsh-workbench/shared 1.1.8 → 1.1.10

package/dist/host/shell.d.ts

@@ -12,5 +12,3 @@ export declare function runShell(shell: DshShell, command: string, options?: {
     timeoutMs?: number;
     signal?: AbortSignal;
 }): Promise<ShellResult>;
-export declare function backgroundPrefix(): readonly string[];
-export declare function backgroundLine(command: string, argv: readonly string[]): string;

package/dist/host/shell.js

@@ -1,5 +1,4 @@
 import { GIT_TIMEOUT_MS } from '../config/constants.js';
-import { quoteShellArg } from './shell-text.js';
 const DEFAULT_MAX_BYTES = 8 * 1024 * 1024;
 export async function runShell(shell, command, options = {}) {
     const { workdir, timeoutMs = GIT_TIMEOUT_MS, signal } = options;
@@ -22,9 +21,3 @@ export async function runShell(shell, command, options = {}) {
         truncated: result.stdout.truncated || result.stderr.truncated,
     };
 }
-export function backgroundPrefix() {
-    return [quoteShellArg('env'), quoteShellArg('OPENCLI_WINDOW=background')];
-}
-export function backgroundLine(command, argv) {
-    return [...backgroundPrefix(), quoteShellArg(command), ...argv.map(quoteShellArg)].join(' ');
-}

package/dist/host/spec.js

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

package/dist/host/supply-index.d.ts

@@ -5,6 +5,7 @@ export interface SupplyDeclaration {
 }
 export interface SupplyIndexOptions {
     readonly env?: Readonly<Record<string, string | undefined>>;
+    readonly packagePrefix?: string | undefined;
 }
 export interface SupplyEntry {
     readonly key: string;

package/dist/host/supply-index.js

@@ -1,12 +1,12 @@
-import { npmRegistryOf } from './plugin-source.js';
+import { npmRegistryOf } from './npm-registry.js';
 export function npmSourceOf(sources) {
     return sources?.find((source) => source.kind === 'npm');
 }
 function text(value) {
     return value === undefined ? '' : value.trim();
 }
-function conventionPackage(name) {
-    return `opencli-plugin-${name}`;
+function conventionPackage(name, prefix) {
+    return `${prefix}${name}`;
 }
 function nativeSourcePackage(source) {
     if (source.kind === 'npm')
@@ -15,15 +15,15 @@ function nativeSourcePackage(source) {
         return `git:${text(source.url)}`;
     return `local:${text(source.env) || text(source.path)}`;
 }
-function packageOf(need) {
+function packageOf(need, prefix) {
     if (need.kind === 'lib')
         return text(need.name);
     const first = need.sources?.[0];
     if (first === undefined)
-        return conventionPackage(need.name);
+        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);
 }
@@ -107,6 +107,7 @@ function addDeclarer(entry, unit, commands) {
 }
 export function buildSupplyIndex(declarations, options = {}) {
     const env = options.env ?? {};
+    const prefix = options.packagePrefix ?? '';
     const entries = new Map();
     const byName = new Map();
     const conflicts = [];
@@ -133,7 +134,7 @@ export function buildSupplyIndex(declarations, options = {}) {
         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);

package/dist/host/supply-port.js

@@ -3,20 +3,30 @@ export function supplyPortOf(ctx) {
     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/dist/host/unit-face.d.ts

@@ -11,11 +11,12 @@ 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?: {

package/dist/host/version.js

@@ -17,11 +17,16 @@ export function isNewerVersion(latest, installed) {
     return compared === undefined ? true : compared > 0;
 }
 export function runningVersionOf(moduleUrl) {
-    try {
-        const read = JSON.parse(readFileSync(new URL('../../package.json', moduleUrl), 'utf8'));
-        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'));
+            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/dist/host.d.ts

@@ -19,6 +19,21 @@ 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 +42,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 +55,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 +65,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 +73,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 +83,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 +92,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/dist/host.js

@@ -19,6 +19,21 @@ 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, } 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 +42,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 +55,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 +65,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 +73,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 +83,7 @@ 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/npm-registry.js';
 export * from './host/supply-index.js';
 export * from './host/patch.js';
 export * from './host/adapters.js';
@@ -75,6 +91,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/dist/i18n/en.js

@@ -74,7 +74,11 @@ export const en = {
     'time.short.years': '{n}y',
     'panels.title': 'Panel modules',
     'panels.groupBoardless': 'No-board modules',
-    'panels.groupPlugins': 'opencli plugins',
+    'panels.groupPlugins': 'Plugins',
+    'runtime.plugin': 'plugin',
+    'runtime.pluginOf': 'a plugin the runtime provides',
+    'runtime.pluginThing': 'a plugin',
+    'runtime.pluginArea': 'the plugin area',
     'panels.market.defaultHint': 'When on, it is on by default in every workspace; you can also turn it off for a single workspace in Panel setup.',
     'panels.market.defaultLabel': 'On by default everywhere',
     'panels.market.defaultLocked': 'Unusable right now — update or uninstall it first',
@@ -152,9 +156,6 @@ export const en = {
     'panels.market.confirmNo': 'Cancel',
     'panels.market.noMarketSource': 'The index has no newer version of this module (refresh the index and retry)',
     'panels.market.failed': 'Failed: {reason}',
-    'panels.market.askAgent': 'Ask the agent',
-    'panels.market.askAgentCopied': 'Copied',
-    'panels.market.askAgentText': 'This workbench module cannot be used: "{name}" (unit {unit}) — {reason}. Work out what is missing and how to add it, then confirm it works.',
     'panels.market.failure.permission': "Didn't install: no write access",
     'panels.market.failure.diskFull': "Didn't install: the disk is full",
     'panels.market.failure.sandbox': "Didn't install: the system blocked it",
@@ -194,7 +195,7 @@ export const en = {
     'panels.market.noSource': 'This module declares no install method — install it yourself',
     'panels.market.badSource': 'The install method is incomplete — install it yourself',
     'panels.market.empty': 'No modules available',
-    'panels.market.sectionPlugins': 'Installed opencli plugins',
+    'panels.market.sectionPlugins': 'Installed plugins',
     'panels.market.moduleOutdated': 'update available',
     'panels.market.updateNeedsWorkbench': 'this version needs a newer workbench first',
     'panels.market.updateIncompatible': 'the new version does not match this workbench, so it cannot be installed now',
@@ -232,7 +233,7 @@ export const en = {
     'panels.market.justNow': 'just now',
     'panels.market.minutesAgo': '{n} min ago',
     'panels.market.hoursAgo': '{n} h ago',
-    "panels.market.add.description": "Enter a module or opencli plugin package name, Git repository URL, or local directory path.",
+    "panels.market.add.description": "Enter a module or {plugin} package name, Git repository URL, or local directory path.",
     'panels.market.add.specPlaceholder': 'e.g. @dsh-workbench/module-hello',
     'panels.market.add.guideToggle': 'Install guide and examples',
     'panels.market.add.guideHide': 'Hide guide',
@@ -271,12 +272,12 @@ export const en = {
     'panels.market.add.problemInstalled': 'This module is already installed (add @version to switch versions)',
     'panels.market.add.problemNotFound': 'No such module found',
     'panels.market.add.problemNotPackage': 'That path does not exist or is not a valid module package',
-    'panels.market.add.problemNotBundle': 'This package cannot be installed here: {reason}. This entry recognises workbench modules and opencli plugins by package name, and installs either; but a git URL or a tarball does not reveal what it is — if it is really one of those two, use its package name or a local folder instead.',
+    'panels.market.add.problemNotBundle': 'This package cannot be installed here: {reason}. This entry recognises workbench modules and {plugin}s by package name, and installs either; but a git URL or a tarball does not reveal what it is — if it is really one of those two, use its package name or a local folder instead.',
     'panels.market.add.problemNotWorkbenchModule': 'This package does not match the workbench you are running, so installing it would not work. Pick another version, or ask the module author.',
-    'panels.market.add.problemNotModuleOrPlugin': 'This package is neither a workbench module nor an opencli plugin, so installing it would do nothing. Pick another version, or ask the package author.',
-    'panels.market.add.failureNotModuleOrPlugin': 'This package is neither a workbench module nor an opencli plugin, so installing it would do nothing',
-    'panels.market.add.installedPlugin': 'Installed: the opencli plugin {name}',
-    'panels.market.add.pluginPreview': 'This is an opencli plugin: it goes into the opencli plugin area and works as soon as it is installed — no restart.',
+    'panels.market.add.problemNotModuleOrPlugin': 'This package is neither a workbench module nor {pluginOf}, so installing it would do nothing. Pick another version, or ask the package author.',
+    'panels.market.add.failureNotModuleOrPlugin': 'This package is neither a workbench module nor {pluginOf}, so installing it would do nothing',
+    'panels.market.add.installedPlugin': 'Installed: {plugin} {name}',
+    'panels.market.add.pluginPreview': 'This is {pluginThing}: it goes into {pluginArea} and works as soon as it is installed — no restart.',
     'panels.market.add.pluginAlias': 'Plugin name: {name}',
     'panels.market.add.problemNetwork': 'Cannot reach the module source; check the network and retry',
     'panels.market.add.problemUnknown': 'Cannot fetch module information: {reason}',
@@ -366,6 +367,7 @@ export const en = {
     'panels.discover.noSourceHint': 'Add a module market index (http address or git repository) to browse and install its modules here',
     'panels.discover.sourcesFailed': 'Could not read the index sources.',
     'panels.discover.unreadable': 'Could not read this index.',
+    'panels.discover.sandbox': 'Blocked by the system: this profile does not allow the workbench to write its own cache directory.',
     'panels.discover.sourceAuth': 'This index source could not be read: this machine has no git credentials for it. Set up credentials (or switch the source to its SSH address), then refresh.',
     'panels.discover.invalid': 'This index is not in a valid format.',
     'panels.discover.emptyRepo': 'This repository has no commits yet.',
@@ -552,7 +554,7 @@ export const en = {
     'blocker.forbidden.hint': 'You are signed in, but this project/repo is not permitted for your account.',
     'blocker.forbidden.open': 'Open permissions page',
     'blocker.timeout.hint': 'The background browser may not have started; retrying usually helps.',
-    'blocker.exec.hint': 'Make sure opencli is installed and runs from your terminal (which opencli).',
+    'blocker.exec.hint': 'Make sure the runtime is installed and runs from your terminal.',
     'blocker.unknown.title': 'Something went wrong',
     'panels.reading': 'Reading the panel setup…',
     'panels.cardBroken': 'This module will not render: {unit} ({reason})',
@@ -562,6 +564,7 @@ export const en = {
     '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.failed': 'One step away',
     'env.elapsed': 'Waiting {seconds}s',
     'env.stepFailed.install': 'install failed',
@@ -569,16 +572,11 @@ export const en = {
     'env.stepFailed.shell': 'cannot reach the command line',
     'env.toolchain.ok': 'Looks good',
     'env.toolchain.warn': 'Almost ready',
-    'env.opencli.ok': 'Ready',
+    'env.runtime.ok': 'Ready',
     'env.bridge.ok': 'Connected',
     'env.bridge.short': 'Not connected yet',
     'env.bridge.why': 'Panel data uses the login state in your browser. Without this connection, modules cannot fetch data. It does not block startup: fix it, or enter the workbench first.',
     'env.bridge.hold': 'The browser is not connected yet \u2014 fix it below and hit Retry, or enter the workbench first.',
-    'env.bridge.daemon': 'The background service is not running. It usually starts by itself \u2014 run the command below in your terminal first.',
-    'env.bridge.extension': 'The browser extension is not connected. Make sure the browser is running and the extension is enabled; install it once from the store if needed (then hit Retry here).',
-    'env.bridge.extensionLink': 'Get the extension in the Chrome Web Store',
-    'env.bridge.profile': 'Several browser accounts are connected but none is the default: list them (command below), then pick one.',
-    'env.bridge.stale': 'The default browser account is stale (it names an extension instance that no longer exists): pick one again.',
     'env.bridge.unknown': 'Could not tell what went wrong. Expand the raw output and follow the steps in it.',
     'env.fix.title': 'How to fix it',
     'env.fix.why': 'The workbench uses its own background tool (installed separately from the one in your terminal), and it is not set up on this machine yet.',
@@ -607,13 +605,14 @@ export const en = {
     'env.diy.continue': 'Enter the workbench anyway',
     'env.copyCommand': 'Copy command',
     'env.copied': 'Copied',
-    'env.step.toolchain': 'Runtime',
-    'env.step.opencli': 'Background tools',
-    'env.step.bridge': 'Browser connection',
-    'env.step.diy': 'DIY mode',
-    'env.step.warm': 'Site sign-in',
+    'env.step.toolchain': 'Check the environment',
+    'env.step.adapter': 'Check the runtime',
+    'env.step.runtime': 'Install background tools',
+    'env.step.bridge': 'Connect your browser',
+    'env.step.diy': 'Check DIY mode',
+    'env.step.warm': 'Reach your sites',
     'env.warm.done': 'Ready ({n} sites)',
-    'env.warm.short': 'Could not sign in early this time \u2014 nothing breaks; the first read fills it in',
+    'env.warm.short': 'Could not reach your sites early this time \u2014 nothing breaks; the first read fills it in',
     'env.unit.failed': 'This module cannot start',
     'env.unit.failedHint': 'It failed while starting up; other modules are unaffected.',
     'env.unit.unchecked': 'Cannot check: no command line',