@oh-my-tool/cli 0.3.3 → 0.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oh-my-tool/cli",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "type": "module",
   "description": "Oh My Tool CLI - local and enterprise tools for agents",
   "keywords": [
@@ -29,7 +29,7 @@
   "dependencies": {
     "@clack/prompts": "^1.7.0",
     "@modelcontextprotocol/client": "2.0.0",
-    "@oh-my-tool/sdk": "0.3.3",
+    "@oh-my-tool/sdk": "0.3.5",
     "open": "11.0.0"
   },
   "engines": {

package/src/cli/context.ts

@@ -24,8 +24,13 @@ export async function createRuntime(options: RuntimeOptions = {}) {
   const secrets = new SecretsManager();
   const extensionConnections = sanitizeExtensionConnections(config);
   const nativeProvider = new NativeExtensionProvider(paths);
-  validateConfiguredConnections(config, nativeProvider.installedExtensions());
-  const nativeTarget = options.targetTool !== undefined && await nativeProvider.hasTool(options.targetTool);
+  const nativeTargetExtension = options.targetTool === undefined
+    ? undefined
+    : nativeProvider.extensionForTool(options.targetTool);
+  if (nativeTargetExtension !== undefined) {
+    validateConfiguredConnections(config, nativeProvider.installedExtensions(), nativeTargetExtension);
+  }
+  const nativeTarget = nativeTargetExtension !== undefined;
   const mcpProviders = options.includeMcp === false || nativeTarget ? [] : Object.entries(config.mcp.servers)
     .sort(([a], [b]) => a.localeCompare(b))
     .filter((entry): entry is [string, McpEnabledServerConfig] => entry[1].enabled)

package/src/config/config.ts

@@ -213,9 +213,11 @@ export function sanitizeExtensionConnections(cfg: Config): Record<string, Record
 export function validateConfiguredConnections(
   cfg: Config,
   installedExtensions: readonly InstalledExtension[],
+  targetExtensionId?: string,
 ): void {
   const manifests = new Map(installedExtensions.map((extension) => [extension.id, extension.manifest]));
   for (const [extensionId, extension] of Object.entries(cfg.extensions)) {
+    if (targetExtensionId !== undefined && targetExtensionId !== extensionId) continue;
     const schema = manifests.get(extensionId)?.connectionSchema;
     if (schema === undefined) continue;
     for (const [name, connection] of Object.entries(extension.connections)) {

package/src/extension/install.ts

@@ -24,8 +24,21 @@ export interface NpmExtensionSpec {
 
 export class ExtensionInstallError extends Error {}
 
+export function npmExecutableForPlatform(platform: string = process.platform): string {
+  return platform === "win32" ? "npm.cmd" : "npm";
+}
+
+export function npmShellForPlatform(platform: string = process.platform): boolean {
+  return platform === "win32";
+}
+
 export interface NpmInstallDependencies {
   install(spec: string, tempDir: string): Promise<void>;
+  execFile?(
+    file: string,
+    args: string[],
+    options: { cwd: string; shell: boolean; timeout: number; maxBuffer: number },
+  ): Promise<unknown>;
 }
 
 export function normalizeNpmExtensionSpec(spec: string): NpmExtensionSpec {
@@ -95,19 +108,23 @@ export async function installNpmExtension(
       if (dependencies.install !== undefined) {
         await dependencies.install(normalized.npmSpec, temp);
       } else {
-        await execFile("npm", [
+        const runNpm: NonNullable<NpmInstallDependencies["execFile"]> = dependencies.execFile ?? (async (file, args, options) => {
+          await execFile(file, args, options);
+        });
+        await runNpm(npmExecutableForPlatform(), [
           "install",
-          "--prefix", temp,
+          "--prefix", ".",
           "--ignore-scripts",
           "--no-save",
           "--no-package-lock",
           "--omit=dev",
           "--registry=https://registry.npmjs.org",
           "--", normalized.npmSpec,
-        ], { timeout: 120_000, maxBuffer: 4 * 1024 * 1024 });
+        ], { cwd: temp, timeout: 120_000, maxBuffer: 4 * 1024 * 1024, shell: npmShellForPlatform() });
       }
-    } catch {
-      throw new ExtensionInstallError(`failed to download npm extension '${normalized.npmSpec}'`);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new ExtensionInstallError(`failed to download npm extension '${normalized.npmSpec}': ${message}`);
     }
 
     const packageDir = join(temp, "node_modules", ...normalized.packageName.split("/"));

package/src/runtime/providers/native/provider.ts

@@ -64,6 +64,10 @@ export class NativeExtensionProvider implements ToolProvider {
     return this.getSnapshot().extensions;
   }
 
+  extensionForTool(toolId: string): string | undefined {
+    return this.getSnapshot().routes.get(toolId)?.manifest.id;
+  }
+
   private getSnapshot(): { extensions: InstalledExtension[]; routes: Map<string, InstalledExtension> } {
     if (this.snapshot) return this.snapshot;
     const extensions = this.discover(this.home());

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "0.3.3";
+export const VERSION = "0.3.5";