@oh-my-tool/cli 0.2.0 → 0.3.0

package/src/extension/discovery.ts

@@ -1,62 +1,62 @@
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
-import { join } from "node:path";
-import type { ExtensionManifest } from "@oh-my-tool/sdk";
-import { parseManifest, validateManifest, checkSdkCompatibility } from "./manifest";
-
-export interface InstalledExtension {
-  id: string;
-  version: string;
-  dir: string;
-  manifest: ExtensionManifest;
-  entry: string;
-}
-
-const EXTENSIONS_DIR = "extensions";
-
-function readEntry(dir: string): string {
-  const pkgPath = join(dir, "package.json");
-  if (existsSync(pkgPath)) {
-    try {
-      const pkg = JSON.parse(readFileSync(pkgPath, "utf8")) as Record<string, any>;
-      const entry = pkg.omt?.entry;
-      if (typeof entry === "string") {
-        return join(dir, entry.replace(/^\.\//, ""));
-      }
-    } catch {
-      // ignore malformed package.json, fall through
-    }
-  }
-  return join(dir, "src", "index.ts");
-}
-
-export function discoverExtensions(home: string): InstalledExtension[] {
-  const root = join(home, EXTENSIONS_DIR);
-  if (!existsSync(root)) return [];
-
-  const out: InstalledExtension[] = [];
-  for (const id of readdirSync(root)) {
-    const idDir = join(root, id);
-    if (!statSync(idDir).isDirectory()) continue;
-    for (const version of readdirSync(idDir)) {
-      const versionDir = join(idDir, version);
-      if (!statSync(versionDir).isDirectory()) continue;
-      const manifestPath = join(versionDir, "omt.manifest.json");
-      if (!existsSync(manifestPath)) continue;
-      try {
-        const manifest = parseManifest(readFileSync(manifestPath, "utf8"));
-        validateManifest(manifest);
-        checkSdkCompatibility(manifest.sdkVersion);
-        out.push({
-          id,
-          version,
-          dir: versionDir,
-          manifest,
-          entry: readEntry(versionDir),
-        });
-      } catch {
-        // skip invalid or incompatible manifests
-      }
-    }
-  }
-  return out;
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import { join } from "node:path";
+import type { ExtensionManifest } from "@oh-my-tool/sdk";
+import { parseManifest, validateManifest, checkSdkCompatibility } from "./manifest";
+
+export interface InstalledExtension {
+  id: string;
+  version: string;
+  dir: string;
+  manifest: ExtensionManifest;
+  entry: string;
+}
+
+const EXTENSIONS_DIR = "extensions";
+
+function readEntry(dir: string): string {
+  const pkgPath = join(dir, "package.json");
+  if (existsSync(pkgPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(pkgPath, "utf8")) as Record<string, any>;
+      const entry = pkg.omt?.entry;
+      if (typeof entry === "string") {
+        return join(dir, entry.replace(/^\.\//, ""));
+      }
+    } catch {
+      // ignore malformed package.json, fall through
+    }
+  }
+  return join(dir, "src", "index.ts");
+}
+
+export function discoverExtensions(home: string): InstalledExtension[] {
+  const root = join(home, EXTENSIONS_DIR);
+  if (!existsSync(root)) return [];
+
+  const out: InstalledExtension[] = [];
+  for (const id of readdirSync(root)) {
+    const idDir = join(root, id);
+    if (!statSync(idDir).isDirectory()) continue;
+    for (const version of readdirSync(idDir)) {
+      const versionDir = join(idDir, version);
+      if (!statSync(versionDir).isDirectory()) continue;
+      const manifestPath = join(versionDir, "omt.manifest.json");
+      if (!existsSync(manifestPath)) continue;
+      try {
+        const manifest = parseManifest(readFileSync(manifestPath, "utf8"));
+        validateManifest(manifest);
+        checkSdkCompatibility(manifest.sdkVersion);
+        out.push({
+          id,
+          version,
+          dir: versionDir,
+          manifest,
+          entry: readEntry(versionDir),
+        });
+      } catch {
+        // skip invalid or incompatible manifests
+      }
+    }
+  }
+  return out;
 }

package/src/extension/install.ts

@@ -1,24 +1,24 @@
-import { cp, mkdir, readFile } from "node:fs/promises";
-import { join } from "node:path";
-import { parseManifest, validateManifest, checkSdkCompatibility } from "./manifest";
-
-export interface InstalledRef {
-  id: string;
-  version: string;
-  target: string;
-}
-
-export async function installLocalExtension(home: string, srcDir: string): Promise<InstalledRef> {
-  const manifest = parseManifest(await readFile(join(srcDir, "omt.manifest.json"), "utf8"));
-  validateManifest(manifest);
-  checkSdkCompatibility(manifest.sdkVersion);
-  const target = join(home, "extensions", manifest.id, manifest.version);
-  await mkdir(target, { recursive: true });
-  // 显式 force:true：Bun 的 fs.cp 在带 filter 时默认覆盖失效（重装不更新旧文件）
-  await cp(srcDir, target, {
-    recursive: true,
-    force: true,
-    filter: (s: string) => !s.includes("node_modules"),
-  });
-  return { id: manifest.id, version: manifest.version, target };
+import { cp, mkdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { parseManifest, validateManifest, checkSdkCompatibility } from "./manifest";
+
+export interface InstalledRef {
+  id: string;
+  version: string;
+  target: string;
+}
+
+export async function installLocalExtension(home: string, srcDir: string): Promise<InstalledRef> {
+  const manifest = parseManifest(await readFile(join(srcDir, "omt.manifest.json"), "utf8"));
+  validateManifest(manifest);
+  checkSdkCompatibility(manifest.sdkVersion);
+  const target = join(home, "extensions", manifest.id, manifest.version);
+  await mkdir(target, { recursive: true });
+  // 显式 force:true：Bun 的 fs.cp 在带 filter 时默认覆盖失效（重装不更新旧文件）
+  await cp(srcDir, target, {
+    recursive: true,
+    force: true,
+    filter: (s: string) => !s.includes("node_modules"),
+  });
+  return { id: manifest.id, version: manifest.version, target };
 }

package/src/extension/loader.ts

@@ -1,32 +1,32 @@
-import { pathToFileURL } from "node:url";
-import type { ExtensionDefinition } from "@oh-my-tool/sdk";
-import { OmtError } from "../core/registry";
-import type { InstalledExtension } from "./discovery";
-import { validateHandlers } from "./manifest";
-
-export async function loadExtension(
-  installed: InstalledExtension,
-): Promise<ExtensionDefinition> {
-  let mod: unknown;
-  try {
-    mod = await import(pathToFileURL(installed.entry).href);
-  } catch (e) {
-    throw new OmtError(
-      "LOAD_FAILED",
-      `failed to load extension '${installed.id}': ${e instanceof Error ? e.message : String(e)}`,
-    );
-  }
-
-  const def = (mod as any)?.default ?? mod;
-  if (!def || typeof def.handlers !== "object" || def.handlers === null) {
-    throw new OmtError("LOAD_FAILED", `extension '${installed.id}' has no handlers`);
-  }
-
-  const handlerNames = Object.keys(def.handlers);
-  try {
-    validateHandlers(installed.manifest, handlerNames);
-  } catch (e) {
-    throw new OmtError("LOAD_FAILED", (e as Error).message);
-  }
-  return def as ExtensionDefinition;
-}
+import { pathToFileURL } from "node:url";
+import type { ExtensionDefinition } from "@oh-my-tool/sdk";
+import { OmtError } from "../core/registry";
+import type { InstalledExtension } from "./discovery";
+import { validateHandlers } from "./manifest";
+
+export async function loadExtension(
+  installed: InstalledExtension,
+): Promise<ExtensionDefinition> {
+  let mod: unknown;
+  try {
+    mod = await import(pathToFileURL(installed.entry).href);
+  } catch (e) {
+    throw new OmtError(
+      "LOAD_FAILED",
+      `failed to load extension '${installed.id}': ${e instanceof Error ? e.message : String(e)}`,
+    );
+  }
+
+  const def = (mod as any)?.default ?? mod;
+  if (!def || typeof def.handlers !== "object" || def.handlers === null) {
+    throw new OmtError("LOAD_FAILED", `extension '${installed.id}' has no handlers`);
+  }
+
+  const handlerNames = Object.keys(def.handlers);
+  try {
+    validateHandlers(installed.manifest, handlerNames);
+  } catch (e) {
+    throw new OmtError("LOAD_FAILED", (e as Error).message);
+  }
+  return def as ExtensionDefinition;
+}

package/src/extension/manifest.ts

@@ -1,115 +1,115 @@
-import { OMT_API_VERSION, type ExtensionManifest } from "@oh-my-tool/sdk";
-
-export class ManifestError extends Error {}
-
-export function parseManifest(raw: string): ExtensionManifest {
-  let data: unknown;
-  try {
-    data = JSON.parse(raw);
-  } catch {
-    throw new ManifestError("manifest is not valid JSON");
-  }
-  const obj = data as Partial<ExtensionManifest>;
-  if (!obj.id || typeof obj.id !== "string") {
-    throw new ManifestError("manifest must contain a string 'id'");
-  }
-  if (!Array.isArray(obj.tools)) {
-    throw new ManifestError("manifest must contain a 'tools' array");
-  }
-  return obj as ExtensionManifest;
-}
-
-export function validateManifest(manifest: ExtensionManifest): void {
-  if (!manifest.name || typeof manifest.name !== "string") {
-    throw new ManifestError("manifest must contain a string 'name'");
-  }
-  if (!manifest.version || typeof manifest.version !== "string") {
-    throw new ManifestError("manifest must contain a string 'version'");
-  }
-  if (!manifest.sdkVersion || typeof manifest.sdkVersion !== "string") {
-    throw new ManifestError("manifest must contain a string 'sdkVersion'");
-  }
-
-  const seen = new Set<string>();
-  for (const tool of manifest.tools) {
-    if (!tool.name || typeof tool.name !== "string") {
-      throw new ManifestError("each tool must have a string 'name'");
-    }
-    if (seen.has(tool.name)) {
-      throw new ManifestError(`duplicate tool name '${tool.name}'`);
-    }
-    seen.add(tool.name);
-
-    const prefix = `${manifest.id}.`;
-    if (!tool.name.startsWith(prefix)) {
-      throw new ManifestError(
-        `tool '${tool.name}' must be prefixed by extension id '${manifest.id}.'`,
-      );
-    }
-  }
-}
-
-const FULL_VERSION_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
-const PARTIAL_VERSION_RE = /^(\d+|x|X|\*)(\.(\d+|x|X|\*))?(\.(\d+|x|X|\*))?$/;
-
-function isValidVersionToken(token: string): boolean {
-  return FULL_VERSION_RE.test(token) || PARTIAL_VERSION_RE.test(token);
-}
-
-function isValidSemverRange(range: string): boolean {
-  const trimmed = range.trim();
-  if (!trimmed) return false;
-  for (const orPart of trimmed.split("||")) {
-    const pieces = orPart.trim().split(/\s+/).filter(Boolean);
-    if (pieces.length === 0) return false;
-    for (let i = 0; i < pieces.length; i++) {
-      const piece = pieces[i];
-      if (piece === "-") {
-        if (i === 0 || i === pieces.length - 1) return false;
-        continue;
-      }
-      const m = piece.match(/^(>=|<=|>|<|=|\^|~)?(.*)$/);
-      if (!m || m[2] === "" || !isValidVersionToken(m[2])) return false;
-    }
-  }
-  return true;
-}
-
-export function checkSdkCompatibility(requiredRange: string): void {
-  if (typeof requiredRange !== "string" || requiredRange.trim() === "") {
-    throw new ManifestError("extension must declare a non-empty 'sdkVersion'");
-  }
-  if (!isValidSemverRange(requiredRange)) {
-    throw new ManifestError(
-      `invalid sdkVersion '${requiredRange}': not a valid semver range`,
-    );
-  }
-  if (!Bun.semver.satisfies(OMT_API_VERSION, requiredRange)) {
-    throw new ManifestError(
-      `extension requires sdk '${requiredRange}' but core provides '${OMT_API_VERSION}'`,
-    );
-  }
-}
-
-export function validateHandlers(
-  manifest: ExtensionManifest,
-  handlerNames: string[],
-): void {
-  const handlerSet = new Set(handlerNames);
-  const manifestSet = new Set(manifest.tools.map((t) => t.name));
-
-  for (const name of manifest.tools.map((t) => t.name)) {
-    if (!handlerSet.has(name)) {
-      throw new ManifestError(
-        `manifest declares tool '${name}' but runtime has no handler`,
-      );
-    }
-  }
-  for (const name of handlerNames) {
-    if (!manifestSet.has(name)) {
-      throw new ManifestError(
-        `runtime registers tool '${name}' not declared in manifest`,
-      );
-    }
-  }
+import { OMT_API_VERSION, type ExtensionManifest } from "@oh-my-tool/sdk";
+
+export class ManifestError extends Error {}
+
+export function parseManifest(raw: string): ExtensionManifest {
+  let data: unknown;
+  try {
+    data = JSON.parse(raw);
+  } catch {
+    throw new ManifestError("manifest is not valid JSON");
+  }
+  const obj = data as Partial<ExtensionManifest>;
+  if (!obj.id || typeof obj.id !== "string") {
+    throw new ManifestError("manifest must contain a string 'id'");
+  }
+  if (!Array.isArray(obj.tools)) {
+    throw new ManifestError("manifest must contain a 'tools' array");
+  }
+  return obj as ExtensionManifest;
+}
+
+export function validateManifest(manifest: ExtensionManifest): void {
+  if (!manifest.name || typeof manifest.name !== "string") {
+    throw new ManifestError("manifest must contain a string 'name'");
+  }
+  if (!manifest.version || typeof manifest.version !== "string") {
+    throw new ManifestError("manifest must contain a string 'version'");
+  }
+  if (!manifest.sdkVersion || typeof manifest.sdkVersion !== "string") {
+    throw new ManifestError("manifest must contain a string 'sdkVersion'");
+  }
+
+  const seen = new Set<string>();
+  for (const tool of manifest.tools) {
+    if (!tool.name || typeof tool.name !== "string") {
+      throw new ManifestError("each tool must have a string 'name'");
+    }
+    if (seen.has(tool.name)) {
+      throw new ManifestError(`duplicate tool name '${tool.name}'`);
+    }
+    seen.add(tool.name);
+
+    const prefix = `${manifest.id}.`;
+    if (!tool.name.startsWith(prefix)) {
+      throw new ManifestError(
+        `tool '${tool.name}' must be prefixed by extension id '${manifest.id}.'`,
+      );
+    }
+  }
+}
+
+const FULL_VERSION_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/;
+const PARTIAL_VERSION_RE = /^(\d+|x|X|\*)(\.(\d+|x|X|\*))?(\.(\d+|x|X|\*))?$/;
+
+function isValidVersionToken(token: string): boolean {
+  return FULL_VERSION_RE.test(token) || PARTIAL_VERSION_RE.test(token);
+}
+
+function isValidSemverRange(range: string): boolean {
+  const trimmed = range.trim();
+  if (!trimmed) return false;
+  for (const orPart of trimmed.split("||")) {
+    const pieces = orPart.trim().split(/\s+/).filter(Boolean);
+    if (pieces.length === 0) return false;
+    for (let i = 0; i < pieces.length; i++) {
+      const piece = pieces[i];
+      if (piece === "-") {
+        if (i === 0 || i === pieces.length - 1) return false;
+        continue;
+      }
+      const m = piece.match(/^(>=|<=|>|<|=|\^|~)?(.*)$/);
+      if (!m || m[2] === "" || !isValidVersionToken(m[2])) return false;
+    }
+  }
+  return true;
+}
+
+export function checkSdkCompatibility(requiredRange: string): void {
+  if (typeof requiredRange !== "string" || requiredRange.trim() === "") {
+    throw new ManifestError("extension must declare a non-empty 'sdkVersion'");
+  }
+  if (!isValidSemverRange(requiredRange)) {
+    throw new ManifestError(
+      `invalid sdkVersion '${requiredRange}': not a valid semver range`,
+    );
+  }
+  if (!Bun.semver.satisfies(OMT_API_VERSION, requiredRange)) {
+    throw new ManifestError(
+      `extension requires sdk '${requiredRange}' but core provides '${OMT_API_VERSION}'`,
+    );
+  }
+}
+
+export function validateHandlers(
+  manifest: ExtensionManifest,
+  handlerNames: string[],
+): void {
+  const handlerSet = new Set(handlerNames);
+  const manifestSet = new Set(manifest.tools.map((t) => t.name));
+
+  for (const name of manifest.tools.map((t) => t.name)) {
+    if (!handlerSet.has(name)) {
+      throw new ManifestError(
+        `manifest declares tool '${name}' but runtime has no handler`,
+      );
+    }
+  }
+  for (const name of handlerNames) {
+    if (!manifestSet.has(name)) {
+      throw new ManifestError(
+        `runtime registers tool '${name}' not declared in manifest`,
+      );
+    }
+  }
 }

package/src/integration/adapters.ts

@@ -1,98 +1,98 @@
-import { homedir } from "node:os";
-import { basename, delimiter, extname, join } from "node:path";
-import { existsSync } from "node:fs";
-import type { AgentDetection, AgentId } from "./types";
-
-export type FindCommand = (candidates: string[]) => Promise<string | undefined> | string | undefined;
-
-export interface DetectionOptions {
-  userHome?: string;
-  findCommand?: FindCommand;
-}
-
-interface AdapterDefinition {
-  id: AgentId;
-  displayName: string;
-  commands: string[];
-  target(userHome: string, command: string): string;
-  variant?(command: string): string | undefined;
-}
-
-const definitions: AdapterDefinition[] = [
-  {
-    id: "codex",
-    displayName: "Codex",
-    commands: ["codex"],
-    target: (home) => join(home, ".agents", "skills", "oh-my-tool"),
-  },
-  {
-    id: "omp",
-    displayName: "OMP",
-    commands: ["omp"],
-    target: (home) => join(home, ".omp", "agent", "skills", "oh-my-tool"),
-  },
-  {
-    id: "qoder",
-    displayName: "Qoder",
-    commands: ["qoderclicn", "qodercli", "qoder"],
-    target: (home, command) =>
-      commandName(command) === "qoderclicn"
-        ? join(home, ".qoder-cn", "skills", "oh-my-tool")
-        : join(home, ".qoder", "skills", "oh-my-tool"),
-    variant: (command) => (commandName(command) === "qoderclicn" ? "Qoder CLI CN" : undefined),
-  },
-  {
-    id: "pi",
-    displayName: "Pi",
-    commands: ["pi"],
-    target: (home) => join(home, ".agents", "skills", "oh-my-tool"),
-  },
-  {
-    id: "cursor",
-    displayName: "Cursor",
-    commands: ["cursor"],
-    target: (home) => join(home, ".agents", "skills", "oh-my-tool"),
-  },
-  {
-    id: "claude",
-    displayName: "Claude Code",
-    commands: ["claude"],
-    target: (home) => join(home, ".claude", "skills", "oh-my-tool"),
-  },
-];
-
-function commandName(command: string): string {
-  return basename(command, extname(command)).toLowerCase();
-}
-
-export function findCommandOnPath(candidates: string[]): string | undefined {
-  const pathEntries = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
-  const suffixes = process.platform === "win32" ? [".exe", ".cmd", ".bat", ".ps1", ""] : [""];
-  for (const candidate of candidates) {
-    for (const directory of pathEntries) {
-      for (const suffix of suffixes) {
-        const path = join(directory, candidate + suffix);
-        if (existsSync(path)) return path;
-      }
-    }
-  }
-  return undefined;
-}
-
-export async function detectAgents(options: DetectionOptions = {}): Promise<AgentDetection[]> {
-  const userHome = options.userHome ?? homedir();
-  const findCommand = options.findCommand ?? findCommandOnPath;
-  const detected: AgentDetection[] = [];
-  for (const definition of definitions) {
-    const command = await findCommand(definition.commands);
-    if (!command) continue;
-    detected.push({
-      id: definition.id,
-      displayName: definition.displayName,
-      command,
-      target: definition.target(userHome, command),
-      variant: definition.variant?.(command),
-    });
-  }
-  return detected;
-}
+import { homedir } from "node:os";
+import { basename, delimiter, extname, join } from "node:path";
+import { existsSync } from "node:fs";
+import type { AgentDetection, AgentId } from "./types";
+
+export type FindCommand = (candidates: string[]) => Promise<string | undefined> | string | undefined;
+
+export interface DetectionOptions {
+  userHome?: string;
+  findCommand?: FindCommand;
+}
+
+interface AdapterDefinition {
+  id: AgentId;
+  displayName: string;
+  commands: string[];
+  target(userHome: string, command: string): string;
+  variant?(command: string): string | undefined;
+}
+
+const definitions: AdapterDefinition[] = [
+  {
+    id: "codex",
+    displayName: "Codex",
+    commands: ["codex"],
+    target: (home) => join(home, ".agents", "skills", "oh-my-tool"),
+  },
+  {
+    id: "omp",
+    displayName: "OMP",
+    commands: ["omp"],
+    target: (home) => join(home, ".omp", "agent", "skills", "oh-my-tool"),
+  },
+  {
+    id: "qoder",
+    displayName: "Qoder",
+    commands: ["qoderclicn", "qodercli", "qoder"],
+    target: (home, command) =>
+      commandName(command) === "qoderclicn"
+        ? join(home, ".qoder-cn", "skills", "oh-my-tool")
+        : join(home, ".qoder", "skills", "oh-my-tool"),
+    variant: (command) => (commandName(command) === "qoderclicn" ? "Qoder CLI CN" : undefined),
+  },
+  {
+    id: "pi",
+    displayName: "Pi",
+    commands: ["pi"],
+    target: (home) => join(home, ".agents", "skills", "oh-my-tool"),
+  },
+  {
+    id: "cursor",
+    displayName: "Cursor",
+    commands: ["cursor"],
+    target: (home) => join(home, ".agents", "skills", "oh-my-tool"),
+  },
+  {
+    id: "claude",
+    displayName: "Claude Code",
+    commands: ["claude"],
+    target: (home) => join(home, ".claude", "skills", "oh-my-tool"),
+  },
+];
+
+function commandName(command: string): string {
+  return basename(command, extname(command)).toLowerCase();
+}
+
+export function findCommandOnPath(candidates: string[]): string | undefined {
+  const pathEntries = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
+  const suffixes = process.platform === "win32" ? [".exe", ".cmd", ".bat", ".ps1", ""] : [""];
+  for (const candidate of candidates) {
+    for (const directory of pathEntries) {
+      for (const suffix of suffixes) {
+        const path = join(directory, candidate + suffix);
+        if (existsSync(path)) return path;
+      }
+    }
+  }
+  return undefined;
+}
+
+export async function detectAgents(options: DetectionOptions = {}): Promise<AgentDetection[]> {
+  const userHome = options.userHome ?? homedir();
+  const findCommand = options.findCommand ?? findCommandOnPath;
+  const detected: AgentDetection[] = [];
+  for (const definition of definitions) {
+    const command = await findCommand(definition.commands);
+    if (!command) continue;
+    detected.push({
+      id: definition.id,
+      displayName: definition.displayName,
+      command,
+      target: definition.target(userHome, command),
+      variant: definition.variant?.(command),
+    });
+  }
+  return detected;
+}