@waniwani/cli 0.0.42 → 0.0.45

package/dist/index.js

@@ -762,7 +762,7 @@ var loginCommand = new Command3("login").description("Log in to WaniWani").optio
 
 // src/commands/logout.ts
 import { Command as Command4 } from "commander";
-var logoutCommand = new Command4("logout").description("Log out from WaniWani").action(async (_, command) => {
+var logoutCommand = new Command4("logout").description("Log out from WaniWani").action(async (_options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -790,10 +790,10 @@ var logoutCommand = new Command4("logout").description("Log out from WaniWani").
 import { Command as Command21 } from "commander";
 
 // src/commands/mcp/clone.ts
-import { execSync } from "child_process";
+import { execFileSync as execFileSync2, execSync } from "child_process";
 import { existsSync as existsSync3 } from "fs";
 import { readFile as readFile2 } from "fs/promises";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { Command as Command5 } from "commander";
 import ora2 from "ora";
 
@@ -885,9 +885,132 @@ var api = {
   getBaseUrl: () => config.getApiUrl()
 };
 
+// src/lib/git-auth.ts
+import { execFileSync } from "child_process";
+import { chmodSync, mkdtempSync, rmSync, writeFileSync } from "fs";
+import { tmpdir } from "os";
+import { join as join3 } from "path";
+function getGitHubApiBaseUrl(remoteUrl) {
+  try {
+    const parsed = new URL(remoteUrl);
+    return parsed.hostname === "github.com" || parsed.hostname === "www.github.com" ? "https://api.github.com" : `${parsed.protocol}//${parsed.host}/api/v3`;
+  } catch {
+    return null;
+  }
+}
+function parseCloneUrlAuth(cloneUrl) {
+  try {
+    const parsed = new URL(cloneUrl);
+    const username = decodeURIComponent(parsed.username);
+    const password = decodeURIComponent(parsed.password);
+    if (username && password) {
+      parsed.username = "";
+      parsed.password = "";
+      const remoteUrl = parsed.toString();
+      return {
+        cloneUrl,
+        remoteUrl,
+        credentials: { username, password },
+        githubApiBaseUrl: getGitHubApiBaseUrl(remoteUrl)
+      };
+    }
+  } catch {
+  }
+  return {
+    cloneUrl,
+    remoteUrl: cloneUrl,
+    credentials: null,
+    githubApiBaseUrl: null
+  };
+}
+async function getGitAuthContext(mcpId) {
+  try {
+    const gitAuth = await api.get(
+      `/api/mcp/repositories/${mcpId}/git-auth`
+    );
+    const parsedRemote = new URL(gitAuth.remoteUrl);
+    parsedRemote.username = gitAuth.username;
+    parsedRemote.password = gitAuth.token;
+    const cloneUrl = parsedRemote.toString();
+    return {
+      cloneUrl,
+      remoteUrl: gitAuth.remoteUrl,
+      credentials: {
+        username: gitAuth.username,
+        password: gitAuth.token
+      },
+      githubApiBaseUrl: getGitHubApiBaseUrl(gitAuth.remoteUrl)
+    };
+  } catch (error) {
+    if (error instanceof ApiError && error.statusCode !== 404) {
+      throw error;
+    }
+    const { cloneUrl } = await api.get(
+      `/api/mcp/repositories/${mcpId}/clone-url`
+    );
+    return parseCloneUrlAuth(cloneUrl);
+  }
+}
+function runGitWithCredentials(args, options) {
+  const { cwd, stdio = "ignore", credentials = null } = options ?? {};
+  if (!credentials) {
+    execFileSync("git", args, { cwd, stdio });
+    return;
+  }
+  const dir = mkdtempSync(join3(tmpdir(), "waniwani-askpass-"));
+  const askpassPath = join3(dir, "askpass.sh");
+  try {
+    writeFileSync(
+      askpassPath,
+      `#!/bin/sh
+case "$1" in
+  *sername*) printf '%s\\n' "$WANIWANI_GIT_USERNAME" ;;
+  *assword*) printf '%s\\n' "$WANIWANI_GIT_PASSWORD" ;;
+  *) printf '\\n' ;;
+esac
+`,
+      "utf-8"
+    );
+    chmodSync(askpassPath, 448);
+    execFileSync("git", ["-c", "credential.helper=", ...args], {
+      cwd,
+      stdio,
+      env: {
+        ...process.env,
+        GIT_ASKPASS: askpassPath,
+        GIT_TERMINAL_PROMPT: "0",
+        WANIWANI_GIT_USERNAME: credentials.username,
+        WANIWANI_GIT_PASSWORD: credentials.password
+      }
+    });
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+}
+var REVOKE_TIMEOUT_MS = 5e3;
+async function revokeGitHubInstallationToken(auth2) {
+  if (!auth2.credentials?.password || !auth2.githubApiBaseUrl) return;
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), REVOKE_TIMEOUT_MS);
+  try {
+    await fetch(`${auth2.githubApiBaseUrl}/installation/token`, {
+      method: "DELETE",
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${auth2.credentials.password}`,
+        "X-GitHub-Api-Version": "2022-11-28"
+      },
+      signal: controller.signal
+    });
+  } catch {
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
 // src/commands/mcp/clone.ts
 async function loadParentConfig(cwd) {
-  const parentConfigPath = join3(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
+  const parentConfigPath = join4(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
   if (!existsSync3(parentConfigPath)) {
     return null;
   }
@@ -910,92 +1033,103 @@ function checkGitInstalled() {
     );
   }
 }
-var cloneCommand = new Command5("clone").description("Clone an existing MCP project to a local directory").argument("<name>", "Name of the MCP to clone").argument("[directory]", "Directory to clone into (defaults to MCP name)").action(async (name, directory, command) => {
-  const globalOptions = command.optsWithGlobals();
-  const json = globalOptions.json ?? false;
-  try {
-    const cwd = process.cwd();
-    const dirName = directory ?? name;
-    const projectDir = join3(cwd, dirName);
-    if (existsSync3(projectDir)) {
+var cloneCommand = new Command5("clone").description("Clone an existing MCP project to a local directory").argument("<name>", "Name of the MCP to clone").argument("[directory]", "Directory to clone into (defaults to MCP name)").action(
+  async (name, directory, _options, command) => {
+    const globalOptions = command.optsWithGlobals();
+    const json = globalOptions.json ?? false;
+    try {
+      const cwd = process.cwd();
+      const dirName = directory ?? name;
+      const projectDir = join4(cwd, dirName);
+      if (existsSync3(projectDir)) {
+        if (json) {
+          formatOutput(
+            {
+              success: false,
+              error: `Directory "${dirName}" already exists`
+            },
+            true
+          );
+        } else {
+          console.error(`Error: Directory "${dirName}" already exists`);
+        }
+        process.exit(1);
+      }
+      checkGitInstalled();
+      const spinner = ora2("Fetching MCPs...").start();
+      const mcps = await api.get(
+        "/api/mcp/repositories"
+      );
+      const mcp = mcps.find((m) => m.name === name);
+      if (!mcp) {
+        spinner.fail("MCP not found");
+        throw new McpError(
+          `MCP "${name}" not found. Run 'waniwani mcp list' to see available MCPs.`
+        );
+      }
+      spinner.text = "Cloning repository...";
+      const gitAuth = await getGitAuthContext(mcp.id);
+      try {
+        runGitWithCredentials(["clone", gitAuth.remoteUrl, projectDir], {
+          stdio: "ignore",
+          credentials: gitAuth.credentials
+        });
+      } catch {
+        spinner.fail("Failed to clone repository");
+        throw new CLIError(
+          "Failed to clone repository. Ensure git is configured correctly.",
+          "CLONE_FAILED"
+        );
+      } finally {
+        await revokeGitHubInstallationToken(gitAuth);
+      }
+      execFileSync2(
+        "git",
+        ["remote", "set-url", "origin", mcp.githubCloneUrl],
+        {
+          cwd: projectDir,
+          stdio: "ignore"
+        }
+      );
+      const parentConfig = await loadParentConfig(cwd);
+      await initConfigAt(projectDir, {
+        ...parentConfig,
+        mcpId: mcp.id
+      });
+      spinner.succeed("Repository cloned");
       if (json) {
         formatOutput(
           {
-            success: false,
-            error: `Directory "${dirName}" already exists`
+            success: true,
+            projectDir,
+            mcpId: mcp.id
           },
           true
         );
       } else {
-        console.error(`Error: Directory "${dirName}" already exists`);
+        console.log();
+        formatSuccess(`MCP "${name}" cloned!`, false);
+        console.log();
+        console.log("Next steps:");
+        console.log(`  cd ${dirName}`);
+        console.log("  waniwani mcp preview      # Start developing");
       }
+    } catch (error) {
+      handleError(error, json);
       process.exit(1);
     }
-    checkGitInstalled();
-    const spinner = ora2("Fetching MCPs...").start();
-    const mcps = await api.get(
-      "/api/mcp/repositories"
-    );
-    const mcp = mcps.find((m) => m.name === name);
-    if (!mcp) {
-      spinner.fail("MCP not found");
-      throw new McpError(
-        `MCP "${name}" not found. Run 'waniwani mcp list' to see available MCPs.`
-      );
-    }
-    spinner.text = "Cloning repository...";
-    const { cloneUrl } = await api.get(
-      `/api/mcp/repositories/${mcp.id}/clone-url`
-    );
-    try {
-      execSync(`git clone "${cloneUrl}" "${projectDir}"`, {
-        stdio: "ignore"
-      });
-    } catch {
-      spinner.fail("Failed to clone repository");
-      throw new CLIError(
-        "Failed to clone repository. Ensure git is configured correctly.",
-        "CLONE_FAILED"
-      );
-    }
-    const parentConfig = await loadParentConfig(cwd);
-    await initConfigAt(projectDir, {
-      ...parentConfig,
-      mcpId: mcp.id
-    });
-    spinner.succeed("Repository cloned");
-    if (json) {
-      formatOutput(
-        {
-          success: true,
-          projectDir,
-          mcpId: mcp.id
-        },
-        true
-      );
-    } else {
-      console.log();
-      formatSuccess(`MCP "${name}" cloned!`, false);
-      console.log();
-      console.log("Next steps:");
-      console.log(`  cd ${dirName}`);
-      console.log("  waniwani mcp preview      # Start developing");
-    }
-  } catch (error) {
-    handleError(error, json);
-    process.exit(1);
   }
-});
+);
 
 // src/commands/mcp/create.ts
-import { execSync as execSync2 } from "child_process";
+import { execFileSync as execFileSync3, execSync as execSync2 } from "child_process";
 import { existsSync as existsSync4 } from "fs";
 import { readFile as readFile3 } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { Command as Command6 } from "commander";
 import ora3 from "ora";
 async function loadParentConfig2(cwd) {
-  const parentConfigPath = join4(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
+  const parentConfigPath = join5(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
   if (!existsSync4(parentConfigPath)) {
     return null;
   }
@@ -1023,7 +1157,7 @@ var createCommand = new Command6("create").description("Create a new MCP project
   const json = globalOptions.json ?? false;
   try {
     const cwd = process.cwd();
-    const projectDir = join4(cwd, name);
+    const projectDir = join5(cwd, name);
     if (existsSync4(projectDir)) {
       if (json) {
         formatOutput(
@@ -1044,12 +1178,11 @@ var createCommand = new Command6("create").description("Create a new MCP project
       name
     });
     spinner.text = "Cloning repository...";
-    const { cloneUrl } = await api.get(
-      `/api/mcp/repositories/${result.id}/clone-url`
-    );
+    const gitAuth = await getGitAuthContext(result.id);
     try {
-      execSync2(`git clone "${cloneUrl}" "${projectDir}"`, {
-        stdio: "ignore"
+      runGitWithCredentials(["clone", gitAuth.remoteUrl, projectDir], {
+        stdio: "ignore",
+        credentials: gitAuth.credentials
       });
     } catch {
       spinner.fail("Failed to clone repository");
@@ -1057,7 +1190,17 @@ var createCommand = new Command6("create").description("Create a new MCP project
         `Failed to clone repository. Ensure git is configured correctly.`,
         "CLONE_FAILED"
       );
+    } finally {
+      await revokeGitHubInstallationToken(gitAuth);
     }
+    execFileSync3(
+      "git",
+      ["remote", "set-url", "origin", result.githubCloneUrl],
+      {
+        cwd: projectDir,
+        stdio: "ignore"
+      }
+    );
     const parentConfig = await loadParentConfig2(cwd);
     await initConfigAt(projectDir, {
       ...parentConfig,
@@ -1340,7 +1483,7 @@ var fileCommand = new Command11("file").description("File operations in MCP sand
 import chalk6 from "chalk";
 import { Command as Command12 } from "commander";
 import ora8 from "ora";
-var listCommand2 = new Command12("list").description("List all MCPs in your organization").action(async (_, command) => {
+var listCommand2 = new Command12("list").description("List all MCPs in your organization").action(async (_options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -1544,24 +1687,44 @@ import { watch } from "chokidar";
 import { Command as Command14 } from "commander";
 import ora10 from "ora";
 
+// src/lib/async.ts
+async function withTimeout(promise, timeoutMs, options) {
+  let timer;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((resolve) => {
+        timer = setTimeout(() => {
+          options?.onTimeout?.();
+          resolve(null);
+        }, timeoutMs);
+      })
+    ]);
+  } finally {
+    if (timer) {
+      clearTimeout(timer);
+    }
+  }
+}
+
 // src/lib/sync.ts
 import { existsSync as existsSync5 } from "fs";
 import { mkdir as mkdir2, readdir, readFile as readFile5, stat, writeFile as writeFile3 } from "fs/promises";
-import { dirname, join as join5, relative } from "path";
+import { dirname, join as join6, relative } from "path";
 import ignore from "ignore";
 var PROJECT_DIR = ".waniwani";
 async function findProjectRoot(startDir) {
   let current = startDir;
   const root = dirname(current);
   while (current !== root) {
-    if (existsSync5(join5(current, PROJECT_DIR))) {
+    if (existsSync5(join6(current, PROJECT_DIR))) {
       return current;
     }
     const parent = dirname(current);
     if (parent === current) break;
     current = parent;
   }
-  if (existsSync5(join5(current, PROJECT_DIR))) {
+  if (existsSync5(join6(current, PROJECT_DIR))) {
     return current;
   }
   return null;
@@ -1585,7 +1748,7 @@ var DEFAULT_IGNORE_PATTERNS = [
 async function loadIgnorePatterns(projectRoot) {
   const ig = ignore();
   ig.add(DEFAULT_IGNORE_PATTERNS);
-  const gitignorePath = join5(projectRoot, ".gitignore");
+  const gitignorePath = join6(projectRoot, ".gitignore");
   if (existsSync5(gitignorePath)) {
     try {
       const content = await readFile5(gitignorePath, "utf-8");
@@ -1601,7 +1764,7 @@ async function collectFiles(projectRoot) {
   async function walk(dir) {
     const entries = await readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join5(dir, entry.name);
+      const fullPath = join6(dir, entry.name);
       const relativePath = relative(projectRoot, fullPath);
       if (ig.ignores(relativePath)) {
         continue;
@@ -1631,7 +1794,7 @@ async function pullFilesFromGithub(mcpId, targetDir) {
   );
   const writtenFiles = [];
   for (const file of result.files) {
-    const localPath = join5(targetDir, file.path);
+    const localPath = join6(targetDir, file.path);
     const dir = dirname(localPath);
     await mkdir2(dir, { recursive: true });
     if (file.encoding === "base64") {
@@ -1644,7 +1807,7 @@ async function pullFilesFromGithub(mcpId, targetDir) {
   return { count: writtenFiles.length, files: writtenFiles };
 }
 async function collectSingleFile(projectRoot, filePath) {
-  const fullPath = join5(projectRoot, filePath);
+  const fullPath = join6(projectRoot, filePath);
   const relativePath = relative(projectRoot, fullPath);
   if (!existsSync5(fullPath)) {
     return null;
@@ -1667,6 +1830,8 @@ async function collectSingleFile(projectRoot, filePath) {
 }
 
 // src/commands/mcp/preview.ts
+var SHUTDOWN_MAX_WAIT_MS = 3e3;
+var SHUTDOWN_STEP_TIMEOUT_MS = 1200;
 var previewCommand = new Command14("preview").description("Start live development with sandbox and file watching").option("--mcp-id <id>", "Specific MCP ID").option("--no-watch", "Skip file watching").option("--no-logs", "Don't stream logs to terminal").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
@@ -1767,11 +1932,51 @@ var previewCommand = new Command14("preview").description("Start live developmen
         const relativePath = filePath.replace(`${projectRoot}/`, "");
         console.log(`  Deleted: ${relativePath}`);
       });
-      process.on("SIGINT", async () => {
+      const stopSessionBestEffort = async () => {
+        await withTimeout(
+          api.post(`/api/mcp/sessions/${sessionId}/server`, { action: "stop" }).catch(() => void 0),
+          SHUTDOWN_STEP_TIMEOUT_MS
+        );
+        await withTimeout(
+          api.delete(`/api/mcp/sessions/${sessionId}`).catch(() => void 0),
+          SHUTDOWN_STEP_TIMEOUT_MS
+        );
+        await withTimeout(
+          config.setSessionId(null).catch(() => void 0),
+          SHUTDOWN_STEP_TIMEOUT_MS
+        );
+      };
+      let shuttingDown = false;
+      const gracefulShutdown = async () => {
+        if (shuttingDown) return;
+        shuttingDown = true;
         console.log();
         console.log("Stopping development environment...");
-        await watcher.close();
-        process.exit(0);
+        try {
+          await withTimeout(
+            (async () => {
+              await withTimeout(
+                watcher.close().catch(() => void 0),
+                SHUTDOWN_STEP_TIMEOUT_MS
+              );
+              await stopSessionBestEffort();
+            })(),
+            SHUTDOWN_MAX_WAIT_MS,
+            {
+              onTimeout: () => {
+                console.log("Shutdown timed out, forcing exit.");
+              }
+            }
+          );
+        } finally {
+          process.exit(0);
+        }
+      };
+      process.once("SIGINT", () => {
+        void gracefulShutdown();
+      });
+      process.once("SIGTERM", () => {
+        void gracefulShutdown();
       });
       await new Promise(() => {
       });
@@ -1783,6 +1988,7 @@ var previewCommand = new Command14("preview").description("Start live developmen
 });
 
 // src/commands/mcp/publish.ts
+import { execFileSync as execFileSync4 } from "child_process";
 import { input } from "@inquirer/prompts";
 import { Command as Command15 } from "commander";
 import ora11 from "ora";
@@ -1798,6 +2004,29 @@ var publishCommand = new Command15("publish").description("Push local files to G
         "NOT_IN_PROJECT"
       );
     }
+    try {
+      execFileSync4("git", ["rev-parse", "--is-inside-work-tree"], {
+        cwd: projectRoot,
+        stdio: "ignore"
+      });
+    } catch {
+      throw new CLIError(
+        "Not a git repository. Run 'waniwani mcp create <name>' or 'waniwani mcp clone <name>' to set up properly.",
+        "NOT_GIT_REPO"
+      );
+    }
+    const status = execFileSync4("git", ["status", "--porcelain"], {
+      cwd: projectRoot,
+      encoding: "utf-8"
+    }).trim();
+    if (!status) {
+      if (json) {
+        formatOutput({ success: true, message: "Nothing to publish" }, true);
+      } else {
+        console.log("Nothing to publish \u2014 no changes detected.");
+      }
+      return;
+    }
     let message = options.message;
     if (!message) {
       message = await input({
@@ -1805,20 +2034,31 @@ var publishCommand = new Command15("publish").description("Push local files to G
         validate: (value) => value.trim() ? true : "Commit message is required"
       });
     }
-    const spinner = ora11("Collecting files...").start();
-    const files = await collectFiles(projectRoot);
-    if (files.length === 0) {
-      spinner.fail("No files to deploy");
-      return;
-    }
-    spinner.text = `Pushing ${files.length} files to GitHub...`;
-    const result = await api.post(
-      `/api/mcp/repositories/${mcpId}/deploy`,
-      { files, message }
-    );
-    spinner.succeed(`Pushed to GitHub (${result.commitSha.slice(0, 7)})`);
+    const spinner = ora11("Publishing...").start();
+    const gitAuth = await getGitAuthContext(mcpId);
+    spinner.text = "Committing changes...";
+    execFileSync4("git", ["add", "-A"], { cwd: projectRoot, stdio: "ignore" });
+    execFileSync4("git", ["commit", "-m", message], {
+      cwd: projectRoot,
+      stdio: "ignore"
+    });
+    spinner.text = "Pushing to GitHub...";
+    try {
+      runGitWithCredentials(["push", gitAuth.remoteUrl, "HEAD"], {
+        cwd: projectRoot,
+        stdio: "ignore",
+        credentials: gitAuth.credentials
+      });
+    } finally {
+      await revokeGitHubInstallationToken(gitAuth);
+    }
+    const commitSha = execFileSync4("git", ["rev-parse", "HEAD"], {
+      cwd: projectRoot,
+      encoding: "utf-8"
+    }).trim();
+    spinner.succeed(`Pushed to GitHub (${commitSha.slice(0, 7)})`);
     if (json) {
-      formatOutput(result, true);
+      formatOutput({ commitSha, message }, true);
     } else {
       console.log();
       formatSuccess("Files pushed to GitHub!", false);
@@ -2082,7 +2322,7 @@ import { Command as Command24 } from "commander";
 import chalk10 from "chalk";
 import { Command as Command22 } from "commander";
 import ora17 from "ora";
-var listCommand3 = new Command22("list").description("List your organizations").action(async (_, command) => {
+var listCommand3 = new Command22("list").description("List your organizations").action(async (_options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -2134,7 +2374,7 @@ var listCommand3 = new Command22("list").description("List your organizations").
 // src/commands/org/switch.ts
 import { Command as Command23 } from "commander";
 import ora18 from "ora";
-var switchCommand = new Command23("switch").description("Switch to a different organization").argument("<name>", "Name or slug of the organization to switch to").action(async (name, _, command) => {
+var switchCommand = new Command23("switch").description("Switch to a different organization").argument("<name>", "Name or slug of the organization to switch to").action(async (name, _options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {