@oh-my-tool/cli 0.2.0 → 0.3.1

package/src/cli/commands/secret.ts

@@ -1,72 +1,72 @@
-import { SecretsManager } from "../../secrets/secrets";
-import type { SecretStore } from "@oh-my-tool/sdk";
-
-export interface SecretSetResult {
-  ok: true;
-  name: string;
-}
-
-export async function runSecretSet(
-  name: string,
-  value: string,
-  store?: SecretStore,
-): Promise<SecretSetResult> {
-  const mgr = new SecretsManager(store);
-  await mgr.set(name, value);
-  return { ok: true, name };
-}
-
-export interface SecretListResult {
-  names: string[];
-  supported: boolean;
-  hint?: string;
-}
-
-/** 从 cmdkey /list 输出解析 oh-my-tool 命名空间下的 secret 名（不返回值）。 */
-export function parseSecretNamesFromCmdkey(output: string): string[] {
-  const names = new Set<string>();
-  const re = /oh-my-tool\/([A-Za-z0-9:._@-]+)/g;
-  let m: RegExpExecArray | null;
-  while ((m = re.exec(output)) !== null) {
-    names.add(m[1]);
-  }
-  return [...names].sort();
-}
-
-type CmdkeyExec = (args: string[]) => Promise<string>;
-
+import { SecretsManager } from "../../secrets/secrets";
+import type { SecretStore } from "@oh-my-tool/sdk";
+
+export interface SecretSetResult {
+  ok: true;
+  name: string;
+}
+
+export async function runSecretSet(
+  name: string,
+  value: string,
+  store?: SecretStore,
+): Promise<SecretSetResult> {
+  const mgr = new SecretsManager(store);
+  await mgr.set(name, value);
+  return { ok: true, name };
+}
+
+export interface SecretListResult {
+  names: string[];
+  supported: boolean;
+  hint?: string;
+}
+
+/** 从 cmdkey /list 输出解析 oh-my-tool 命名空间下的 secret 名（不返回值）。 */
+export function parseSecretNamesFromCmdkey(output: string): string[] {
+  const names = new Set<string>();
+  const re = /oh-my-tool\/([A-Za-z0-9:._@-]+)/g;
+  let m: RegExpExecArray | null;
+  while ((m = re.exec(output)) !== null) {
+    names.add(m[1]);
+  }
+  return [...names].sort();
+}
+
+type CmdkeyExec = (args: string[]) => Promise<string>;
+
 async function defaultCmdkeyList(): Promise<string> {
   const proc = Bun.spawn(["cmdkey", "/list"], { stdout: "pipe", stderr: "pipe" });
   const output = await Bun.readableStreamToArrayBuffer(proc.stdout);
   const out = new TextDecoder().decode(output);
-  const code = await proc.exited;
-  if (code !== 0) throw new Error(`cmdkey /list exited ${code}`);
-  return out;
-}
-
-/**
- * 列出已设置的 secret 名（只列名、不显值）。
- * Bun.secrets 无枚举 API，Windows 下通过 cmdkey 解析 oh-my-tool/ 前缀；
- * 非 Windows 不支持枚举，返回 supported=false。
- */
-export async function runSecretList(
-  exec: CmdkeyExec = defaultCmdkeyList,
-): Promise<SecretListResult> {
-  if (process.platform !== "win32") {
-    return {
-      names: [],
-      supported: false,
-      hint: "Bun.secrets 无枚举 API；secret list 仅在 Windows（通过 cmdkey）支持",
-    };
-  }
-  try {
-    const out = await exec(["cmdkey", "/list"]);
-    return { names: parseSecretNamesFromCmdkey(out), supported: true };
-  } catch (e) {
-    return {
-      names: [],
-      supported: false,
-      hint: `cmdkey 调用失败: ${e instanceof Error ? e.message : String(e)}`,
-    };
-  }
-}
+  const code = await proc.exited;
+  if (code !== 0) throw new Error(`cmdkey /list exited ${code}`);
+  return out;
+}
+
+/**
+ * 列出已设置的 secret 名（只列名、不显值）。
+ * Bun.secrets 无枚举 API，Windows 下通过 cmdkey 解析 oh-my-tool/ 前缀；
+ * 非 Windows 不支持枚举，返回 supported=false。
+ */
+export async function runSecretList(
+  exec: CmdkeyExec = defaultCmdkeyList,
+): Promise<SecretListResult> {
+  if (process.platform !== "win32") {
+    return {
+      names: [],
+      supported: false,
+      hint: "Bun.secrets 无枚举 API；secret list 仅在 Windows（通过 cmdkey）支持",
+    };
+  }
+  try {
+    const out = await exec(["cmdkey", "/list"]);
+    return { names: parseSecretNamesFromCmdkey(out), supported: true };
+  } catch (e) {
+    return {
+      names: [],
+      supported: false,
+      hint: `cmdkey 调用失败: ${e instanceof Error ? e.message : String(e)}`,
+    };
+  }
+}

package/src/cli/context.ts

@@ -1,9 +1,11 @@
 import { createPaths } from "../paths";
 import { prepareHome } from "../migration";
-import { loadConfig, getConnectionConfig } from "../config/config";
+import { loadConfig, getConnectionConfig, sanitizeExtensionConnections, type McpEnabledServerConfig } from "../config/config";
 import { SecretsManager } from "../secrets/secrets";
 import { applyLimits, validateConnectionInput } from "../policy/policy";
 import { NativeExtensionProvider } from "../runtime/providers/native/provider";
+import { McpProvider } from "../runtime/providers/mcp/provider";
+import { discoverExtensions } from "../extension/discovery";
 import { createToolRuntime } from "../runtime/runtime";
 import type { ToolDescriptor } from "../runtime/provider";
 
@@ -11,15 +13,29 @@ export function homeDir(): string {
   return createPaths().home;
 }
 
-export async function createRuntime() {
+export interface RuntimeOptions {
+  readonly includeMcp?: boolean;
+  readonly targetTool?: string;
+}
+
+export async function createRuntime(options: RuntimeOptions = {}) {
   const paths = createPaths();
   await prepareHome(paths);
   const config = loadConfig(paths.home);
   const secrets = new SecretsManager();
+  const extensionConnections = sanitizeExtensionConnections(config);
+  const nativeTarget = options.targetTool !== undefined && discoverExtensions(paths.home)
+    .some((extension) => extension.manifest.tools.some((tool) => tool.name === options.targetTool));
+  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)
+    .map(([serverId, server]) => new McpProvider({ serverId, config: server, secrets }));
+  const providers = [new NativeExtensionProvider(paths), ...mcpProviders];
   return createToolRuntime({
-    providers: [new NativeExtensionProvider(paths)],
+    providers,
     policy: {
       preflight(descriptor, input) {
+        if (descriptor.provider.kind !== "native") return;
         const limits = applyLimits(input);
         input.maxRows = limits.maxRows;
         input.timeoutMs = limits.timeoutMs;
@@ -36,9 +52,26 @@ export async function createRuntime() {
         : undefined;
       return {
         logger: { debug() {}, info() {}, warn() {}, error() {} },
-        config: (connection ?? {}) as Record<string, unknown>,
+        config: (connection ?? { connections: extensionConnections[extensionId] ?? {} }) as Record<string, unknown>,
         secrets,
       };
     },
   });
 }
+
+export async function withRuntime<T>(operation: (runtime: Awaited<ReturnType<typeof createRuntime>>) => Promise<T>, options: RuntimeOptions = {}): Promise<T> {
+  const runtime = await createRuntime(options);
+  let operationFailed = false;
+  try {
+    return await operation(runtime);
+  } catch (error) {
+    operationFailed = true;
+    throw error;
+  } finally {
+    try {
+      await runtime.close();
+    } catch (closeError) {
+      if (!operationFailed) throw closeError;
+    }
+  }
+}