requestshield 0.1.2 → 0.1.4

package/src/commands/agent-setup.mjs

@@ -1,91 +1,185 @@
-// @ts-check
-
-import { cp, lstat, mkdir, rename, rm, writeFile } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import { randomUUID } from "node:crypto";
-import { CliError } from "../errors.mjs";
-import { getAsset, isSea } from "node:sea";
-
-const skillAsset = "requestshield-skill.md";
-
-/**
- * @param {{ agent: string, force: boolean }} options
- * @param {{ env?: NodeJS.ProcessEnv, homeDir?: string, log: (message: string) => void, sourceDir?: string }} deps
- */
-export async function setupAgent(options, deps) {
-  if (options.agent !== "codex") {
-    throw new CliError(`Unsupported agent: ${options.agent}`, { exitCode: 2 });
-  }
-  const env = deps.env ?? process.env;
-  const codexHome = env.CODEX_HOME || path.join(deps.homeDir ?? os.homedir(), ".codex");
-  const skillsRoot = path.join(codexHome, "skills");
-  const destination = path.join(skillsRoot, "requestshield");
-  await mkdir(skillsRoot, { recursive: true });
-
-  const exists = await pathExists(destination);
-  if (exists && !options.force) {
-    throw new CliError(`RequestShield skill already exists at ${destination}; use --force to replace it`, {
-      code: "SKILL_EXISTS",
-      exitCode: 2,
-    });
-  }
-
-  const staging = path.join(skillsRoot, `.requestshield-${randomUUID()}.tmp`);
-  const backup = `${destination}.${randomUUID()}.backup`;
-  try {
-    if (deps.sourceDir) {
-      // Dùng trong test hoặc khi caller chỉ định source.
-      await cp(deps.sourceDir, staging, {
-        recursive: true,
-        errorOnExist: true,
-      });
-    } else if (isSea()) {
-      // SEA không có thư mục source trên disk, đọc skill đã nhúng.
-      await mkdir(staging);
-
-      await writeFile(
-          path.join(staging, "SKILL.md"),
-          Buffer.from(getAsset(skillAsset)),
-      );
-    } else {
-      // Chạy từ source/npm hoặc chạy bundle CJS trên disk.
-      //
-      // src/main.mjs                 -> ../skills/requestshield
-      // dist/requestshield.cjs      -> ../skills/requestshield
-      const executableDir = path.dirname(path.resolve(process.argv[1]));
-      const source = path.resolve(
-          executableDir,
-          "../skills/requestshield",
-      );
-
-      await cp(source, staging, {
-        recursive: true,
-        errorOnExist: true,
-      });
-    }
-    if (exists) await rename(destination, backup);
-    await rename(staging, destination);
-    if (exists) await rm(backup, { recursive: true, force: true });
-  } catch (error) {
-    await rm(staging, { recursive: true, force: true });
-    if (await pathExists(backup)) {
-      await rm(destination, { recursive: true, force: true });
-      await rename(backup, destination);
-    }
-    throw error;
-  }
-  deps.log(`Installed RequestShield skill for Codex at ${destination}`);
-  deps.log("Restart Codex or start a new task before using the skill.");
-}
-
-/** @param {string} target */
-async function pathExists(target) {
-  try {
-    await lstat(target);
-    return true;
-  } catch (error) {
-    if (/** @type {NodeJS.ErrnoException} */ (error).code === "ENOENT") return false;
-    throw error;
-  }
-}
+// @ts-check
+
+import { cp, lstat, mkdir, realpath, rename, rm, writeFile } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+import { createInterface } from "node:readline/promises";
+import { CliError } from "../errors.mjs";
+import { detectAgents } from "../agent-detector.mjs";
+import { getAsset, isSea } from "node:sea";
+
+const skillAsset = "requestshield-skill.md";
+
+/**
+ * @param {{ agent?: "codex" | "claude", force: boolean }} options
+ * @param {{ env?: NodeJS.ProcessEnv, homeDir?: string, log: (message: string) => void, sourceDir?: string, executablePath?: string, detectAgents?: () => Promise<Array<"codex" | "claude">>, selectAgent?: (detected: Array<"codex" | "claude">) => Promise<"codex" | "claude"> }} deps
+ */
+export async function setupAgent(options, deps) {
+  const agent = await resolveAgent(options.agent, deps);
+  const homeDir = deps.homeDir ?? os.homedir();
+
+  // Codex and Claude discover personal skills from different directories.
+  const skillsRoot = agent === "codex"
+    ? path.join(homeDir, ".agents", "skills")
+    : path.join(homeDir, ".claude", "skills");
+  const destination = path.join(skillsRoot, "requestshield");
+  await mkdir(skillsRoot, { recursive: true });
+
+  const exists = await pathExists(destination);
+  if (exists && !options.force) {
+    throw new CliError(`RequestShield skill already exists at ${destination}; use --force to replace it`, {
+      code: "SKILL_EXISTS",
+      exitCode: 2,
+    });
+  }
+
+  // Copy into a staging directory so an interrupted copy cannot leave a
+  // partially installed skill at the final destination.
+  const staging = path.join(skillsRoot, `.requestshield-${randomUUID()}.tmp`);
+  const backup = `${destination}.${randomUUID()}.backup`;
+  try {
+    if (deps.sourceDir) {
+      // Tests and alternate packagers can provide an explicit skill source.
+      await cp(deps.sourceDir, staging, {
+        recursive: true,
+        errorOnExist: true,
+      });
+    } else if (isSea()) {
+      // A single-executable build reads the skill from its embedded assets.
+      await mkdir(staging);
+
+      await writeFile(
+          path.join(staging, "SKILL.md"),
+          Buffer.from(getAsset(skillAsset)),
+      );
+    } else {
+      // Source, npm, and on-disk CJS builds keep the skill beside the program.
+      //
+      // src/main.mjs                 -> ../skills/requestshield
+      // dist/requestshield.cjs      -> ../skills/requestshield
+      // npm link and global npm installs expose a symlink in their bin folder.
+      // Follow it before resolving the adjacent packaged skills directory.
+      const executable = await realpath(deps.executablePath ?? process.argv[1]);
+      const executableDir = path.dirname(executable);
+      const source = path.resolve(
+          executableDir,
+          "../skills/requestshield",
+      );
+
+      await cp(source, staging, {
+        recursive: true,
+        errorOnExist: true,
+      });
+    }
+
+    // Keep the old installation recoverable until the staged copy is in place.
+    if (exists) await rename(destination, backup);
+    await rename(staging, destination);
+    if (exists) await rm(backup, { recursive: true, force: true });
+  } catch (error) {
+    await rm(staging, { recursive: true, force: true });
+    if (await pathExists(backup)) {
+      await rm(destination, { recursive: true, force: true });
+      await rename(backup, destination);
+    }
+    throw error;
+  }
+  const agentLabel = agent === "codex" ? "Codex" : "Claude";
+  deps.log(`Installed RequestShield skill for ${agentLabel} at ${destination}`);
+  deps.log(`Restart ${agentLabel} or start a new task before using the skill.`);
+}
+
+/**
+ * Explicit selection bypasses detection. Automatic setup selects a single
+ * detected agent or asks the user when both agents are present.
+ *
+ * @param {"codex" | "claude" | undefined} requested
+ * @param {{ env?: NodeJS.ProcessEnv, homeDir?: string, detectAgents?: () => Promise<Array<"codex" | "claude">>, selectAgent?: (detected: Array<"codex" | "claude">) => Promise<"codex" | "claude"> }} deps
+ * @returns {Promise<"codex" | "claude">}
+ */
+async function resolveAgent(requested, deps) {
+  // A command-line choice is authoritative and avoids probing the machine.
+  if (requested) return requested;
+
+  const detected = deps.detectAgents
+    ? await deps.detectAgents()
+    : await detectAgents({ env: deps.env, homeDir: deps.homeDir });
+
+  if (detected.length === 1) return detected[0];
+  if (detected.length === 0) {
+    throw new CliError(
+      [
+        "No supported coding agent detected.",
+        "",
+        "Choose one explicitly:",
+        "  requestshield agent setup --codex",
+        "  requestshield agent setup --claude",
+      ].join("\n"),
+      { code: "AGENT_NOT_FOUND", exitCode: 2 },
+    );
+  }
+
+  // Never choose silently when both agents are present. Interactive users get
+  // a prompt; non-interactive callers receive a stable conflict error.
+  const selectAgent = deps.selectAgent ?? promptForAgent;
+  const selected = await selectAgent(detected);
+  if (!detected.includes(selected)) {
+    throw new CliError(`Selected agent is not available: ${selected}`, {
+      code: "INVALID_AGENT",
+      exitCode: 2,
+    });
+  }
+  return selected;
+}
+
+/**
+ * Ask an interactive user which detected agent should receive the skill.
+ *
+ * @returns {Promise<"codex" | "claude">}
+ */
+async function promptForAgent() {
+  if (process.stdin.isTTY !== true || process.stdout.isTTY !== true) {
+    throw new CliError(
+      [
+        "Multiple coding agents detected.",
+        "",
+        "Choose one explicitly:",
+        "  requestshield agent setup --codex",
+        "  requestshield agent setup --claude",
+      ].join("\n"),
+      { code: "INSTALL_CONFLICT", exitCode: 2 },
+    );
+  }
+
+  const prompt = createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+  try {
+    process.stdout.write(
+      "Multiple coding agents detected.\n\n  1. Codex\n  2. Claude\n\n",
+    );
+    while (true) {
+      const answer = (await prompt.question("Select an agent [1-2]: "))
+        .trim()
+        .toLowerCase();
+      if (answer === "1" || answer === "codex") return "codex";
+      if (answer === "2" || answer === "claude") return "claude";
+      process.stdout.write("Enter 1 for Codex or 2 for Claude.\n");
+    }
+  } finally {
+    prompt.close();
+  }
+}
+
+/** @param {string} target */
+async function pathExists(target) {
+  try {
+    await lstat(target);
+    return true;
+  } catch (error) {
+    if (/** @type {NodeJS.ErrnoException} */ (error).code === "ENOENT") return false;
+    throw error;
+  }
+}