@waniwani/cli 0.0.23 → 0.0.24

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command as Command20 } from "commander";
+import { Command as Command24 } from "commander";
 
 // src/commands/init.ts
 import { existsSync } from "fs";
@@ -687,7 +687,7 @@ var logoutCommand = new Command3("logout").description("Log out from WaniWani").
 });
 
 // src/commands/mcp/index.ts
-import { Command as Command15 } from "commander";
+import { Command as Command19 } from "commander";
 
 // src/commands/mcp/create.ts
 import { Command as Command4 } from "commander";
@@ -730,11 +730,31 @@ async function request(method, path, options) {
   if (response.status === 204) {
     return void 0;
   }
-  const data = await response.json();
+  let data;
+  let rawBody;
+  try {
+    rawBody = await response.text();
+    data = JSON.parse(rawBody);
+  } catch {
+    throw new ApiError(
+      rawBody || `Request failed with status ${response.status}`,
+      "API_ERROR",
+      response.status,
+      { statusText: response.statusText }
+    );
+  }
   if (!response.ok || data.error) {
-    const error = data.error || {
-      code: "API_ERROR",
-      message: `Request failed with status ${response.status}`
+    const errorMessage = data.error?.message || data.message || data.error || rawBody || `Request failed with status ${response.status}`;
+    const errorCode = data.error?.code || data.code || "API_ERROR";
+    const errorDetails = {
+      ...data.error?.details,
+      statusText: response.statusText,
+      ...data.error ? {} : { rawResponse: data }
+    };
+    const error = {
+      code: errorCode,
+      message: errorMessage,
+      details: errorDetails
     };
     if (response.status === 401) {
       const refreshed = await auth.tryRefreshToken();
@@ -794,10 +814,41 @@ var createCommand = new Command4("create").description("Create a new MCP sandbox
   }
 });
 
-// src/commands/mcp/deploy.ts
+// src/commands/mcp/delete.ts
 import { Command as Command5 } from "commander";
 import ora3 from "ora";
-var deployCommand = new Command5("deploy").description("Deploy MCP server to GitHub + Vercel from sandbox").option("--repo <name>", "GitHub repository name").option("--org <name>", "GitHub organization").option("--private", "Create private repository").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var deleteCommand = new Command5("delete").description("Delete the MCP sandbox").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    let mcpId = options.mcpId;
+    if (!mcpId) {
+      mcpId = await config.getMcpId();
+      if (!mcpId) {
+        throw new McpError("No active MCP. Use --mcp-id to specify one.");
+      }
+    }
+    const spinner = ora3("Deleting MCP sandbox...").start();
+    await api.delete(`/api/mcp/sandboxes/${mcpId}`);
+    spinner.succeed("MCP sandbox deleted");
+    if (await config.getMcpId() === mcpId) {
+      await config.setMcpId(null);
+    }
+    if (json) {
+      formatOutput({ deleted: mcpId }, true);
+    } else {
+      formatSuccess("MCP sandbox deleted and cleaned up.", false);
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/mcp/deploy.ts
+import { Command as Command6 } from "commander";
+import ora4 from "ora";
+var deployCommand = new Command6("deploy").description("Deploy MCP server to GitHub + Vercel from sandbox").option("--repo <name>", "GitHub repository name").option("--org <name>", "GitHub organization").option("--private", "Create private repository").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -810,7 +861,7 @@ var deployCommand = new Command5("deploy").description("Deploy MCP server to Git
         );
       }
     }
-    const spinner = ora3("Deploying to GitHub...").start();
+    const spinner = ora4("Deploying to GitHub...").start();
     const result = await api.post(
       `/api/admin/mcps/${mcpId}/deploy`,
       {
@@ -841,71 +892,14 @@ var deployCommand = new Command5("deploy").description("Deploy MCP server to Git
   }
 });
 
-// src/commands/mcp/list.ts
-import chalk4 from "chalk";
-import { Command as Command6 } from "commander";
-import ora4 from "ora";
-var listCommand = new Command6("list").description("List all MCPs in your organization").option("--all", "Include stopped/expired MCPs").action(async (options, command) => {
-  const globalOptions = command.optsWithGlobals();
-  const json = globalOptions.json ?? false;
-  try {
-    const spinner = ora4("Fetching MCPs...").start();
-    const mcps = await api.get(
-      `/api/mcp/sandboxes${options.all ? "?all=true" : ""}`
-    );
-    spinner.stop();
-    const activeMcpId = await config.getMcpId();
-    if (json) {
-      formatOutput(
-        {
-          mcps: mcps.map((m) => ({
-            ...m,
-            isActive: m.id === activeMcpId
-          })),
-          activeMcpId
-        },
-        true
-      );
-    } else {
-      if (mcps.length === 0) {
-        console.log("No MCPs found.");
-        console.log("\nCreate a new MCP sandbox: waniwani mcp create <name>");
-        return;
-      }
-      console.log(chalk4.bold("\nMCPs:\n"));
-      const rows = mcps.map((m) => {
-        const isActive = m.id === activeMcpId;
-        const statusColor = m.status === "active" ? chalk4.green : m.status === "stopped" ? chalk4.red : chalk4.yellow;
-        return [
-          isActive ? chalk4.cyan(`* ${m.id.slice(0, 8)}`) : `  ${m.id.slice(0, 8)}`,
-          m.name,
-          statusColor(m.status),
-          m.previewUrl,
-          m.createdAt ? new Date(m.createdAt).toLocaleString() : "N/A"
-        ];
-      });
-      formatTable(
-        ["ID", "Name", "Status", "Preview URL", "Created"],
-        rows,
-        false
-      );
-      console.log();
-      if (activeMcpId) {
-        console.log(`Active MCP: ${chalk4.cyan(activeMcpId.slice(0, 8))}`);
-      }
-      console.log("\nSelect an MCP: waniwani mcp use <name>");
-    }
-  } catch (error) {
-    handleError(error, json);
-    process.exit(1);
-  }
-});
+// src/commands/mcp/file/index.ts
+import { Command as Command10 } from "commander";
 
-// src/commands/mcp/list-files.ts
-import chalk5 from "chalk";
+// src/commands/mcp/file/list.ts
+import chalk4 from "chalk";
 import { Command as Command7 } from "commander";
 import ora5 from "ora";
-var listFilesCommand = new Command7("list-files").description("List files in the MCP sandbox").argument("[path]", "Directory path (defaults to /app)", "/app").option("--mcp-id <id>", "Specific MCP ID").action(async (path, options, command) => {
+var listCommand = new Command7("list").description("List files in the MCP sandbox").argument("[path]", "Directory path (defaults to /app)", "/app").option("--mcp-id <id>", "Specific MCP ID").action(async (path, options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -926,15 +920,15 @@ var listFilesCommand = new Command7("list-files").description("List files in the
     if (json) {
       formatOutput(result, true);
     } else {
-      console.log(chalk5.bold(`
+      console.log(chalk4.bold(`
 Directory: ${result.path}
 `));
       if (result.entries.length === 0) {
         console.log("  (empty)");
       } else {
         const rows = result.entries.map((entry) => {
-          const name = entry.type === "directory" ? chalk5.blue(`${entry.name}/`) : entry.name;
-          const size = entry.type === "directory" ? chalk5.gray("<dir>") : formatSize(entry.size);
+          const name = entry.type === "directory" ? chalk4.blue(`${entry.name}/`) : entry.name;
+          const size = entry.type === "directory" ? chalk4.gray("<dir>") : formatSize(entry.size);
           return [name, size];
         });
         formatTable(["Name", "Size"], rows, false);
@@ -953,11 +947,11 @@ function formatSize(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
 
-// src/commands/mcp/read-file.ts
+// src/commands/mcp/file/read.ts
 import { writeFile as writeFile4 } from "fs/promises";
 import { Command as Command8 } from "commander";
 import ora6 from "ora";
-var readFileCommand = new Command8("read-file").description("Read a file from the MCP sandbox").argument("<path>", "Path in sandbox (e.g., /app/src/index.ts)").option("--mcp-id <id>", "Specific MCP ID").option("--output <file>", "Write to local file instead of stdout").option("--base64", "Output as base64 (for binary files)").action(async (path, options, command) => {
+var readCommand = new Command8("read").description("Read a file from the MCP sandbox").argument("<path>", "Path in sandbox (e.g., /app/src/index.ts)").option("--mcp-id <id>", "Specific MCP ID").option("--output <file>", "Write to local file instead of stdout").option("--base64", "Output as base64 (for binary files)").action(async (path, options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -1001,11 +995,281 @@ var readFileCommand = new Command8("read-file").description("Read a file from th
   }
 });
 
-// src/commands/mcp/run-command.ts
-import chalk6 from "chalk";
+// src/commands/mcp/file/write.ts
+import { readFile as readFile3 } from "fs/promises";
 import { Command as Command9 } from "commander";
 import ora7 from "ora";
-var runCommandCommand = new Command9("run-command").description("Run a command in the MCP sandbox").argument("<command>", "Command to run").argument("[args...]", "Command arguments").option("--mcp-id <id>", "Specific MCP ID").option("--cwd <path>", "Working directory").option(
+var writeCommand = new Command9("write").description("Write a file to the MCP sandbox").argument("<path>", "Path in sandbox (e.g., /app/src/index.ts)").option("--mcp-id <id>", "Specific MCP ID").option("--content <content>", "Content to write").option("--file <localFile>", "Local file to upload").option("--base64", "Treat content as base64 encoded").action(async (path, options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    let mcpId = options.mcpId;
+    if (!mcpId) {
+      mcpId = await config.getMcpId();
+      if (!mcpId) {
+        throw new McpError(
+          "No active MCP. Run 'waniwani mcp create <name>' or 'waniwani mcp use <name>'."
+        );
+      }
+    }
+    let content;
+    let encoding = "utf8";
+    if (options.content) {
+      content = options.content;
+      if (options.base64) {
+        encoding = "base64";
+      }
+    } else if (options.file) {
+      const fileBuffer = await readFile3(options.file);
+      if (options.base64) {
+        content = fileBuffer.toString("base64");
+        encoding = "base64";
+      } else {
+        content = fileBuffer.toString("utf8");
+      }
+    } else {
+      throw new CLIError(
+        "Either --content or --file is required",
+        "MISSING_CONTENT"
+      );
+    }
+    const spinner = ora7(`Writing ${path}...`).start();
+    const result = await api.post(
+      `/api/mcp/sandboxes/${mcpId}/files`,
+      {
+        files: [{ path, content, encoding }]
+      }
+    );
+    spinner.succeed(`Wrote ${path}`);
+    if (json) {
+      formatOutput(result, true);
+    } else {
+      formatSuccess(`File written: ${path}`, false);
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/mcp/file/index.ts
+var fileCommand = new Command10("file").description("File operations in MCP sandbox").addCommand(readCommand).addCommand(writeCommand).addCommand(listCommand);
+
+// src/commands/mcp/list.ts
+import chalk5 from "chalk";
+import { Command as Command11 } from "commander";
+import ora8 from "ora";
+var listCommand2 = new Command11("list").description("List all MCPs in your organization").option("--all", "Include stopped/expired MCPs").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const spinner = ora8("Fetching MCPs...").start();
+    const mcps = await api.get(
+      `/api/mcp/sandboxes${options.all ? "?all=true" : ""}`
+    );
+    spinner.stop();
+    const activeMcpId = await config.getMcpId();
+    if (json) {
+      formatOutput(
+        {
+          mcps: mcps.map((m) => ({
+            ...m,
+            isActive: m.id === activeMcpId
+          })),
+          activeMcpId
+        },
+        true
+      );
+    } else {
+      if (mcps.length === 0) {
+        console.log("No MCPs found.");
+        console.log("\nCreate a new MCP sandbox: waniwani mcp create <name>");
+        return;
+      }
+      console.log(chalk5.bold("\nMCPs:\n"));
+      const rows = mcps.map((m) => {
+        const isActive = m.id === activeMcpId;
+        const statusColor = m.status === "active" ? chalk5.green : m.status === "stopped" ? chalk5.red : chalk5.yellow;
+        return [
+          isActive ? chalk5.cyan(`* ${m.id.slice(0, 8)}`) : `  ${m.id.slice(0, 8)}`,
+          m.name,
+          statusColor(m.status),
+          m.previewUrl,
+          m.createdAt ? new Date(m.createdAt).toLocaleString() : "N/A"
+        ];
+      });
+      formatTable(
+        ["ID", "Name", "Status", "Preview URL", "Created"],
+        rows,
+        false
+      );
+      console.log();
+      if (activeMcpId) {
+        console.log(`Active MCP: ${chalk5.cyan(activeMcpId.slice(0, 8))}`);
+      }
+      console.log("\nSelect an MCP: waniwani mcp use <name>");
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/mcp/logs.ts
+import chalk6 from "chalk";
+import { Command as Command12 } from "commander";
+import ora9 from "ora";
+var logsCommand = new Command12("logs").description("Stream logs from the MCP server").argument("[cmdId]", "Command ID (defaults to running server)").option("--mcp-id <id>", "Specific MCP ID").option("-f, --follow", "Keep streaming logs (default)", true).option("--no-follow", "Fetch logs and exit").action(async (cmdIdArg, options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  let reader;
+  const cleanup = () => {
+    if (reader) {
+      reader.cancel().catch(() => {
+      });
+    }
+    process.exit(0);
+  };
+  process.on("SIGINT", cleanup);
+  process.on("SIGTERM", cleanup);
+  try {
+    let mcpId = options.mcpId;
+    if (!mcpId) {
+      mcpId = await config.getMcpId();
+      if (!mcpId) {
+        throw new McpError(
+          "No active MCP. Run 'waniwani mcp create <name>' or 'waniwani mcp use <name>'."
+        );
+      }
+    }
+    const token = await auth.getAccessToken();
+    if (!token) {
+      throw new AuthError(
+        "Not logged in. Run 'waniwani login' to authenticate."
+      );
+    }
+    let cmdId = cmdIdArg;
+    if (!cmdId) {
+      const spinner = ora9("Getting server status...").start();
+      const status = await api.post(
+        `/api/mcp/sandboxes/${mcpId}/server`,
+        { action: "status" }
+      );
+      spinner.stop();
+      if (!status.running || !status.cmdId) {
+        throw new McpError(
+          "No server is running. Run 'waniwani mcp start' first."
+        );
+      }
+      cmdId = status.cmdId;
+    }
+    const baseUrl = await api.getBaseUrl();
+    const streamParam = options.follow ? "?stream=true" : "";
+    const url = `${baseUrl}/api/mcp/sandboxes/${mcpId}/commands/${cmdId}${streamParam}`;
+    if (!json) {
+      console.log(chalk6.gray(`Streaming logs for command ${cmdId}...`));
+      console.log(chalk6.gray("Press Ctrl+C to stop\n"));
+    }
+    const response = await fetch(url, {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        Accept: options.follow ? "text/event-stream" : "application/json"
+      }
+    });
+    if (!response.ok) {
+      const error = await response.json().catch(() => ({ message: response.statusText }));
+      throw new Error(
+        error.message || `Request failed with status ${response.status}`
+      );
+    }
+    if (!options.follow) {
+      const data = await response.json();
+      if (json) {
+        formatOutput(data, true);
+      } else {
+        if (data.stdout) {
+          process.stdout.write(data.stdout);
+        }
+        if (data.stderr) {
+          process.stderr.write(chalk6.red(data.stderr));
+        }
+        if (data.exitCode !== void 0) {
+          console.log(chalk6.gray(`
+Exit code: ${data.exitCode}`));
+        }
+      }
+      return;
+    }
+    reader = response.body?.getReader();
+    if (!reader) {
+      throw new Error("No response body");
+    }
+    const decoder = new TextDecoder();
+    let buffer = "";
+    const collectedLogs = [];
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() || "";
+      for (const line of lines) {
+        if (line.startsWith("event: ")) {
+          continue;
+        }
+        if (line.startsWith("data: ")) {
+          const data = line.slice(6);
+          if (!data || data === "[DONE]") continue;
+          try {
+            const event = JSON.parse(data);
+            collectedLogs.push(event);
+            if (json) {
+              continue;
+            }
+            if (event.cmdId) {
+              continue;
+            }
+            if (event.stream && event.data !== void 0) {
+              if (event.stream === "stdout") {
+                process.stdout.write(event.data);
+              } else if (event.stream === "stderr") {
+                process.stderr.write(chalk6.red(event.data));
+              }
+            }
+            if (event.exitCode !== void 0) {
+              const exitColor = event.exitCode === 0 ? chalk6.green : chalk6.red;
+              console.log(
+                exitColor(`
+Process exited with code ${event.exitCode}`)
+              );
+            }
+            if (event.error) {
+              console.error(chalk6.red(`
+Error: ${event.error}`));
+            }
+          } catch {
+          }
+        }
+      }
+    }
+    if (json) {
+      formatOutput(collectedLogs, true);
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  } finally {
+    process.off("SIGINT", cleanup);
+    process.off("SIGTERM", cleanup);
+  }
+});
+
+// src/commands/mcp/run-command.ts
+import chalk7 from "chalk";
+import { Command as Command13 } from "commander";
+import ora10 from "ora";
+var runCommandCommand = new Command13("run-command").description("Run a command in the MCP sandbox").argument("<command>", "Command to run").argument("[args...]", "Command arguments").option("--mcp-id <id>", "Specific MCP ID").option("--cwd <path>", "Working directory").option(
   "--timeout <ms>",
   "Command timeout in milliseconds (default: 30000, max: 300000)"
 ).action(async (cmd, args, options, command) => {
@@ -1022,7 +1286,7 @@ var runCommandCommand = new Command9("run-command").description("Run a command i
       }
     }
     const timeout = options.timeout ? Number.parseInt(options.timeout, 10) : void 0;
-    const spinner = ora7(`Running: ${cmd} ${args.join(" ")}`.trim()).start();
+    const spinner = ora10(`Running: ${cmd} ${args.join(" ")}`.trim()).start();
     const result = await api.post(
       `/api/mcp/sandboxes/${mcpId}/command`,
       {
@@ -1037,7 +1301,7 @@ var runCommandCommand = new Command9("run-command").description("Run a command i
       formatOutput(result, true);
     } else {
       const cmdLine = [cmd, ...args].join(" ");
-      console.log(chalk6.gray(`$ ${cmdLine}`));
+      console.log(chalk7.gray(`$ ${cmdLine}`));
       console.log();
       if (result.stdout) {
         process.stdout.write(result.stdout);
@@ -1046,16 +1310,16 @@ var runCommandCommand = new Command9("run-command").description("Run a command i
         }
       }
       if (result.stderr) {
-        process.stderr.write(chalk6.red(result.stderr));
+        process.stderr.write(chalk7.red(result.stderr));
         if (!result.stderr.endsWith("\n")) {
           process.stderr.write("\n");
         }
       }
       console.log();
-      const exitColor = result.exitCode === 0 ? chalk6.green : chalk6.red;
+      const exitColor = result.exitCode === 0 ? chalk7.green : chalk7.red;
       console.log(
         exitColor(`Exit code: ${result.exitCode}`),
-        chalk6.gray(`(${(result.duration / 1e3).toFixed(2)}s)`)
+        chalk7.gray(`(${(result.duration / 1e3).toFixed(2)}s)`)
       );
     }
     if (result.exitCode !== 0) {
@@ -1067,11 +1331,56 @@ var runCommandCommand = new Command9("run-command").description("Run a command i
   }
 });
 
+// src/commands/mcp/start.ts
+import chalk8 from "chalk";
+import { Command as Command14 } from "commander";
+import ora11 from "ora";
+var startCommand = new Command14("start").description("Start the MCP server (npm run dev)").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    let mcpId = options.mcpId;
+    if (!mcpId) {
+      mcpId = await config.getMcpId();
+      if (!mcpId) {
+        throw new McpError(
+          "No active MCP. Run 'waniwani mcp create <name>' or 'waniwani mcp use <name>'."
+        );
+      }
+    }
+    const spinner = ora11("Starting MCP server...").start();
+    const result = await api.post(
+      `/api/mcp/sandboxes/${mcpId}/server`,
+      { action: "start" }
+    );
+    spinner.succeed("MCP server started");
+    if (json) {
+      formatOutput(result, true);
+    } else {
+      console.log();
+      formatList(
+        [
+          { label: "Command ID", value: result.cmdId },
+          { label: "Preview URL", value: chalk8.cyan(result.previewUrl) }
+        ],
+        false
+      );
+      console.log();
+      console.log(
+        chalk8.gray("Run 'waniwani mcp logs' to stream server output")
+      );
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
 // src/commands/mcp/status.ts
-import chalk7 from "chalk";
-import { Command as Command10 } from "commander";
-import ora8 from "ora";
-var statusCommand = new Command10("status").description("Show current MCP sandbox status").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+import chalk9 from "chalk";
+import { Command as Command15 } from "commander";
+import ora12 from "ora";
+var statusCommand = new Command15("status").description("Show current MCP sandbox status").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -1084,13 +1393,24 @@ var statusCommand = new Command10("status").description("Show current MCP sandbo
         );
       }
     }
-    const spinner = ora8("Fetching MCP status...").start();
-    const result = await api.get(`/api/mcp/sandboxes/${mcpId}`);
+    const spinner = ora12("Fetching MCP status...").start();
+    const [result, serverStatus] = await Promise.all([
+      api.get(`/api/mcp/sandboxes/${mcpId}`),
+      api.post(`/api/mcp/sandboxes/${mcpId}/server`, {
+        action: "status"
+      }).catch(() => ({
+        running: false,
+        cmdId: void 0,
+        previewUrl: void 0
+      }))
+    ]);
     spinner.stop();
     if (json) {
-      formatOutput(result, true);
+      formatOutput({ ...result, server: serverStatus }, true);
     } else {
-      const statusColor = result.status === "active" ? chalk7.green : chalk7.red;
+      const statusColor = result.status === "active" ? chalk9.green : chalk9.red;
+      const serverRunning = serverStatus.running;
+      const serverStatusColor = serverRunning ? chalk9.green : chalk9.yellow;
       formatList(
         [
           { label: "MCP ID", value: result.id },
@@ -1098,6 +1418,11 @@ var statusCommand = new Command10("status").description("Show current MCP sandbo
           { label: "Status", value: statusColor(result.status) },
           { label: "Sandbox ID", value: result.sandboxId },
           { label: "Preview URL", value: result.previewUrl },
+          {
+            label: "Server",
+            value: serverStatusColor(serverRunning ? "Running" : "Stopped")
+          },
+          ...serverStatus.cmdId ? [{ label: "Server Cmd ID", value: serverStatus.cmdId }] : [],
           { label: "Created", value: result.createdAt },
           { label: "Expires", value: result.expiresAt ?? "N/A" }
         ],
@@ -1111,9 +1436,9 @@ var statusCommand = new Command10("status").description("Show current MCP sandbo
 });
 
 // src/commands/mcp/stop.ts
-import { Command as Command11 } from "commander";
-import ora9 from "ora";
-var stopCommand = new Command11("stop").description("Stop and clean up the MCP sandbox").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+import { Command as Command16 } from "commander";
+import ora13 from "ora";
+var stopCommand = new Command16("stop").description("Stop the MCP server process").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -1121,19 +1446,25 @@ var stopCommand = new Command11("stop").description("Stop and clean up the MCP s
     if (!mcpId) {
       mcpId = await config.getMcpId();
       if (!mcpId) {
-        throw new McpError("No active MCP. Use --mcp-id to specify one.");
+        throw new McpError(
+          "No active MCP. Run 'waniwani mcp create <name>' or 'waniwani mcp use <name>'."
+        );
       }
     }
-    const spinner = ora9("Stopping MCP sandbox...").start();
-    await api.delete(`/api/mcp/sandboxes/${mcpId}`);
-    spinner.succeed("MCP sandbox stopped");
-    if (await config.getMcpId() === mcpId) {
-      await config.setMcpId(null);
+    const spinner = ora13("Stopping MCP server...").start();
+    const result = await api.post(
+      `/api/mcp/sandboxes/${mcpId}/server`,
+      { action: "stop" }
+    );
+    if (result.stopped) {
+      spinner.succeed("MCP server stopped");
+    } else {
+      spinner.warn("Server was not running");
     }
     if (json) {
-      formatOutput({ stopped: mcpId }, true);
+      formatOutput(result, true);
     } else {
-      formatSuccess("MCP sandbox stopped and cleaned up.", false);
+      formatSuccess("MCP server stopped.", false);
     }
   } catch (error) {
     handleError(error, json);
@@ -1142,10 +1473,10 @@ var stopCommand = new Command11("stop").description("Stop and clean up the MCP s
 });
 
 // src/commands/mcp/test.ts
-import chalk8 from "chalk";
-import { Command as Command12 } from "commander";
-import ora10 from "ora";
-var testCommand = new Command12("test").description("Test MCP tools via the sandbox").argument("[tool]", "Tool name to test (lists tools if omitted)").argument("[args...]", "JSON arguments for the tool").option("--mcp-id <id>", "Specific MCP ID").action(
+import chalk10 from "chalk";
+import { Command as Command17 } from "commander";
+import ora14 from "ora";
+var testCommand = new Command17("test").description("Test MCP tools via the sandbox").argument("[tool]", "Tool name to test (lists tools if omitted)").argument("[args...]", "JSON arguments for the tool").option("--mcp-id <id>", "Specific MCP ID").action(
   async (tool, args, options, command) => {
     const globalOptions = command.optsWithGlobals();
     const json = globalOptions.json ?? false;
@@ -1160,7 +1491,7 @@ var testCommand = new Command12("test").description("Test MCP tools via the sand
         }
       }
       if (!tool) {
-        const spinner = ora10("Fetching available tools...").start();
+        const spinner = ora14("Fetching available tools...").start();
         const result = await api.post(
           `/api/mcp/sandboxes/${mcpId}/test`,
           { action: "list" }
@@ -1173,7 +1504,7 @@ var testCommand = new Command12("test").description("Test MCP tools via the sand
           if (tools.length === 0) {
             console.log("No tools available.");
           } else {
-            console.log(chalk8.bold("\nAvailable Tools:\n"));
+            console.log(chalk10.bold("\nAvailable Tools:\n"));
             formatTable(
               ["Name", "Description"],
               tools.map((t) => [t.name, t.description || "No description"]),
@@ -1196,7 +1527,7 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
             );
           }
         }
-        const spinner = ora10(`Calling tool "${tool}"...`).start();
+        const spinner = ora14(`Calling tool "${tool}"...`).start();
         const startTime = Date.now();
         const result = await api.post(
           `/api/mcp/sandboxes/${mcpId}/test`,
@@ -1217,11 +1548,11 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
         if (json) {
           formatOutput(output, true);
         } else {
-          console.log(chalk8.bold("\nTool Result:\n"));
-          console.log(chalk8.gray("Tool:"), tool);
-          console.log(chalk8.gray("Input:"), JSON.stringify(toolArgs));
-          console.log(chalk8.gray("Duration:"), `${duration}ms`);
-          console.log(chalk8.gray("Result:"));
+          console.log(chalk10.bold("\nTool Result:\n"));
+          console.log(chalk10.gray("Tool:"), tool);
+          console.log(chalk10.gray("Input:"), JSON.stringify(toolArgs));
+          console.log(chalk10.gray("Duration:"), `${duration}ms`);
+          console.log(chalk10.gray("Result:"));
           console.log(JSON.stringify(result.result, null, 2));
         }
       }
@@ -1233,13 +1564,13 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
 );
 
 // src/commands/mcp/use.ts
-import { Command as Command13 } from "commander";
-import ora11 from "ora";
-var useCommand = new Command13("use").description("Select an MCP to use for subsequent commands").argument("<name>", "Name of the MCP to use").option("--global", "Save to global config instead of project config").action(async (name, options, command) => {
+import { Command as Command18 } from "commander";
+import ora15 from "ora";
+var useCommand = new Command18("use").description("Select an MCP to use for subsequent commands").argument("<name>", "Name of the MCP to use").option("--global", "Save to global config instead of project config").action(async (name, options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
-    const spinner = ora11("Fetching MCPs...").start();
+    const spinner = ora15("Fetching MCPs...").start();
     const mcps = await api.get("/api/admin/mcps");
     spinner.stop();
     const mcp = mcps.find((m) => m.name === name);
@@ -1274,78 +1605,21 @@ var useCommand = new Command13("use").description("Select an MCP to use for subs
   }
 });
 
-// src/commands/mcp/write-file.ts
-import { readFile as readFile3 } from "fs/promises";
-import { Command as Command14 } from "commander";
-import ora12 from "ora";
-var writeFileCommand = new Command14("write-file").description("Write a file to the MCP sandbox").argument("<path>", "Path in sandbox (e.g., /app/src/index.ts)").option("--mcp-id <id>", "Specific MCP ID").option("--content <content>", "Content to write").option("--file <localFile>", "Local file to upload").option("--base64", "Treat content as base64 encoded").action(async (path, options, command) => {
-  const globalOptions = command.optsWithGlobals();
-  const json = globalOptions.json ?? false;
-  try {
-    let mcpId = options.mcpId;
-    if (!mcpId) {
-      mcpId = await config.getMcpId();
-      if (!mcpId) {
-        throw new McpError(
-          "No active MCP. Run 'waniwani mcp create <name>' or 'waniwani mcp use <name>'."
-        );
-      }
-    }
-    let content;
-    let encoding = "utf8";
-    if (options.content) {
-      content = options.content;
-      if (options.base64) {
-        encoding = "base64";
-      }
-    } else if (options.file) {
-      const fileBuffer = await readFile3(options.file);
-      if (options.base64) {
-        content = fileBuffer.toString("base64");
-        encoding = "base64";
-      } else {
-        content = fileBuffer.toString("utf8");
-      }
-    } else {
-      throw new CLIError(
-        "Either --content or --file is required",
-        "MISSING_CONTENT"
-      );
-    }
-    const spinner = ora12(`Writing ${path}...`).start();
-    const result = await api.post(
-      `/api/mcp/sandboxes/${mcpId}/files`,
-      {
-        files: [{ path, content, encoding }]
-      }
-    );
-    spinner.succeed(`Wrote ${path}`);
-    if (json) {
-      formatOutput(result, true);
-    } else {
-      formatSuccess(`File written: ${path}`, false);
-    }
-  } catch (error) {
-    handleError(error, json);
-    process.exit(1);
-  }
-});
-
 // src/commands/mcp/index.ts
-var mcpCommand = new Command15("mcp").description("MCP sandbox management commands").addCommand(createCommand).addCommand(listCommand).addCommand(useCommand).addCommand(statusCommand).addCommand(stopCommand).addCommand(testCommand).addCommand(deployCommand).addCommand(writeFileCommand).addCommand(readFileCommand).addCommand(listFilesCommand).addCommand(runCommandCommand);
+var mcpCommand = new Command19("mcp").description("MCP sandbox management commands").addCommand(createCommand).addCommand(listCommand2).addCommand(useCommand).addCommand(statusCommand).addCommand(startCommand).addCommand(stopCommand).addCommand(logsCommand).addCommand(deleteCommand).addCommand(testCommand).addCommand(deployCommand).addCommand(fileCommand).addCommand(runCommandCommand);
 
 // src/commands/org/index.ts
-import { Command as Command18 } from "commander";
+import { Command as Command22 } from "commander";
 
 // src/commands/org/list.ts
-import chalk9 from "chalk";
-import { Command as Command16 } from "commander";
-import ora13 from "ora";
-var listCommand2 = new Command16("list").description("List your organizations").action(async (_, command) => {
+import chalk11 from "chalk";
+import { Command as Command20 } from "commander";
+import ora16 from "ora";
+var listCommand3 = new Command20("list").description("List your organizations").action(async (_, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
-    const spinner = ora13("Fetching organizations...").start();
+    const spinner = ora16("Fetching organizations...").start();
     const result = await api.get("/api/oauth/orgs");
     spinner.stop();
     const { orgs, activeOrgId } = result;
@@ -1365,11 +1639,11 @@ var listCommand2 = new Command16("list").description("List your organizations").
         console.log("No organizations found.");
         return;
       }
-      console.log(chalk9.bold("\nOrganizations:\n"));
+      console.log(chalk11.bold("\nOrganizations:\n"));
       const rows = orgs.map((o) => {
         const isActive = o.id === activeOrgId;
         return [
-          isActive ? chalk9.cyan(`* ${o.name}`) : `  ${o.name}`,
+          isActive ? chalk11.cyan(`* ${o.name}`) : `  ${o.name}`,
           o.slug,
           o.role
         ];
@@ -1379,7 +1653,7 @@ var listCommand2 = new Command16("list").description("List your organizations").
       if (activeOrgId) {
         const activeOrg = orgs.find((o) => o.id === activeOrgId);
         if (activeOrg) {
-          console.log(`Active organization: ${chalk9.cyan(activeOrg.name)}`);
+          console.log(`Active organization: ${chalk11.cyan(activeOrg.name)}`);
         }
       }
       console.log("\nSwitch organization: waniwani org switch <name>");
@@ -1391,13 +1665,13 @@ var listCommand2 = new Command16("list").description("List your organizations").
 });
 
 // src/commands/org/switch.ts
-import { Command as Command17 } from "commander";
-import ora14 from "ora";
-var switchCommand = new Command17("switch").description("Switch to a different organization").argument("<name>", "Name or slug of the organization to switch to").action(async (name, _, command) => {
+import { Command as Command21 } from "commander";
+import ora17 from "ora";
+var switchCommand = new Command21("switch").description("Switch to a different organization").argument("<name>", "Name or slug of the organization to switch to").action(async (name, _, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
-    const spinner = ora14("Fetching organizations...").start();
+    const spinner = ora17("Fetching organizations...").start();
     const { orgs } = await api.get("/api/oauth/orgs");
     const org = orgs.find((o) => o.name === name || o.slug === name);
     if (!org) {
@@ -1430,13 +1704,13 @@ var switchCommand = new Command17("switch").description("Switch to a different o
 });
 
 // src/commands/org/index.ts
-var orgCommand = new Command18("org").description("Organization management commands").addCommand(listCommand2).addCommand(switchCommand);
+var orgCommand = new Command22("org").description("Organization management commands").addCommand(listCommand3).addCommand(switchCommand);
 
 // src/commands/task.ts
-import chalk10 from "chalk";
-import { Command as Command19 } from "commander";
-import ora15 from "ora";
-var taskCommand = new Command19("task").description("Send a task to Claude running in the sandbox").argument("<prompt>", "Task description/prompt").option("--mcp-id <id>", "Specific MCP ID").option("--model <model>", "Claude model to use").option("--max-steps <n>", "Maximum tool use steps").action(async (prompt, options, command) => {
+import chalk12 from "chalk";
+import { Command as Command23 } from "commander";
+import ora18 from "ora";
+var taskCommand = new Command23("task").description("Send a task to Claude running in the sandbox").argument("<prompt>", "Task description/prompt").option("--mcp-id <id>", "Specific MCP ID").option("--model <model>", "Claude model to use").option("--max-steps <n>", "Maximum tool use steps").action(async (prompt, options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -1460,10 +1734,10 @@ var taskCommand = new Command19("task").description("Send a task to Claude runni
     const maxSteps = options.maxSteps ? Number.parseInt(options.maxSteps, 10) : defaults.maxSteps;
     if (!json) {
       console.log();
-      console.log(chalk10.bold("Task:"), prompt);
+      console.log(chalk12.bold("Task:"), prompt);
       console.log();
     }
-    const spinner = ora15("Starting task...").start();
+    const spinner = ora18("Starting task...").start();
     const baseUrl = await api.getBaseUrl();
     const response = await fetch(
       `${baseUrl}/api/mcp/sandboxes/${mcpId}/task`,
@@ -1517,7 +1791,7 @@ var taskCommand = new Command19("task").description("Send a task to Claude runni
               const event = parsed;
               steps.push({ type: "text", text: event.content });
               if (!json && event.content) {
-                console.log(chalk10.white(event.content));
+                console.log(chalk12.white(event.content));
               }
             } else if (parsed.type === "tool_call") {
               const event = parsed;
@@ -1528,24 +1802,24 @@ var taskCommand = new Command19("task").description("Send a task to Claude runni
                 output: event.output
               });
               if (!json) {
-                console.log(chalk10.cyan(`> Using tool: ${event.tool}`));
+                console.log(chalk12.cyan(`> Using tool: ${event.tool}`));
                 if (event.input?.command) {
-                  console.log(chalk10.gray(`  $ ${event.input.command}`));
+                  console.log(chalk12.gray(`  $ ${event.input.command}`));
                 }
                 if (event.output) {
                   const outputLines = event.output.split("\n");
                   if (outputLines.length > 10) {
                     console.log(
-                      chalk10.gray(outputLines.slice(0, 5).join("\n"))
+                      chalk12.gray(outputLines.slice(0, 5).join("\n"))
                     );
                     console.log(
-                      chalk10.gray(
+                      chalk12.gray(
                         `  ... (${outputLines.length - 10} more lines)`
                       )
                     );
-                    console.log(chalk10.gray(outputLines.slice(-5).join("\n")));
+                    console.log(chalk12.gray(outputLines.slice(-5).join("\n")));
                   } else {
-                    console.log(chalk10.gray(event.output));
+                    console.log(chalk12.gray(event.output));
                   }
                 }
                 console.log();
@@ -1572,12 +1846,12 @@ var taskCommand = new Command19("task").description("Send a task to Claude runni
     } else {
       console.log();
       console.log(
-        chalk10.green("\u2713"),
+        chalk12.green("\u2713"),
         `Task completed in ${finalStepCount} steps.`
       );
       if (maxStepsReached) {
         console.log(
-          chalk10.yellow("\u26A0"),
+          chalk12.yellow("\u26A0"),
           "Maximum steps reached. Task may be incomplete."
         );
       }
@@ -1590,7 +1864,7 @@ var taskCommand = new Command19("task").description("Send a task to Claude runni
 
 // src/cli.ts
 var version = "0.1.0";
-var program = new Command20().name("waniwani").description("WaniWani CLI for MCP development workflow").version(version).option("--json", "Output results as JSON").option("--verbose", "Enable verbose logging");
+var program = new Command24().name("waniwani").description("WaniWani CLI for MCP development workflow").version(version).option("--json", "Output results as JSON").option("--verbose", "Enable verbose logging");
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(initCommand);