@dsh-workbench/adapter-supply 1.1.4 → 1.1.5

package/dist/installed-module.d.ts

@@ -25,6 +25,7 @@ export interface ProfileModule {
     readonly version: string;
     readonly registry?: string;
     readonly local?: boolean;
+    readonly fromRegistry?: boolean;
 }
 export declare function profileManifestOf(profileDir: string | null): Readonly<Record<string, unknown>> | undefined;
 export declare function profileModules(profileDir: string | null): readonly ProfileModule[];
@@ -39,6 +40,7 @@ export declare function declaredPluginCommands(profileDir: string | null): Reado
 export declare function readInstalledModule(profileDir: string | null, pkg: string): InstalledModule;
 export declare function isPackedArtifactSpec(spec: string): boolean;
 export declare function isLocalDependencySpec(spec: string): boolean;
+export declare function isRegistryDependencySpec(spec: string): boolean;
 export interface ProfilePackage {
     readonly pkg: string;
     readonly version: string;

package/dist/installed-module.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { declarationProblemsOf, readDeclaration } from '@dsh-workbench/shared/host';
+import { declarationProblemsOf, packageSourceOf, readDeclaration, scopeOf } from '@dsh-workbench/shared/host';
 const PACKAGE_NAME = /^(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*$/;
 function asRecord(value) {
     return typeof value === 'object' && value !== null ? value : undefined;
@@ -39,14 +39,17 @@ export function profileModules(profileDir) {
     const found = [];
     for (const pkg of names) {
         const read = readInstalledModule(profileDir, pkg);
-        if (read.kind === 'module')
+        if (read.kind === 'module') {
+            const spec = asText(dependencies[read.pkg]);
             found.push({
                 pkg: read.pkg,
                 unit: read.unit,
                 version: read.version,
                 ...(read.registry === undefined ? {} : { registry: read.registry }),
-                local: isLocalDependencySpec(asText(dependencies[read.pkg])),
+                local: isLocalDependencySpec(spec),
+                fromRegistry: isRegistryDependencySpec(spec),
             });
+        }
     }
     return found;
 }
@@ -87,6 +90,51 @@ function registryFromLockfile(profileDir, pkg) {
         return undefined;
     return tarball.slice(0, cut);
 }
+function unquoted(value) {
+    const quote = value.charAt(0);
+    if (value.length >= 2 && (quote === '"' || quote === "'") && value.endsWith(quote)) {
+        return value.slice(1, -1).trim();
+    }
+    return value;
+}
+function registryFromNpmrc(profileDir, pkg) {
+    let text;
+    try {
+        text = fs.readFileSync(path.join(profileDir, '.npmrc'), 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+    const scope = scopeOf(pkg);
+    let fallback;
+    for (const line of text.split('\n')) {
+        const trimmed = line.trim();
+        if (trimmed === '' || trimmed.startsWith('#') || trimmed.startsWith(';'))
+            continue;
+        const separator = trimmed.indexOf('=');
+        if (separator <= 0)
+            continue;
+        const key = trimmed.slice(0, separator).trim();
+        const value = unquoted(trimmed.slice(separator + 1).trim());
+        if (value === '')
+            continue;
+        if (scope !== null && key === `${scope}:registry`)
+            return value;
+        if (key === 'registry')
+            fallback = value;
+    }
+    return fallback;
+}
+function registryOf(profileDir, pkg, manifest) {
+    const declared = asText(asRecord(manifest.publishConfig)?.registry);
+    if (declared !== '')
+        return declared;
+    const recorded = packageSourceOf(profileDir, pkg);
+    if (recorded !== undefined)
+        return recorded.registry;
+    const locked = registryFromLockfile(profileDir, pkg);
+    return locked === undefined ? registryFromNpmrc(profileDir, pkg) : locked;
+}
 export function moduleDeclarationOf(profileDir, pkg) {
     if (profileDir === null || !isPackageName(pkg))
         return undefined;
@@ -144,14 +192,13 @@ export function readInstalledModule(profileDir, pkg) {
     const unit = declared === undefined ? '' : asText(declared.unit);
     if (unit === '')
         return { kind: 'not-module', pkg };
-    const declaredRegistry = asText(asRecord(record.publishConfig)?.registry);
-    const registry = declaredRegistry === '' ? registryFromLockfile(profileDir, pkg) : declaredRegistry;
+    const registry = registryOf(profileDir, pkg, record);
     return {
         kind: 'module',
         pkg,
         unit,
         version: asText(record.version),
-        ...(registry === '' ? {} : { registry }),
+        ...(registry === undefined ? {} : { registry }),
     };
 }
 const PACKED_ARTIFACT = /\.(?:tgz|tar\.gz|tar)$/i;
@@ -170,6 +217,15 @@ export function isLocalDependencySpec(spec) {
         trimmed.startsWith('../') ||
         trimmed.startsWith('/'));
 }
+const NON_REGISTRY_SPEC = /^(?:git\+|git:|github:|gitlab:|bitbucket:|https?:|ssh:|workspace:)/i;
+export function isRegistryDependencySpec(spec) {
+    const trimmed = spec.trim();
+    if (trimmed === '')
+        return true;
+    if (isLocalDependencySpec(trimmed) || isPackedArtifactSpec(trimmed))
+        return false;
+    return !NON_REGISTRY_SPEC.test(trimmed);
+}
 export function readProfilePackage(profileDir, pkg) {
     if (profileDir === null || !isPackageName(pkg))
         return undefined;
@@ -186,14 +242,13 @@ export function readProfilePackage(profileDir, pkg) {
     const version = asText(record.version);
     if (version === '')
         return undefined;
-    const declaredRegistry = asText(asRecord(record.publishConfig)?.registry);
-    const registry = declaredRegistry === '' ? registryFromLockfile(profileDir, pkg) : declaredRegistry;
+    const registry = registryOf(profileDir, pkg, record);
     const dependencies = asRecord(profileManifestOf(profileDir)?.dependencies) ?? {};
     const local = isLocalDependencySpec(asText(dependencies[pkg]));
     return {
         pkg,
         version,
-        ...(registry === '' ? {} : { registry }),
+        ...(registry === undefined ? {} : { registry }),
         ...(local ? { local: true } : {}),
     };
 }

package/dist/plugin-tools.d.ts

@@ -10,6 +10,5 @@ export declare function pluginToolDescription(command: PluginCommand): string;
 export declare function pluginToolWrites(command: PluginCommand): boolean;
 export declare function pluginToolSession(command: PluginCommand): OpencliSession;
 export declare function pluginToolArgv(command: PluginCommand, raw: unknown): string[];
-export declare function pluginKeyArgs(command: PluginCommand, raw: unknown): string;
-export declare function pluginApprovalQuestion(command: PluginCommand, raw: unknown): ApprovalDetail;
+export declare function pluginApprovalQuestion(command: PluginCommand): ApprovalDetail;
 export declare function pluginApprovalFor(command: PluginCommand): ApprovalPolicy;

package/dist/plugin-tools.js

@@ -8,8 +8,6 @@ const SCHEMA_TYPE = {
     boolean: 'boolean',
     string: 'string',
 };
-const KEY_ARG_LIMIT = 3;
-const NO_KEY_ARGS = '没有带参数';
 export const RUN_CODE_TOOL = 'run_code';
 export const PLUGIN_PROMPT_BUDGET = 4_000;
 export function pluginToolName(plugin, command) {
@@ -93,35 +91,18 @@ export function pluginToolArgv(command, raw) {
     }
     return argv;
 }
-export function pluginKeyArgs(command, raw) {
-    const values = valuesOf(raw);
-    const ordered = [...command.args.filter((arg) => arg.required), ...command.args.filter((arg) => !arg.required)];
-    const parts = [];
-    for (const arg of ordered) {
-        const value = values[arg.name];
-        if (value === undefined || value === null || value === '')
-            continue;
-        parts.push(`${arg.name}=${String(value)}`);
-        if (parts.length === KEY_ARG_LIMIT)
-            break;
-    }
-    return parts.length === 0 ? NO_KEY_ARGS : parts.join('、');
-}
-export function pluginApprovalQuestion(command, raw) {
-    const key = pluginKeyArgs(command, raw);
-    const zhKey = key === NO_KEY_ARGS ? '这次没带参数' : key;
-    const enKey = key === NO_KEY_ARGS ? 'no arguments' : key;
+export function pluginApprovalQuestion(command) {
     return {
-        zh: `agent 想执行工作台 [${command.plugin}] opencli 插件的 [${command.name}] 命令（${zhKey}），允许吗？`,
-        en: `The agent wants to run the [${command.name}] command of the workbench opencli plugin [${command.plugin}] (${enKey}). Allow?`,
+        zh: `agent 想执行工作台 [${command.plugin}] opencli 插件的 [${command.name}] 命令，允许吗？`,
+        en: `The agent wants to run the [${command.name}] command of the workbench opencli plugin [${command.plugin}]. Allow?`,
     };
 }
 export function pluginApprovalFor(command) {
     const denied = command.access === 'read';
-    return (call) => {
+    return () => {
         if (denied)
             return { kind: 'read' };
-        const question = pluginApprovalQuestion(command, call.arguments);
+        const question = pluginApprovalQuestion(command);
         return {
             kind: 'ask',
             reason: command.access === 'write'
@@ -129,6 +110,7 @@ export function pluginApprovalFor(command) {
                 : `${command.plugin} ${command.name} 没有拿到 access（fail-safe：按写处理）`,
             question,
             fallback: question,
+            noteInDetail: true,
         };
     };
 }

package/dist/plugin-units.js

@@ -99,7 +99,15 @@ function faceOf(unit, opencliFor, note) {
         title: { zh: unit.plugin, en: unit.plugin },
         titleKey: unitTitleKey(unit.id),
         card: null,
-        tools: unit.tools.map((tool) => ({ name: tool.name, writes: pluginToolWrites(tool.command) })),
+        tools: unit.tools.map((tool) => ({
+            name: tool.name,
+            writes: pluginToolWrites(tool.command),
+            opencli: {
+                plugin: unit.plugin,
+                command: tool.command.name,
+                args: tool.command.args.map((arg) => arg.name),
+            },
+        })),
         host: { inject: [] },
     };
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-supply",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Workbench supply adapter package.",
   "type": "module",
   "exports": {
@@ -22,8 +22,8 @@
     "directory": "packages/adapter-supply"
   },
   "dependencies": {
-    "@dsh-workbench/adapter-runtime": "1.1.4",
-    "@dsh-workbench/shared": "1.1.4"
+    "@dsh-workbench/adapter-runtime": "1.1.5",
+    "@dsh-workbench/shared": "1.1.5"
   },
   "devDependencies": {
     "@types/node": "^24.19.0",