@dsh-workbench/adapters-default 1.1.7 → 1.1.9

package/dist/adapter-set.js

@@ -1,12 +1,10 @@
 import { ADAPTER_SET_API_VERSION, runningVersionOf } from '@dsh-workbench/shared/host';
 import { createCommandReader, createDataReader, createGitReader, createLibReader, opencliCommandOf } from '@dsh-workbench/adapter-runtime';
 import { dshPluginsHandler, profileDirOf } from '@dsh-workbench/adapter-supply';
-import { readSelfUpdateView } from '@dsh-workbench/adapter-probe';
-import { createHostActions } from './host-actions.js';
+import { createHostActions } from '@dsh-workbench/adapter-profile';
+import { createProbePort, createSupplyPort, readSelfUpdateView } from '@dsh-workbench/adapter-probe';
 import { createPluginSurface } from './plugin-surface.js';
-import { createProbePort } from './probe-port.js';
 import { createRuntimePort } from './runtime-port.js';
-import { createSupplyPort } from './supply-port.js';
 export const DEFAULT_ADAPTER_SET_ID = '@dsh-workbench/adapters-default';
 export function createAdapterSet(ctx, options = {}) {
     const shell = options.shell ?? ctx.get('shell');

package/dist/index.d.ts

@@ -7,5 +7,5 @@ export interface AdapterDescriptor {
     readonly runtime: 'host';
 }
 export declare const DEFAULT_ADAPTERS: readonly AdapterDescriptor[];
-export { createSupplyPort } from './supply-port.js';
+export { createSupplyPort } from '@dsh-workbench/adapter-probe';
 export { createAdapterSet, DEFAULT_ADAPTER_SET_ID } from './adapter-set.js';

package/dist/index.js

@@ -10,5 +10,5 @@ export const DEFAULT_ADAPTERS = Object.freeze([
     Object.freeze({ id: 'probe', runtime: 'host' }),
     Object.freeze({ id: 'data', runtime: 'host' }),
 ]);
-export { createSupplyPort } from './supply-port.js';
+export { createSupplyPort } from '@dsh-workbench/adapter-probe';
 export { createAdapterSet, DEFAULT_ADAPTER_SET_ID } from './adapter-set.js';

package/dist/runtime-port.d.ts

@@ -1,2 +1,5 @@
 import type { RuntimePort } from '@dsh-workbench/shared/host';
+import { runtimeSeedPaths } from '@dsh-workbench/adapter-probe';
+export declare function runtimePathDirs(paths: ReturnType<typeof runtimeSeedPaths>): readonly string[];
+export declare function prependRuntimePath(paths: ReturnType<typeof runtimeSeedPaths>, env?: NodeJS.ProcessEnv): readonly string[];
 export declare function createRuntimePort(): RuntimePort;

package/dist/runtime-port.js

@@ -1,12 +1,115 @@
 import { existsSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-import { opencliCommandOf } from '@dsh-workbench/adapter-runtime';
-import { isInstalledCopy, packageRootOf, prependPath, runDetached, runtimeSeedPaths, runtimeSeedRootOf, seedRuntimeFiles, seedWorkbenchToolchain, warnUnwritableRoot, workshopSeedPlan, } from '@dsh-workbench/adapter-probe';
+import { packageRootOf } from '@dsh-workbench/shared/host';
+import { backgroundLine, libsBinDir } from '@dsh-workbench/adapter-runtime';
+import { ensureLibsOpencliPeer, opencliCommandOf, opencliRunnerOf } from '@dsh-workbench/adapter-runtime';
+import { isInstalledCopy, prependPath, runDetached, runtimeSeedPaths, runtimeSeedRootOf, seedRuntimeFiles, seedWorkbenchToolchain, warnUnwritableRoot, workshopSeedPlan, } from '@dsh-workbench/adapter-probe';
+export function runtimePathDirs(paths) {
+    return [paths.opencliBinDir, libsBinDir(), paths.entryDir];
+}
+export function prependRuntimePath(paths, env = process.env) {
+    const added = [];
+    for (const dir of [...runtimePathDirs(paths)].reverse()) {
+        if (prependPath(dir, env))
+            added.push(dir);
+    }
+    return added;
+}
+const OPENCLI_RUNNER_TIMEOUT_MS = 30 * 60_000;
 export function createRuntimePort() {
     return {
         packageRoot: packageRootOf,
-        opencliCommand: opencliCommandOf,
         warnUnwritableRoot,
+        capabilities() {
+            return {
+                console: true,
+                pluginMarket: true,
+                browserBridge: true,
+            };
+        },
+        profile() {
+            return {
+                label: 'opencli',
+                terms: {
+                    plugin: { zh: 'opencli 插件', en: 'opencli plugin' },
+                    pluginOf: { zh: 'opencli 的插件', en: 'an opencli plugin' },
+                    pluginThing: { zh: 'opencli 插件', en: 'an opencli plugin' },
+                    pluginArea: { zh: 'opencli 的插件区', en: 'the opencli plugin area' },
+                },
+                installHint: {
+                    zh: '确认 opencli 已经装好、在终端里能直接运行（which opencli）。',
+                    en: 'Make sure opencli is installed and runs from your terminal (which opencli).',
+                },
+                diagnose: {
+                    exec: {
+                        zh: '确认 opencli 已经装好、在终端里能直接运行（which opencli）。',
+                        en: 'Make sure opencli is installed and runs from your terminal (which opencli).',
+                    },
+                    login: {
+                        zh: '在工作台的浏览器桥里登录一次；登录态会一直留着。',
+                        en: 'Sign in once through the workbench browser bridge; the session stays.',
+                    },
+                    bridge: {
+                        zh: '后台浏览器没起来，重试一次通常就好。',
+                        en: 'The background browser is not up; a retry usually fixes it.',
+                    },
+                },
+                bridge: {
+                    daemon: {
+                        text: {
+                            zh: '后台服务没起来：正常它会自己起，先在终端跑下面这条命令。',
+                            en: 'The opencli daemon is not running. It usually starts by itself — run the command below in your terminal first.',
+                        },
+                    },
+                    extension: {
+                        text: {
+                            zh: '浏览器扩展没连上：确认浏览器开着、扩展已启用；没装就从商店装一次（装完回来点「重试」）。',
+                            en: 'The opencli 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).',
+                        },
+                        link: {
+                            label: { zh: '去 Chrome 应用商店装扩展', en: 'Get the extension in the Chrome Web Store' },
+                            href: 'https://chromewebstore.google.com/detail/opencli/ildkmabpimmkaediidaifkhjpohdnifk',
+                        },
+                    },
+                    profile: {
+                        text: {
+                            zh: '连上了多个浏览器账号，但没选默认的那个：先看有哪些（下面这条命令），再选一个。',
+                            en: 'Several browser accounts are connected but none is the default: list them (command below), then pick one.',
+                        },
+                    },
+                    stale: {
+                        text: {
+                            zh: '默认的浏览器账号已经失效（它记的是上一次的扩展实例）：重新选一个。',
+                            en: 'The default browser account is stale (it names an extension instance that no longer exists): pick one again.',
+                        },
+                    },
+                },
+            };
+        },
+        commandSurface() {
+            return {
+                name: 'opencli',
+                pluginPrefix: 'opencli-plugin-',
+                invoke: (site, command) => command === undefined || command === '' ? `opencli ${site}` : `opencli ${site} ${command}`,
+                help: (site) => `opencli ${site} --help`,
+                browser: (verb) => `opencli browser ${verb.join(' ')}`,
+                background: (command, argv) => backgroundLine(command, argv),
+                authorHint: 'opencli skills read opencli-adapter-author',
+            };
+        },
+        commands(ctx) {
+            return { opencli: opencliCommandOf(ctx).command };
+        },
+        runners(ctx, data) {
+            return {
+                opencli: opencliRunnerOf((request) => data.read(request), {
+                    timeoutMs: OPENCLI_RUNNER_TIMEOUT_MS,
+                }),
+            };
+        },
+        health(ctx) {
+            return { opencli: opencliCommandOf(ctx) };
+        },
         seed(ctx, options) {
             const root = runtimeSeedRootOf(ctx);
             if (root === null)
@@ -17,8 +120,9 @@ export function createRuntimePort() {
             const log = options.log;
             for (const file of seedRuntimeFiles({ root, home, packageRoot, log }))
                 log(`自举写下 ${file}`);
-            if (prependPath(paths.entryDir))
-                log(`PATH 前插 ${paths.entryDir}`);
+            ensureLibsOpencliPeer();
+            for (const dir of prependRuntimePath(paths))
+                log(`PATH 前插 ${dir}`);
             seedWorkbenchToolchain(root, log);
             const plan = workshopSeedPlan(packageRoot, home, root);
             runDetached(plan.entry, log);

package/dist/supply-port.js

@@ -1,13 +1,19 @@
-import { cliCatalogPath, isolatedHome, libInstallCommand, vendorPluginsDir } from '@dsh-workbench/adapter-runtime';
+import { cliCatalogPath, ensureLibsBinOnPath, ensureLibsOpencliPeer, isolatedHome, libInstallCommand, vendorPluginsDir } from '@dsh-workbench/adapter-runtime';
+import { isolatedRoot } from '@dsh-workbench/shared/host';
 import { createRegistryNotebook, isNewerVersion, latestVersion, missingReleaseParts, probeRelease } from '@dsh-workbench/adapter-profile';
 import { opencliInstallCommand, startSelfUpdate } from '@dsh-workbench/adapter-probe';
 import { declarationGaps, declarationRefusalOf, moduleDeclarationOf, packageRouteOf, pathDeclarationOf, pluginInstallPlan, profileDirOf, profileModules, readBundleManager, readInstalledModule, readProfilePackage, refusalReason, registryDeclarationOf, resolvePluginSource, splitNpmSpec, } from '@dsh-workbench/adapter-supply';
 export function createSupplyPort() {
     const port = {
+        isolatedRoot,
         isolatedHome,
         cliCatalogPath,
         vendorPluginsDir,
-        opencliInstallCommand,
+        runtimeInstallCommand: opencliInstallCommand,
+        afterLibInstall() {
+            ensureLibsOpencliPeer();
+            ensureLibsBinOnPath();
+        },
         profileDirOf,
         profileModules,
         readInstalledModule,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapters-default",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Default host adapter set installed with @dsh-workbench/core.",
   "type": "module",
   "exports": {
@@ -13,11 +13,11 @@
     "dist"
   ],
   "dependencies": {
-    "@dsh-workbench/adapter-probe": "1.1.7",
-    "@dsh-workbench/shared": "1.1.7",
-    "@dsh-workbench/adapter-supply": "1.1.7",
-    "@dsh-workbench/adapter-profile": "1.1.7",
-    "@dsh-workbench/adapter-runtime": "1.1.7"
+    "@dsh-workbench/adapter-probe": "1.1.9",
+    "@dsh-workbench/adapter-runtime": "1.1.9",
+    "@dsh-workbench/adapter-profile": "1.1.9",
+    "@dsh-workbench/adapter-supply": "1.1.9",
+    "@dsh-workbench/shared": "1.1.9"
   },
   "publishConfig": {
     "access": "public"