@mearl/setup 2.17.0 → 2.18.0

package/README.md

@@ -88,8 +88,9 @@ npx @mearl/setup provider update brow
 npx @mearl/setup provider uninstall brow
 ```
 
-安装参数接受包名、版本或 dist-tag；更新和卸载可使用 `providerId` 或完整包名。阿里包在
-本机存在 `tnpm` 时优先使用 `tnpm`，其他情况沿用启动 setup 的包管理器。Provider 登记只保存
+安装参数接受包名、版本或 dist-tag；更新和卸载可使用 `providerId` 或完整包名。`@ali/*` 包的
+安装和更新固定使用 `https://registry.anpm.alibaba-inc.com/`。安装沿用启动 setup 的包管理器，
+更新和卸载沿用当前 Provider 的原包管理器。Provider 登记只保存
 经过校验的包名、安装目录和包内入口；不接受包自行注入启动命令、参数、工作目录或环境变量。
 卸载仅在包管理器成功移除包后清除登记，以便失败时可以重试。
 

package/dist/internalPlugins.d.ts

@@ -2,7 +2,7 @@ import { findPluginRegistration, listPluginNames, unregisterPlugin } from '@mear
 import { resolveAliSkillsInvocation } from './aliSkills.js';
 import { installPlugins } from './plugin.js';
 import { findExecutable, type CommandRunner } from './process.js';
-export declare const ALIBABA_NPM_REGISTRY = "https://registry.anpm.alibaba-inc.com/";
+export { ALIBABA_NPM_REGISTRY } from './npmRegistry.js';
 export declare const ALIBABA_INTERNAL_PLUGIN_NAMES: string[];
 export interface InternalPluginOptions {
     env?: NodeJS.ProcessEnv;

package/dist/internalPlugins.js

@@ -1,9 +1,10 @@
 import { dirname } from 'node:path';
 import { findOfficialPlugin, findPluginRegistration, listPluginNames, listOfficialPluginNames, OFFICIAL_PLUGIN_MANAGER, unregisterPlugin, } from '@mearl/client/plugin';
 import { resolveAliSkillsInvocation } from './aliSkills.js';
+import { ALIBABA_NPM_REGISTRY } from './npmRegistry.js';
 import { installPlugins } from './plugin.js';
 import { findExecutable, prependCommandPath, runCommand } from './process.js';
-export const ALIBABA_NPM_REGISTRY = 'https://registry.anpm.alibaba-inc.com/';
+export { ALIBABA_NPM_REGISTRY } from './npmRegistry.js';
 export const ALIBABA_INTERNAL_PLUGIN_NAMES = listOfficialPluginNames('alibaba');
 export async function canAccessAlibabaNpmRegistry(options = {}, dependencies = {}) {
     const env = options.env ?? process.env;

package/dist/npmRegistry.d.ts

@@ -0,0 +1,2 @@
+export declare const ALIBABA_NPM_REGISTRY = "https://registry.anpm.alibaba-inc.com/";
+export declare function packageRegistryEnvironment(packageName: string, env: NodeJS.ProcessEnv): NodeJS.ProcessEnv;

package/dist/npmRegistry.js

@@ -0,0 +1,6 @@
+export const ALIBABA_NPM_REGISTRY = 'https://registry.anpm.alibaba-inc.com/';
+export function packageRegistryEnvironment(packageName, env) {
+    if (!packageName.startsWith('@ali/'))
+        return env;
+    return { ...env, npm_config_registry: ALIBABA_NPM_REGISTRY };
+}

package/dist/plugin.js

@@ -19,7 +19,7 @@ export async function setupPlugin(name, target) {
     const entry = resolvePluginEntry(target);
     const plugin = await loadPlugin(entry, registrationContext);
     await ensurePluginRuntime();
-    return registerPlugin(name, entry, plugin.description);
+    return registerPlugin(name, entry, plugin.description, { toolbox: plugin.toolbox });
 }
 export async function ensureOfficialPlugin(name, runner = runCommand) {
     const definition = findOfficialPlugin(name);
@@ -186,15 +186,22 @@ export async function installPlugins(args, runner = runCommand, options = {}) {
         assertPluginName(name);
         if (plugins.has(name))
             throw new Error(`多个 skill 使用插件名称 ${name}，请通过 setup plugin <name> <path> 分别注册。`);
-        plugins.set(name, { entry, description: plugin.description });
+        plugins.set(name, {
+            entry,
+            description: plugin.description,
+            ...(plugin.toolbox ? { toolbox: plugin.toolbox } : {}),
+        });
     }
     if (plugins.size === 0) {
         console.error('未找到 scripts/main.mjs 或 scripts/main.py 插件入口；自定义入口可用 setup plugin <name> <path> 注册。');
         return 0;
     }
     await ensurePluginRuntime(runner);
-    for (const [name, { entry, description }] of plugins) {
-        registerPlugin(name, entry, description, { managedBy: options.registrationManagedBy });
+    for (const [name, { entry, description, toolbox }] of plugins) {
+        registerPlugin(name, entry, description, {
+            managedBy: options.registrationManagedBy,
+            ...(toolbox ? { toolbox } : {}),
+        });
         console.error(`Plugin ${name} registered: ${entry}\nRun: mearl ${name} --help`);
     }
     return 0;

package/dist/provider.d.ts

@@ -1,13 +1,12 @@
 import { listInstalledProviders, registerProviderPackage, stopProvider, uninstallProvider, type InstalledProviderManifest } from '@mearl/provider/host';
 import { resolvePackageManagerInstallation, type PackageManagerInstallation } from './packageManager.js';
-import { findExecutable, type CommandRunner } from './process.js';
+import { type CommandRunner } from './process.js';
 interface ProviderPackageSpec {
     packageName: string;
     target: string;
 }
 export interface ProviderSetupDependencies {
     existsSync?: (filePath: string) => boolean;
-    findExecutable?: typeof findExecutable;
     listProviders?: typeof listInstalledProviders;
     registerPackage?: typeof registerProviderPackage;
     resolveInvokingManager?: (env: NodeJS.ProcessEnv) => PackageManagerInstallation;

package/dist/provider.js

@@ -1,8 +1,9 @@
 import { existsSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { join, resolve } from 'node:path';
 import { listInstalledProviders, registerProviderPackage, stopProvider, uninstallProvider, } from '@mearl/provider/host';
 import { buildGlobalPackageCommand, resolveInvokingPackageManager, resolvePackageManagerInstallation, } from './packageManager.js';
-import { findExecutable, prependCommandPath, runCommand } from './process.js';
+import { packageRegistryEnvironment } from './npmRegistry.js';
+import { prependCommandPath, runCommand } from './process.js';
 export function parseProviderPackageSpec(value) {
     const input = value.trim();
     const nameMatch = input.match(/^(@[a-z0-9][a-z0-9._-]*\/[a-z0-9][a-z0-9._-]*|[a-z0-9][a-z0-9._-]*)(?:@(.+))?$/i);
@@ -11,17 +12,10 @@ export function parseProviderPackageSpec(value) {
     }
     return { packageName: nameMatch[1], target: nameMatch[2] || 'latest' };
 }
-function providerManager(packageName, env, dependencies, resolvedManager) {
-    const resolved = resolvedManager ??
+function providerManager(env, dependencies, resolvedManager) {
+    return (resolvedManager ??
         (dependencies.resolveInvokingManager ??
-            (childEnv => resolveInvokingPackageManager({ env: childEnv })))(env);
-    if (!packageName.startsWith('@ali/') || resolved.command.includes('tnpm'))
-        return resolved;
-    const tnpm = (dependencies.findExecutable ?? findExecutable)('tnpm', {
-        env,
-        extraDirectories: [dirname(process.execPath)],
-    });
-    return tnpm ? { manager: 'npm', command: tnpm } : resolved;
+            (childEnv => resolveInvokingPackageManager({ env: childEnv })))(env));
 }
 function outputPath(output) {
     const lines = output
@@ -71,8 +65,9 @@ function findRegisteredProvider(selector, listProviders) {
 }
 async function runPackageCommand(installation, operation, packageName, target, runner, env) {
     const command = buildGlobalPackageCommand(installation, operation, [packageName], target);
+    const commandEnv = operation === 'uninstall' ? env : packageRegistryEnvironment(packageName, env);
     const result = await runner(command.command, command.args, {
-        env: prependCommandPath(command.command, env),
+        env: prependCommandPath(command.command, commandEnv),
         tee: true,
     });
     if (result.code !== 0) {
@@ -83,7 +78,7 @@ export async function installProviderPackage(packageSpec, dependencies = {}) {
     const { packageName, target } = parseProviderPackageSpec(packageSpec);
     const env = process.env;
     const runner = dependencies.runCommand ?? runCommand;
-    const installation = providerManager(packageName, env, dependencies);
+    const installation = providerManager(env, dependencies);
     await runPackageCommand(installation, 'install', packageName, target, runner, env);
     const packageRoot = await (dependencies.resolvePackageRoot ?? resolveGlobalProviderPackageRoot)(installation, packageName, runner, env);
     if (!(dependencies.existsSync ?? existsSync)(join(packageRoot, 'package.json'))) {
@@ -98,7 +93,7 @@ export async function updateProviderPackage(selector, dependencies = {}) {
     const env = process.env;
     const runner = dependencies.runCommand ?? runCommand;
     const detectedManager = (dependencies.resolvePackageManager ?? resolvePackageManagerInstallation)(current.packageRoot, current.packageName) ?? undefined;
-    const installation = providerManager(current.packageName, env, dependencies, detectedManager);
+    const installation = providerManager(env, dependencies, detectedManager);
     (dependencies.stopProvider ?? stopProvider)(current.providerId);
     await runPackageCommand(installation, 'update', current.packageName, 'latest', runner, env);
     const manifest = (dependencies.registerPackage ?? registerProviderPackage)(current.packageRoot);
@@ -108,7 +103,7 @@ export async function uninstallProviderPackage(selector, dependencies = {}) {
     const listProviders = dependencies.listProviders ?? listInstalledProviders;
     const manifest = findRegisteredProvider(selector, listProviders);
     const env = process.env;
-    const installation = (dependencies.resolvePackageManager ?? resolvePackageManagerInstallation)(manifest.packageRoot, manifest.packageName) ?? providerManager(manifest.packageName, env, dependencies);
+    const installation = (dependencies.resolvePackageManager ?? resolvePackageManagerInstallation)(manifest.packageRoot, manifest.packageName) ?? providerManager(env, dependencies);
     (dependencies.stopProvider ?? stopProvider)(manifest.providerId);
     await runPackageCommand(installation, 'uninstall', manifest.packageName, 'latest', dependencies.runCommand ?? runCommand, env);
     (dependencies.unregisterProvider ?? uninstallProvider)(manifest.providerId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/setup",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "description": "One-shot environment setup and configuration for Mearl",
   "type": "module",
   "main": "dist/index.js",
@@ -61,8 +61,8 @@
     "commander": "^15.0.0",
     "extract-zip": "^2.0.1",
     "ws": "^8.18.3",
-    "@mearl/client": "2.17.0",
-    "@mearl/provider": "2.17.0"
+    "@mearl/client": "2.18.0",
+    "@mearl/provider": "2.18.0"
   },
   "devDependencies": {
     "@types/node": "^24.9.1",