@waniwani/cli 0.0.26 → 0.0.29

package/dist/index.js

@@ -1,209 +1,31 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command as Command24 } from "commander";
-
-// src/commands/init.ts
-import { existsSync } from "fs";
-import { mkdir, writeFile } from "fs/promises";
-import { join } from "path";
-import { Command } from "commander";
+import { Command as Command25 } from "commander";
 
-// src/lib/errors.ts
-import chalk from "chalk";
-import { ZodError } from "zod";
-var CLIError = class extends Error {
-  constructor(message, code, details) {
-    super(message);
-    this.code = code;
-    this.details = details;
-    this.name = "CLIError";
-  }
-};
-var AuthError = class extends CLIError {
-  constructor(message, details) {
-    super(message, "AUTH_ERROR", details);
-  }
-};
-var SandboxError = class extends CLIError {
-  constructor(message, details) {
-    super(message, "SANDBOX_ERROR", details);
-  }
-};
-var McpError = class extends CLIError {
-  constructor(message, details) {
-    super(message, "MCP_ERROR", details);
-  }
-};
-function handleError(error, json) {
-  if (error instanceof ZodError) {
-    const message = error.issues.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
-    outputError("VALIDATION_ERROR", `Invalid input: ${message}`, json);
-  } else if (error instanceof CLIError) {
-    outputError(error.code, error.message, json, error.details);
-  } else if (error instanceof Error) {
-    outputError("UNKNOWN_ERROR", error.message, json);
-  } else {
-    outputError("UNKNOWN_ERROR", String(error), json);
-  }
-}
-function outputError(code, message, json, details) {
-  if (json) {
-    console.error(
-      JSON.stringify({ success: false, error: { code, message, details } })
-    );
-  } else {
-    console.error(chalk.red(`Error [${code}]:`), message);
-    if (details) {
-      console.error(chalk.gray("Details:"), JSON.stringify(details, null, 2));
-    }
-  }
-}
-
-// src/lib/output.ts
+// src/commands/dev.ts
+import { relative as relative2 } from "path";
 import chalk2 from "chalk";
-function formatOutput(data, json) {
-  if (json) {
-    console.log(JSON.stringify({ success: true, data }, null, 2));
-  } else {
-    prettyPrint(data);
-  }
-}
-function formatSuccess(message, json) {
-  if (json) {
-    console.log(JSON.stringify({ success: true, message }));
-  } else {
-    console.log(chalk2.green("\u2713"), message);
-  }
-}
-function formatTable(headers, rows, json) {
-  if (json) {
-    const data = rows.map(
-      (row) => Object.fromEntries(headers.map((header, i) => [header, row[i]]))
-    );
-    console.log(JSON.stringify({ success: true, data }, null, 2));
-  } else {
-    const colWidths = headers.map(
-      (h, i) => Math.max(h.length, ...rows.map((r) => (r[i] || "").length))
-    );
-    const separator = colWidths.map((w) => "-".repeat(w + 2)).join("+");
-    const formatRow = (row) => row.map((cell, i) => ` ${(cell || "").padEnd(colWidths[i])} `).join("|");
-    console.log(chalk2.cyan(formatRow(headers)));
-    console.log(separator);
-    for (const row of rows) {
-      console.log(formatRow(row));
-    }
-  }
-}
-function formatList(items, json) {
-  if (json) {
-    const data = Object.fromEntries(
-      items.map((item) => [item.label, item.value])
-    );
-    console.log(JSON.stringify({ success: true, data }, null, 2));
-  } else {
-    const maxLabelLength = Math.max(...items.map((i) => i.label.length));
-    items.forEach((item) => {
-      console.log(
-        `${chalk2.gray(item.label.padEnd(maxLabelLength))}  ${chalk2.white(item.value)}`
-      );
-    });
-  }
-}
-function prettyPrint(data, indent = 0) {
-  const prefix = "  ".repeat(indent);
-  if (Array.isArray(data)) {
-    data.forEach((item, index) => {
-      console.log(`${prefix}${chalk2.gray(`[${index}]`)}`);
-      prettyPrint(item, indent + 1);
-    });
-  } else if (typeof data === "object" && data !== null) {
-    for (const [key, value] of Object.entries(data)) {
-      if (typeof value === "object" && value !== null) {
-        console.log(`${prefix}${chalk2.gray(key)}:`);
-        prettyPrint(value, indent + 1);
-      } else {
-        console.log(
-          `${prefix}${chalk2.gray(key)}: ${chalk2.white(String(value))}`
-        );
-      }
-    }
-  } else {
-    console.log(`${prefix}${chalk2.white(String(data))}`);
-  }
-}
-
-// src/commands/init.ts
-var PROJECT_CONFIG_DIR = ".waniwani";
-var PROJECT_CONFIG_FILE = "settings.local.json";
-var initCommand = new Command("init").description("Initialize WaniWani project config in current directory").action(async (_, command) => {
-  const globalOptions = command.optsWithGlobals();
-  const json = globalOptions.json ?? false;
-  try {
-    const cwd = process.cwd();
-    const configDir = join(cwd, PROJECT_CONFIG_DIR);
-    const configPath = join(configDir, PROJECT_CONFIG_FILE);
-    if (existsSync(configDir)) {
-      if (json) {
-        formatOutput(
-          { initialized: false, message: "Already initialized" },
-          true
-        );
-      } else {
-        console.log("Project already initialized (.waniwani/ exists)");
-      }
-      return;
-    }
-    await mkdir(configDir, { recursive: true });
-    const defaultConfig = {
-      mcpId: null,
-      defaults: {}
-    };
-    await writeFile(
-      configPath,
-      JSON.stringify(defaultConfig, null, "	"),
-      "utf-8"
-    );
-    if (json) {
-      formatOutput({ initialized: true, path: configDir }, true);
-    } else {
-      formatSuccess("Initialized WaniWani project config", false);
-      console.log();
-      console.log(`  Created: ${PROJECT_CONFIG_DIR}/${PROJECT_CONFIG_FILE}`);
-      console.log();
-      console.log("Now run:");
-      console.log('  waniwani mcp create "my-mcp"');
-      console.log("  waniwani mcp use <name>");
-    }
-  } catch (error) {
-    handleError(error, json);
-    process.exit(1);
-  }
-});
-
-// src/commands/login.ts
-import { spawn } from "child_process";
-import { createServer } from "http";
-import chalk3 from "chalk";
-import { Command as Command2 } from "commander";
+import chokidar from "chokidar";
+import { Command } from "commander";
 import ora from "ora";
 
 // src/lib/auth.ts
-import { access, mkdir as mkdir3, readFile as readFile2, writeFile as writeFile3 } from "fs/promises";
+import { access, mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
 import { homedir as homedir2 } from "os";
-import { join as join3 } from "path";
+import { join as join2 } from "path";
 import { z as z2 } from "zod";
 
 // src/lib/config.ts
-import { existsSync as existsSync2 } from "fs";
-import { mkdir as mkdir2, readFile, writeFile as writeFile2 } from "fs/promises";
+import { existsSync } from "fs";
+import { mkdir, readFile, writeFile } from "fs/promises";
 import { homedir } from "os";
-import { join as join2 } from "path";
+import { join } from "path";
 import { z } from "zod";
-var LOCAL_DIR = join2(process.cwd(), ".waniwani");
-var LOCAL_FILE = join2(LOCAL_DIR, "settings.json");
-var GLOBAL_DIR = join2(homedir(), ".waniwani");
-var GLOBAL_FILE = join2(GLOBAL_DIR, "settings.json");
+var LOCAL_DIR = join(process.cwd(), ".waniwani");
+var LOCAL_FILE = join(LOCAL_DIR, "settings.json");
+var GLOBAL_DIR = join(homedir(), ".waniwani");
+var GLOBAL_FILE = join(GLOBAL_DIR, "settings.json");
 var DEFAULT_API_URL = "https://app.waniwani.ai";
 var ConfigSchema = z.object({
   defaults: z.object({ model: z.string(), maxSteps: z.number() }).default({ model: "claude-sonnet-4-20250514", maxSteps: 10 }),
@@ -216,7 +38,7 @@ var Config = class {
   cache = null;
   scope;
   constructor(forceGlobal = false) {
-    const useLocal = !forceGlobal && existsSync2(LOCAL_DIR);
+    const useLocal = !forceGlobal && existsSync(LOCAL_DIR);
     this.dir = useLocal ? LOCAL_DIR : GLOBAL_DIR;
     this.file = useLocal ? LOCAL_FILE : GLOBAL_FILE;
     this.scope = useLocal ? "local" : "global";
@@ -235,8 +57,8 @@ var Config = class {
   }
   async save(data) {
     this.cache = data;
-    await mkdir2(this.dir, { recursive: true });
-    await writeFile2(this.file, JSON.stringify(data, null, "	"));
+    await mkdir(this.dir, { recursive: true });
+    await writeFile(this.file, JSON.stringify(data, null, "	"));
   }
   async getDefaults() {
     return (await this.load()).defaults;
@@ -271,8 +93,8 @@ var config = new Config();
 var globalConfig = new Config(true);
 
 // src/lib/auth.ts
-var CONFIG_DIR = join3(homedir2(), ".waniwani");
-var AUTH_FILE = join3(CONFIG_DIR, "auth.json");
+var CONFIG_DIR = join2(homedir2(), ".waniwani");
+var AUTH_FILE = join2(CONFIG_DIR, "auth.json");
 var AuthStoreSchema = z2.object({
   accessToken: z2.string().nullable().default(null),
   refreshToken: z2.string().nullable().default(null),
@@ -280,7 +102,7 @@ var AuthStoreSchema = z2.object({
   clientId: z2.string().nullable().default(null)
 });
 async function ensureConfigDir() {
-  await mkdir3(CONFIG_DIR, { recursive: true });
+  await mkdir2(CONFIG_DIR, { recursive: true });
 }
 async function readAuthStore() {
   await ensureConfigDir();
@@ -294,7 +116,7 @@ async function readAuthStore() {
 }
 async function writeAuthStore(store) {
   await ensureConfigDir();
-  await writeFile3(AUTH_FILE, JSON.stringify(store, null, 2), "utf-8");
+  await writeFile2(AUTH_FILE, JSON.stringify(store, null, 2), "utf-8");
 }
 var AuthManager = class {
   storeCache = null;
@@ -359,22 +181,624 @@ var AuthManager = class {
         await this.clear();
         return false;
       }
-      const data = await response.json();
-      await this.setTokens(
-        data.access_token,
-        data.refresh_token,
-        data.expires_in
+      const data = await response.json();
+      await this.setTokens(
+        data.access_token,
+        data.refresh_token,
+        data.expires_in
+      );
+      return true;
+    } catch {
+      await this.clear();
+      return false;
+    }
+  }
+};
+var auth = new AuthManager();
+
+// src/lib/errors.ts
+import chalk from "chalk";
+import { ZodError } from "zod";
+var CLIError = class extends Error {
+  constructor(message, code, details) {
+    super(message);
+    this.code = code;
+    this.details = details;
+    this.name = "CLIError";
+  }
+};
+var AuthError = class extends CLIError {
+  constructor(message, details) {
+    super(message, "AUTH_ERROR", details);
+  }
+};
+var SandboxError = class extends CLIError {
+  constructor(message, details) {
+    super(message, "SANDBOX_ERROR", details);
+  }
+};
+var McpError = class extends CLIError {
+  constructor(message, details) {
+    super(message, "MCP_ERROR", details);
+  }
+};
+function handleError(error, json) {
+  if (error instanceof ZodError) {
+    const message = error.issues.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
+    outputError("VALIDATION_ERROR", `Invalid input: ${message}`, json);
+  } else if (error instanceof CLIError) {
+    outputError(error.code, error.message, json, error.details);
+  } else if (error instanceof Error) {
+    outputError("UNKNOWN_ERROR", error.message, json);
+  } else {
+    outputError("UNKNOWN_ERROR", String(error), json);
+  }
+}
+function outputError(code, message, json, details) {
+  if (json) {
+    console.error(
+      JSON.stringify({ success: false, error: { code, message, details } })
+    );
+  } else {
+    console.error(chalk.red(`Error [${code}]:`), message);
+    if (details) {
+      console.error(chalk.gray("Details:"), JSON.stringify(details, null, 2));
+    }
+  }
+}
+
+// src/lib/api.ts
+var ApiError = class extends CLIError {
+  constructor(message, code, statusCode, details) {
+    super(message, code, details);
+    this.statusCode = statusCode;
+    this.name = "ApiError";
+  }
+};
+async function request(method, path, options) {
+  const {
+    body,
+    requireAuth = true,
+    headers: extraHeaders = {}
+  } = options || {};
+  const headers = {
+    "Content-Type": "application/json",
+    ...extraHeaders
+  };
+  if (requireAuth) {
+    const token = await auth.getAccessToken();
+    if (!token) {
+      throw new AuthError(
+        "Not logged in. Run 'waniwani login' to authenticate."
+      );
+    }
+    headers.Authorization = `Bearer ${token}`;
+  }
+  const baseUrl = await config.getApiUrl();
+  const url = `${baseUrl}${path}`;
+  const response = await fetch(url, {
+    method,
+    headers,
+    body: body ? JSON.stringify(body) : void 0
+  });
+  if (response.status === 204) {
+    return void 0;
+  }
+  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 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();
+      if (refreshed) {
+        return request(method, path, options);
+      }
+      throw new AuthError(
+        "Session expired. Run 'waniwani login' to re-authenticate."
+      );
+    }
+    throw new ApiError(
+      error.message,
+      error.code,
+      response.status,
+      error.details
+    );
+  }
+  return data.data;
+}
+var api = {
+  get: (path, options) => request("GET", path, options),
+  post: (path, body, options) => request("POST", path, { body, ...options }),
+  delete: (path, options) => request("DELETE", path, options),
+  getBaseUrl: () => config.getApiUrl()
+};
+
+// src/lib/sync.ts
+import { existsSync as existsSync2 } from "fs";
+import { mkdir as mkdir3, readdir, readFile as readFile3, stat, writeFile as writeFile3 } from "fs/promises";
+import { dirname, join as join3, relative } from "path";
+import ignore from "ignore";
+
+// src/lib/utils.ts
+function debounce(fn, delay) {
+  let timeoutId;
+  return (...args) => {
+    clearTimeout(timeoutId);
+    timeoutId = setTimeout(() => fn(...args), delay);
+  };
+}
+var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".ico",
+  ".webp",
+  ".svg",
+  ".woff",
+  ".woff2",
+  ".ttf",
+  ".eot",
+  ".otf",
+  ".zip",
+  ".tar",
+  ".gz",
+  ".pdf",
+  ".exe",
+  ".dll",
+  ".so",
+  ".dylib",
+  ".bin",
+  ".mp3",
+  ".mp4",
+  ".wav",
+  ".ogg",
+  ".webm"
+]);
+function isBinaryPath(filePath) {
+  const ext = filePath.slice(filePath.lastIndexOf(".")).toLowerCase();
+  return BINARY_EXTENSIONS.has(ext);
+}
+function detectBinary(buffer) {
+  const sample = buffer.subarray(0, 8192);
+  return sample.includes(0);
+}
+
+// src/lib/sync.ts
+var PROJECT_DIR = ".waniwani";
+var SETTINGS_FILE = "settings.json";
+async function findProjectRoot(startDir) {
+  let current = startDir;
+  const root = dirname(current);
+  while (current !== root) {
+    if (existsSync2(join3(current, PROJECT_DIR))) {
+      return current;
+    }
+    const parent = dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  if (existsSync2(join3(current, PROJECT_DIR))) {
+    return current;
+  }
+  return null;
+}
+async function loadProjectMcpId(projectRoot) {
+  const settingsPath = join3(projectRoot, PROJECT_DIR, SETTINGS_FILE);
+  try {
+    const content = await readFile3(settingsPath, "utf-8");
+    const settings = JSON.parse(content);
+    return settings.mcpId ?? null;
+  } catch {
+    return null;
+  }
+}
+var DEFAULT_IGNORE_PATTERNS = [
+  ".waniwani",
+  ".git",
+  "node_modules",
+  ".env",
+  ".env.*",
+  ".DS_Store",
+  "*.log",
+  ".cache",
+  "dist",
+  "coverage",
+  ".turbo",
+  ".next",
+  ".nuxt",
+  ".vercel"
+];
+async function loadIgnorePatterns(projectRoot) {
+  const ig = ignore();
+  ig.add(DEFAULT_IGNORE_PATTERNS);
+  const gitignorePath = join3(projectRoot, ".gitignore");
+  if (existsSync2(gitignorePath)) {
+    try {
+      const content = await readFile3(gitignorePath, "utf-8");
+      ig.add(content);
+    } catch {
+    }
+  }
+  return ig;
+}
+async function collectFiles(projectRoot) {
+  const ig = await loadIgnorePatterns(projectRoot);
+  const files = [];
+  async function walk(dir) {
+    const entries = await readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join3(dir, entry.name);
+      const relativePath = relative(projectRoot, fullPath);
+      if (ig.ignores(relativePath)) {
+        continue;
+      }
+      if (entry.isDirectory()) {
+        await walk(fullPath);
+      } else if (entry.isFile()) {
+        try {
+          const content = await readFile3(fullPath);
+          const isBinary = isBinaryPath(fullPath) || detectBinary(content);
+          files.push({
+            path: relativePath,
+            content: isBinary ? content.toString("base64") : content.toString("utf8"),
+            encoding: isBinary ? "base64" : "utf8"
+          });
+        } catch {
+        }
+      }
+    }
+  }
+  await walk(projectRoot);
+  return files;
+}
+async function pullFilesFromSandbox(mcpId, targetDir) {
+  const result = await api.get(
+    `/api/mcp/sandboxes/${mcpId}/files/pull`
+  );
+  const writtenFiles = [];
+  for (const file of result.files) {
+    const localPath = join3(targetDir, file.path);
+    const dir = dirname(localPath);
+    await mkdir3(dir, { recursive: true });
+    if (file.encoding === "base64") {
+      await writeFile3(localPath, Buffer.from(file.content, "base64"));
+    } else {
+      await writeFile3(localPath, file.content, "utf8");
+    }
+    writtenFiles.push(file.path);
+  }
+  return { count: writtenFiles.length, files: writtenFiles };
+}
+async function collectSingleFile(projectRoot, filePath) {
+  const fullPath = join3(projectRoot, filePath);
+  const relativePath = relative(projectRoot, fullPath);
+  if (!existsSync2(fullPath)) {
+    return null;
+  }
+  try {
+    const fileStat = await stat(fullPath);
+    if (!fileStat.isFile()) {
+      return null;
+    }
+    const content = await readFile3(fullPath);
+    const isBinary = isBinaryPath(fullPath) || detectBinary(content);
+    return {
+      path: relativePath,
+      content: isBinary ? content.toString("base64") : content.toString("utf8"),
+      encoding: isBinary ? "base64" : "utf8"
+    };
+  } catch {
+    return null;
+  }
+}
+
+// src/commands/dev.ts
+var BATCH_SIZE = 50;
+var DEFAULT_DEBOUNCE_MS = 300;
+var devCommand = new Command("dev").description("Watch and sync files to MCP sandbox").option("--no-initial-sync", "Skip initial sync of all files").option(
+  "--debounce <ms>",
+  "Debounce delay in milliseconds",
+  String(DEFAULT_DEBOUNCE_MS)
+).action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const cwd = process.cwd();
+    const projectRoot = await findProjectRoot(cwd);
+    if (!projectRoot) {
+      throw new CLIError(
+        "Not in a WaniWani project. Run 'waniwani init <name>' first.",
+        "NOT_IN_PROJECT"
+      );
+    }
+    const mcpId = await loadProjectMcpId(projectRoot);
+    if (!mcpId) {
+      throw new CLIError(
+        "No MCP ID found in project config. Run 'waniwani init <name>' first.",
+        "NO_MCP_ID"
+      );
+    }
+    if (options.initialSync !== false) {
+      const spinner = ora("Initial sync...").start();
+      const files = await collectFiles(projectRoot);
+      if (files.length > 0) {
+        const totalBatches = Math.ceil(files.length / BATCH_SIZE);
+        let synced = 0;
+        for (let i = 0; i < totalBatches; i++) {
+          const batch = files.slice(i * BATCH_SIZE, (i + 1) * BATCH_SIZE);
+          spinner.text = `Syncing (${i + 1}/${totalBatches})...`;
+          const result = await api.post(
+            `/api/mcp/sandboxes/${mcpId}/files`,
+            {
+              files: batch.map((f) => ({
+                path: f.path,
+                content: f.content,
+                encoding: f.encoding
+              }))
+            }
+          );
+          synced += result.written.length;
+        }
+        spinner.succeed(`Initial sync complete (${synced} files)`);
+      } else {
+        spinner.info("No files to sync");
+      }
+    }
+    const ig = await loadIgnorePatterns(projectRoot);
+    const debounceMs = Number.parseInt(options.debounce, 10) || DEFAULT_DEBOUNCE_MS;
+    const syncFile = debounce(async (filePath) => {
+      const relativePath = relative2(projectRoot, filePath);
+      if (ig.ignores(relativePath)) {
+        return;
+      }
+      const file = await collectSingleFile(projectRoot, relativePath);
+      if (!file) {
+        console.log(chalk2.yellow("Skipped:"), relativePath);
+        return;
+      }
+      try {
+        await api.post(
+          `/api/mcp/sandboxes/${mcpId}/files`,
+          {
+            files: [
+              {
+                path: file.path,
+                content: file.content,
+                encoding: file.encoding
+              }
+            ]
+          }
+        );
+        console.log(chalk2.green("Synced:"), relativePath);
+      } catch (error) {
+        console.log(chalk2.red("Failed:"), relativePath);
+        if (globalOptions.verbose) {
+          console.error(error);
+        }
+      }
+    }, debounceMs);
+    console.log();
+    console.log(chalk2.bold("Watching for changes..."));
+    console.log(chalk2.dim("Press Ctrl+C to stop"));
+    console.log();
+    const watcher = chokidar.watch(projectRoot, {
+      ignored: (path) => {
+        const relativePath = relative2(projectRoot, path);
+        return ig.ignores(relativePath);
+      },
+      persistent: true,
+      ignoreInitial: true,
+      awaitWriteFinish: {
+        stabilityThreshold: 100,
+        pollInterval: 100
+      }
+    });
+    watcher.on("add", (path) => syncFile(path)).on("change", (path) => syncFile(path)).on("unlink", (path) => {
+      const relativePath = relative2(projectRoot, path);
+      console.log(chalk2.yellow("Deleted (local only):"), relativePath);
+    });
+    const cleanup = () => {
+      console.log();
+      console.log(chalk2.dim("Stopping watcher..."));
+      watcher.close().then(() => {
+        process.exit(0);
+      });
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/init.ts
+import { existsSync as existsSync3 } from "fs";
+import { mkdir as mkdir4, writeFile as writeFile4 } from "fs/promises";
+import { join as join4 } from "path";
+import { Command as Command2 } from "commander";
+import ora2 from "ora";
+
+// src/lib/output.ts
+import chalk3 from "chalk";
+function formatOutput(data, json) {
+  if (json) {
+    console.log(JSON.stringify({ success: true, data }, null, 2));
+  } else {
+    prettyPrint(data);
+  }
+}
+function formatSuccess(message, json) {
+  if (json) {
+    console.log(JSON.stringify({ success: true, message }));
+  } else {
+    console.log(chalk3.green("\u2713"), message);
+  }
+}
+function formatTable(headers, rows, json) {
+  if (json) {
+    const data = rows.map(
+      (row) => Object.fromEntries(headers.map((header, i) => [header, row[i]]))
+    );
+    console.log(JSON.stringify({ success: true, data }, null, 2));
+  } else {
+    const colWidths = headers.map(
+      (h, i) => Math.max(h.length, ...rows.map((r) => (r[i] || "").length))
+    );
+    const separator = colWidths.map((w) => "-".repeat(w + 2)).join("+");
+    const formatRow = (row) => row.map((cell, i) => ` ${(cell || "").padEnd(colWidths[i])} `).join("|");
+    console.log(chalk3.cyan(formatRow(headers)));
+    console.log(separator);
+    for (const row of rows) {
+      console.log(formatRow(row));
+    }
+  }
+}
+function formatList(items, json) {
+  if (json) {
+    const data = Object.fromEntries(
+      items.map((item) => [item.label, item.value])
+    );
+    console.log(JSON.stringify({ success: true, data }, null, 2));
+  } else {
+    const maxLabelLength = Math.max(...items.map((i) => i.label.length));
+    items.forEach((item) => {
+      console.log(
+        `${chalk3.gray(item.label.padEnd(maxLabelLength))}  ${chalk3.white(item.value)}`
+      );
+    });
+  }
+}
+function prettyPrint(data, indent = 0) {
+  const prefix = "  ".repeat(indent);
+  if (Array.isArray(data)) {
+    data.forEach((item, index) => {
+      console.log(`${prefix}${chalk3.gray(`[${index}]`)}`);
+      prettyPrint(item, indent + 1);
+    });
+  } else if (typeof data === "object" && data !== null) {
+    for (const [key, value] of Object.entries(data)) {
+      if (typeof value === "object" && value !== null) {
+        console.log(`${prefix}${chalk3.gray(key)}:`);
+        prettyPrint(value, indent + 1);
+      } else {
+        console.log(
+          `${prefix}${chalk3.gray(key)}: ${chalk3.white(String(value))}`
+        );
+      }
+    }
+  } else {
+    console.log(`${prefix}${chalk3.white(String(data))}`);
+  }
+}
+
+// src/commands/init.ts
+var PROJECT_CONFIG_DIR = ".waniwani";
+var PROJECT_CONFIG_FILE = "settings.json";
+var initCommand = new Command2("init").description("Create a new MCP project from template").argument("<name>", "Name for the MCP project").action(async (name, _, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const cwd = process.cwd();
+    const projectDir = join4(cwd, name);
+    if (existsSync3(projectDir)) {
+      if (json) {
+        formatOutput(
+          {
+            success: false,
+            error: `Directory "${name}" already exists`
+          },
+          true
+        );
+      } else {
+        console.error(`Error: Directory "${name}" already exists`);
+      }
+      process.exit(1);
+    }
+    const spinner = ora2("Creating MCP sandbox...").start();
+    const result = await api.post("/api/mcp/sandboxes", {
+      name
+    });
+    spinner.text = "Downloading template files...";
+    await mkdir4(projectDir, { recursive: true });
+    await pullFilesFromSandbox(result.id, projectDir);
+    spinner.text = "Setting up project config...";
+    const configDir = join4(projectDir, PROJECT_CONFIG_DIR);
+    const configPath = join4(configDir, PROJECT_CONFIG_FILE);
+    await mkdir4(configDir, { recursive: true });
+    const projectConfig = {
+      mcpId: result.id,
+      defaults: {
+        model: "claude-sonnet-4-20250514",
+        maxSteps: 10
+      }
+    };
+    await writeFile4(
+      configPath,
+      JSON.stringify(projectConfig, null, "	"),
+      "utf-8"
+    );
+    spinner.succeed("MCP project created");
+    if (json) {
+      formatOutput(
+        {
+          success: true,
+          projectDir,
+          mcpId: result.id,
+          sandboxId: result.sandboxId,
+          previewUrl: result.previewUrl
+        },
+        true
       );
-      return true;
-    } catch {
-      await this.clear();
-      return false;
+    } else {
+      console.log();
+      formatSuccess(`MCP project "${name}" created!`, false);
+      console.log();
+      console.log(`  Project:     ${projectDir}`);
+      console.log(`  MCP ID:      ${result.id}`);
+      console.log(`  Preview URL: ${result.previewUrl}`);
+      console.log();
+      console.log("Next steps:");
+      console.log(`  cd ${name}`);
+      console.log("  waniwani push         # Sync files to sandbox");
+      console.log("  waniwani dev          # Watch mode with auto-sync");
+      console.log('  waniwani task "..."   # Send tasks to Claude');
     }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
   }
-};
-var auth = new AuthManager();
+});
 
 // src/commands/login.ts
+import { spawn } from "child_process";
+import { createServer } from "http";
+import chalk4 from "chalk";
+import { Command as Command3 } from "commander";
+import ora3 from "ora";
 var CALLBACK_PORT = 54321;
 var CALLBACK_URL = `http://localhost:${CALLBACK_PORT}/callback`;
 var CLIENT_NAME = "waniwani-cli";
@@ -649,7 +1073,7 @@ async function exchangeCodeForToken(code, codeVerifier, clientId, resource) {
   }
   return response.json();
 }
-var loginCommand = new Command2("login").description("Log in to WaniWani").option("--no-browser", "Don't open the browser automatically").action(async (options, command) => {
+var loginCommand = new Command3("login").description("Log in to WaniWani").option("--no-browser", "Don't open the browser automatically").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -661,14 +1085,14 @@ var loginCommand = new Command2("login").description("Log in to WaniWani").optio
             formatOutput({ alreadyLoggedIn: true, refreshed: true }, true);
           } else {
             console.log(
-              chalk3.green("Session refreshed. You're still logged in.")
+              chalk4.green("Session refreshed. You're still logged in.")
             );
           }
           return;
         }
         if (!json) {
           console.log(
-            chalk3.yellow("Session expired. Starting new login flow...")
+            chalk4.yellow("Session expired. Starting new login flow...")
           );
         }
         await auth.clear();
@@ -677,7 +1101,7 @@ var loginCommand = new Command2("login").description("Log in to WaniWani").optio
           formatOutput({ alreadyLoggedIn: true }, true);
         } else {
           console.log(
-            chalk3.yellow(
+            chalk4.yellow(
               "Already logged in. Use 'waniwani logout' to log out first."
             )
           );
@@ -686,9 +1110,9 @@ var loginCommand = new Command2("login").description("Log in to WaniWani").optio
       }
     }
     if (!json) {
-      console.log(chalk3.bold("\nWaniWani CLI Login\n"));
+      console.log(chalk4.bold("\nWaniWani CLI Login\n"));
     }
-    const spinner = ora("Registering client...").start();
+    const spinner = ora3("Registering client...").start();
     const { client_id: clientId } = await registerClient();
     spinner.text = "Preparing authentication...";
     const codeVerifier = generateCodeVerifier();
@@ -708,7 +1132,7 @@ var loginCommand = new Command2("login").description("Log in to WaniWani").optio
       console.log("Opening browser for authentication...\n");
       console.log(`If the browser doesn't open, visit:
 `);
-      console.log(chalk3.cyan(`  ${authUrl.toString()}`));
+      console.log(chalk4.cyan(`  ${authUrl.toString()}`));
       console.log();
     }
     const callbackPromise = waitForCallback(state);
@@ -754,8 +1178,8 @@ var loginCommand = new Command2("login").description("Log in to WaniWani").optio
 });
 
 // src/commands/logout.ts
-import { Command as Command3 } from "commander";
-var logoutCommand = new Command3("logout").description("Log out from WaniWani").action(async (_, command) => {
+import { Command as Command4 } from "commander";
+var logoutCommand = new Command4("logout").description("Log out from WaniWani").action(async (_, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -782,134 +1206,9 @@ var logoutCommand = new Command3("logout").description("Log out from WaniWani").
 // src/commands/mcp/index.ts
 import { Command as Command19 } from "commander";
 
-// src/commands/mcp/create.ts
-import { Command as Command4 } from "commander";
-import ora2 from "ora";
-
-// src/lib/api.ts
-var ApiError = class extends CLIError {
-  constructor(message, code, statusCode, details) {
-    super(message, code, details);
-    this.statusCode = statusCode;
-    this.name = "ApiError";
-  }
-};
-async function request(method, path, options) {
-  const {
-    body,
-    requireAuth = true,
-    headers: extraHeaders = {}
-  } = options || {};
-  const headers = {
-    "Content-Type": "application/json",
-    ...extraHeaders
-  };
-  if (requireAuth) {
-    const token = await auth.getAccessToken();
-    if (!token) {
-      throw new AuthError(
-        "Not logged in. Run 'waniwani login' to authenticate."
-      );
-    }
-    headers.Authorization = `Bearer ${token}`;
-  }
-  const baseUrl = await config.getApiUrl();
-  const url = `${baseUrl}${path}`;
-  const response = await fetch(url, {
-    method,
-    headers,
-    body: body ? JSON.stringify(body) : void 0
-  });
-  if (response.status === 204) {
-    return void 0;
-  }
-  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 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();
-      if (refreshed) {
-        return request(method, path, options);
-      }
-      throw new AuthError(
-        "Session expired. Run 'waniwani login' to re-authenticate."
-      );
-    }
-    throw new ApiError(
-      error.message,
-      error.code,
-      response.status,
-      error.details
-    );
-  }
-  return data.data;
-}
-var api = {
-  get: (path, options) => request("GET", path, options),
-  post: (path, body, options) => request("POST", path, { body, ...options }),
-  delete: (path, options) => request("DELETE", path, options),
-  getBaseUrl: () => config.getApiUrl()
-};
-
-// src/commands/mcp/create.ts
-var createCommand = new Command4("create").description("Create a new MCP sandbox from template").argument("<name>", "Name for the MCP project").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 = ora2("Creating MCP sandbox...").start();
-    const result = await api.post("/api/mcp/sandboxes", {
-      name
-    });
-    spinner.succeed("MCP sandbox created");
-    const cfg = options.global ? globalConfig : config;
-    await cfg.setMcpId(result.id);
-    if (json) {
-      formatOutput({ ...result, scope: cfg.scope }, true);
-    } else {
-      console.log();
-      formatSuccess(`MCP sandbox "${name}" created! (${cfg.scope})`, false);
-      console.log();
-      console.log(`  MCP ID:      ${result.id}`);
-      console.log(`  Sandbox ID:  ${result.sandboxId}`);
-      console.log(`  Preview URL: ${result.previewUrl}`);
-      console.log();
-      console.log(`Next steps:`);
-      console.log(`  waniwani task "Add a tool that does X"`);
-      console.log(`  waniwani mcp test`);
-      console.log(`  waniwani mcp deploy`);
-    }
-  } catch (error) {
-    handleError(error, json);
-    process.exit(1);
-  }
-});
-
 // src/commands/mcp/delete.ts
 import { Command as Command5 } from "commander";
-import ora3 from "ora";
+import ora4 from "ora";
 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;
@@ -921,7 +1220,7 @@ var deleteCommand = new Command5("delete").description("Delete the MCP sandbox")
         throw new McpError("No active MCP. Use --mcp-id to specify one.");
       }
     }
-    const spinner = ora3("Deleting MCP sandbox...").start();
+    const spinner = ora4("Deleting MCP sandbox...").start();
     await api.delete(`/api/mcp/sandboxes/${mcpId}`);
     spinner.succeed("MCP sandbox deleted");
     if (await config.getMcpId() === mcpId) {
@@ -940,7 +1239,7 @@ var deleteCommand = new Command5("delete").description("Delete the MCP sandbox")
 
 // src/commands/mcp/deploy.ts
 import { Command as Command6 } from "commander";
-import ora4 from "ora";
+import ora5 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;
@@ -954,7 +1253,7 @@ var deployCommand = new Command6("deploy").description("Deploy MCP server to Git
         );
       }
     }
-    const spinner = ora4("Deploying to GitHub...").start();
+    const spinner = ora5("Deploying to GitHub...").start();
     const result = await api.post(
       `/api/admin/mcps/${mcpId}/deploy`,
       {
@@ -989,9 +1288,9 @@ var deployCommand = new Command6("deploy").description("Deploy MCP server to Git
 import { Command as Command10 } from "commander";
 
 // src/commands/mcp/file/list.ts
-import chalk4 from "chalk";
+import chalk5 from "chalk";
 import { Command as Command7 } from "commander";
-import ora5 from "ora";
+import ora6 from "ora";
 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;
@@ -1005,7 +1304,7 @@ var listCommand = new Command7("list").description("List files in the MCP sandbo
         );
       }
     }
-    const spinner = ora5(`Listing ${path}...`).start();
+    const spinner = ora6(`Listing ${path}...`).start();
     const result = await api.get(
       `/api/mcp/sandboxes/${mcpId}/files/list?path=${encodeURIComponent(path)}`
     );
@@ -1013,15 +1312,15 @@ var listCommand = new Command7("list").description("List files in the MCP sandbo
     if (json) {
       formatOutput(result, true);
     } else {
-      console.log(chalk4.bold(`
+      console.log(chalk5.bold(`
 Directory: ${result.path}
 `));
       if (result.entries.length === 0) {
         console.log("  (empty)");
       } else {
         const rows = result.entries.map((entry) => {
-          const name = entry.type === "directory" ? chalk4.blue(`${entry.name}/`) : entry.name;
-          const size = entry.type === "directory" ? chalk4.gray("<dir>") : formatSize(entry.size);
+          const name = entry.type === "directory" ? chalk5.blue(`${entry.name}/`) : entry.name;
+          const size = entry.type === "directory" ? chalk5.gray("<dir>") : formatSize(entry.size);
           return [name, size];
         });
         formatTable(["Name", "Size"], rows, false);
@@ -1041,9 +1340,9 @@ function formatSize(bytes) {
 }
 
 // src/commands/mcp/file/read.ts
-import { writeFile as writeFile4 } from "fs/promises";
+import { writeFile as writeFile5 } from "fs/promises";
 import { Command as Command8 } from "commander";
-import ora6 from "ora";
+import ora7 from "ora";
 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;
@@ -1058,7 +1357,7 @@ var readCommand = new Command8("read").description("Read a file from the MCP san
       }
     }
     const encoding = options.base64 ? "base64" : "utf8";
-    const spinner = ora6(`Reading ${path}...`).start();
+    const spinner = ora7(`Reading ${path}...`).start();
     const result = await api.get(
       `/api/mcp/sandboxes/${mcpId}/files?path=${encodeURIComponent(path)}&encoding=${encoding}`
     );
@@ -1068,7 +1367,7 @@ var readCommand = new Command8("read").description("Read a file from the MCP san
     }
     if (options.output) {
       const buffer = result.encoding === "base64" ? Buffer.from(result.content, "base64") : Buffer.from(result.content, "utf8");
-      await writeFile4(options.output, buffer);
+      await writeFile5(options.output, buffer);
       if (json) {
         formatOutput({ path, savedTo: options.output }, true);
       } else {
@@ -1089,9 +1388,9 @@ var readCommand = new Command8("read").description("Read a file from the MCP san
 });
 
 // src/commands/mcp/file/write.ts
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 import { Command as Command9 } from "commander";
-import ora7 from "ora";
+import ora8 from "ora";
 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;
@@ -1113,7 +1412,7 @@ var writeCommand = new Command9("write").description("Write a file to the MCP sa
         encoding = "base64";
       }
     } else if (options.file) {
-      const fileBuffer = await readFile3(options.file);
+      const fileBuffer = await readFile4(options.file);
       if (options.base64) {
         content = fileBuffer.toString("base64");
         encoding = "base64";
@@ -1126,7 +1425,7 @@ var writeCommand = new Command9("write").description("Write a file to the MCP sa
         "MISSING_CONTENT"
       );
     }
-    const spinner = ora7(`Writing ${path}...`).start();
+    const spinner = ora8(`Writing ${path}...`).start();
     const result = await api.post(
       `/api/mcp/sandboxes/${mcpId}/files`,
       {
@@ -1149,14 +1448,14 @@ var writeCommand = new Command9("write").description("Write a file to the MCP sa
 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 chalk6 from "chalk";
 import { Command as Command11 } from "commander";
-import ora8 from "ora";
+import ora9 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 spinner = ora9("Fetching MCPs...").start();
     const mcps = await api.get(
       `/api/mcp/sandboxes${options.all ? "?all=true" : ""}`
     );
@@ -1179,12 +1478,12 @@ var listCommand2 = new Command11("list").description("List all MCPs in your orga
         console.log("\nCreate a new MCP sandbox: waniwani mcp create <name>");
         return;
       }
-      console.log(chalk5.bold("\nMCPs:\n"));
+      console.log(chalk6.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;
+        const statusColor = m.status === "active" ? chalk6.green : m.status === "stopped" ? chalk6.red : chalk6.yellow;
         return [
-          isActive ? chalk5.cyan(`* ${m.id.slice(0, 8)}`) : `  ${m.id.slice(0, 8)}`,
+          isActive ? chalk6.cyan(`* ${m.id.slice(0, 8)}`) : `  ${m.id.slice(0, 8)}`,
           m.name,
           statusColor(m.status),
           m.previewUrl,
@@ -1198,7 +1497,7 @@ var listCommand2 = new Command11("list").description("List all MCPs in your orga
       );
       console.log();
       if (activeMcpId) {
-        console.log(`Active MCP: ${chalk5.cyan(activeMcpId.slice(0, 8))}`);
+        console.log(`Active MCP: ${chalk6.cyan(activeMcpId.slice(0, 8))}`);
       }
       console.log("\nSelect an MCP: waniwani mcp use <name>");
     }
@@ -1209,9 +1508,9 @@ var listCommand2 = new Command11("list").description("List all MCPs in your orga
 });
 
 // src/commands/mcp/logs.ts
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 import { Command as Command12 } from "commander";
-import ora9 from "ora";
+import ora10 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;
@@ -1243,7 +1542,7 @@ var logsCommand = new Command12("logs").description("Stream logs from the MCP se
     }
     let cmdId = cmdIdArg;
     if (!cmdId) {
-      const spinner = ora9("Getting server status...").start();
+      const spinner = ora10("Getting server status...").start();
       const status = await api.post(
         `/api/mcp/sandboxes/${mcpId}/server`,
         { action: "status" }
@@ -1260,8 +1559,8 @@ var logsCommand = new Command12("logs").description("Stream logs from the MCP se
     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"));
+      console.log(chalk7.gray(`Streaming logs for command ${cmdId}...`));
+      console.log(chalk7.gray("Press Ctrl+C to stop\n"));
     }
     const response = await fetch(url, {
       method: "GET",
@@ -1285,10 +1584,10 @@ var logsCommand = new Command12("logs").description("Stream logs from the MCP se
           process.stdout.write(data.stdout);
         }
         if (data.stderr) {
-          process.stderr.write(chalk6.red(data.stderr));
+          process.stderr.write(chalk7.red(data.stderr));
         }
         if (data.exitCode !== void 0) {
-          console.log(chalk6.gray(`
+          console.log(chalk7.gray(`
 Exit code: ${data.exitCode}`));
         }
       }
@@ -1327,18 +1626,18 @@ Exit code: ${data.exitCode}`));
               if (event.stream === "stdout") {
                 process.stdout.write(event.data);
               } else if (event.stream === "stderr") {
-                process.stderr.write(chalk6.red(event.data));
+                process.stderr.write(chalk7.red(event.data));
               }
             }
             if (event.exitCode !== void 0) {
-              const exitColor = event.exitCode === 0 ? chalk6.green : chalk6.red;
+              const exitColor = event.exitCode === 0 ? chalk7.green : chalk7.red;
               console.log(
                 exitColor(`
 Process exited with code ${event.exitCode}`)
               );
             }
             if (event.error) {
-              console.error(chalk6.red(`
+              console.error(chalk7.red(`
 Error: ${event.error}`));
             }
           } catch {
@@ -1359,9 +1658,9 @@ Error: ${event.error}`));
 });
 
 // src/commands/mcp/run-command.ts
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 import { Command as Command13 } from "commander";
-import ora10 from "ora";
+import ora11 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)"
@@ -1379,7 +1678,7 @@ var runCommandCommand = new Command13("run-command").description("Run a command
       }
     }
     const timeout = options.timeout ? Number.parseInt(options.timeout, 10) : void 0;
-    const spinner = ora10(`Running: ${cmd} ${args.join(" ")}`.trim()).start();
+    const spinner = ora11(`Running: ${cmd} ${args.join(" ")}`.trim()).start();
     const result = await api.post(
       `/api/mcp/sandboxes/${mcpId}/commands`,
       {
@@ -1394,7 +1693,7 @@ var runCommandCommand = new Command13("run-command").description("Run a command
       formatOutput(result, true);
     } else {
       const cmdLine = [cmd, ...args].join(" ");
-      console.log(chalk7.gray(`$ ${cmdLine}`));
+      console.log(chalk8.gray(`$ ${cmdLine}`));
       console.log();
       if (result.stdout) {
         process.stdout.write(result.stdout);
@@ -1403,16 +1702,16 @@ var runCommandCommand = new Command13("run-command").description("Run a command
         }
       }
       if (result.stderr) {
-        process.stderr.write(chalk7.red(result.stderr));
+        process.stderr.write(chalk8.red(result.stderr));
         if (!result.stderr.endsWith("\n")) {
           process.stderr.write("\n");
         }
       }
       console.log();
-      const exitColor = result.exitCode === 0 ? chalk7.green : chalk7.red;
+      const exitColor = result.exitCode === 0 ? chalk8.green : chalk8.red;
       console.log(
         exitColor(`Exit code: ${result.exitCode}`),
-        chalk7.gray(`(${(result.duration / 1e3).toFixed(2)}s)`)
+        chalk8.gray(`(${(result.duration / 1e3).toFixed(2)}s)`)
       );
     }
     if (result.exitCode !== 0) {
@@ -1425,9 +1724,9 @@ var runCommandCommand = new Command13("run-command").description("Run a command
 });
 
 // src/commands/mcp/start.ts
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 import { Command as Command14 } from "commander";
-import ora11 from "ora";
+import ora12 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;
@@ -1441,7 +1740,7 @@ var startCommand = new Command14("start").description("Start the MCP server (npm
         );
       }
     }
-    const spinner = ora11("Starting MCP server...").start();
+    const spinner = ora12("Starting MCP server...").start();
     const result = await api.post(
       `/api/mcp/sandboxes/${mcpId}/server`,
       { action: "start" }
@@ -1454,13 +1753,13 @@ var startCommand = new Command14("start").description("Start the MCP server (npm
       formatList(
         [
           { label: "Command ID", value: result.cmdId },
-          { label: "Preview URL", value: chalk8.cyan(result.previewUrl) }
+          { label: "Preview URL", value: chalk9.cyan(result.previewUrl) }
         ],
         false
       );
       console.log();
       console.log(
-        chalk8.gray("Run 'waniwani mcp logs' to stream server output")
+        chalk9.gray("Run 'waniwani mcp logs' to stream server output")
       );
     }
   } catch (error) {
@@ -1470,9 +1769,9 @@ var startCommand = new Command14("start").description("Start the MCP server (npm
 });
 
 // src/commands/mcp/status.ts
-import chalk9 from "chalk";
+import chalk10 from "chalk";
 import { Command as Command15 } from "commander";
-import ora12 from "ora";
+import ora13 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;
@@ -1486,7 +1785,7 @@ var statusCommand = new Command15("status").description("Show current MCP sandbo
         );
       }
     }
-    const spinner = ora12("Fetching MCP status...").start();
+    const spinner = ora13("Fetching MCP status...").start();
     const [result, serverStatus] = await Promise.all([
       api.get(`/api/mcp/sandboxes/${mcpId}`),
       api.post(`/api/mcp/sandboxes/${mcpId}/server`, {
@@ -1501,9 +1800,9 @@ var statusCommand = new Command15("status").description("Show current MCP sandbo
     if (json) {
       formatOutput({ ...result, server: serverStatus }, true);
     } else {
-      const statusColor = result.status === "active" ? chalk9.green : chalk9.red;
+      const statusColor = result.status === "active" ? chalk10.green : chalk10.red;
       const serverRunning = serverStatus.running;
-      const serverStatusColor = serverRunning ? chalk9.green : chalk9.yellow;
+      const serverStatusColor = serverRunning ? chalk10.green : chalk10.yellow;
       formatList(
         [
           { label: "MCP ID", value: result.id },
@@ -1530,7 +1829,7 @@ var statusCommand = new Command15("status").description("Show current MCP sandbo
 
 // src/commands/mcp/stop.ts
 import { Command as Command16 } from "commander";
-import ora13 from "ora";
+import ora14 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;
@@ -1544,7 +1843,7 @@ var stopCommand = new Command16("stop").description("Stop the MCP server process
         );
       }
     }
-    const spinner = ora13("Stopping MCP server...").start();
+    const spinner = ora14("Stopping MCP server...").start();
     const result = await api.post(
       `/api/mcp/sandboxes/${mcpId}/server`,
       { action: "stop" }
@@ -1566,9 +1865,9 @@ var stopCommand = new Command16("stop").description("Stop the MCP server process
 });
 
 // src/commands/mcp/test.ts
-import chalk10 from "chalk";
+import chalk11 from "chalk";
 import { Command as Command17 } from "commander";
-import ora14 from "ora";
+import ora15 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();
@@ -1584,7 +1883,7 @@ var testCommand = new Command17("test").description("Test MCP tools via the sand
         }
       }
       if (!tool) {
-        const spinner = ora14("Fetching available tools...").start();
+        const spinner = ora15("Fetching available tools...").start();
         const result = await api.post(
           `/api/mcp/sandboxes/${mcpId}/test`,
           { action: "list" }
@@ -1597,7 +1896,7 @@ var testCommand = new Command17("test").description("Test MCP tools via the sand
           if (tools.length === 0) {
             console.log("No tools available.");
           } else {
-            console.log(chalk10.bold("\nAvailable Tools:\n"));
+            console.log(chalk11.bold("\nAvailable Tools:\n"));
             formatTable(
               ["Name", "Description"],
               tools.map((t) => [t.name, t.description || "No description"]),
@@ -1620,7 +1919,7 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
             );
           }
         }
-        const spinner = ora14(`Calling tool "${tool}"...`).start();
+        const spinner = ora15(`Calling tool "${tool}"...`).start();
         const startTime = Date.now();
         const result = await api.post(
           `/api/mcp/sandboxes/${mcpId}/test`,
@@ -1641,11 +1940,11 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
         if (json) {
           formatOutput(output, true);
         } else {
-          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(chalk11.bold("\nTool Result:\n"));
+          console.log(chalk11.gray("Tool:"), tool);
+          console.log(chalk11.gray("Input:"), JSON.stringify(toolArgs));
+          console.log(chalk11.gray("Duration:"), `${duration}ms`);
+          console.log(chalk11.gray("Result:"));
           console.log(JSON.stringify(result.result, null, 2));
         }
       }
@@ -1658,12 +1957,12 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
 
 // src/commands/mcp/use.ts
 import { Command as Command18 } from "commander";
-import ora15 from "ora";
+import ora16 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 = ora15("Fetching MCPs...").start();
+    const spinner = ora16("Fetching MCPs...").start();
     const mcps = await api.get("/api/admin/mcps");
     spinner.stop();
     const mcp = mcps.find((m) => m.name === name);
@@ -1699,20 +1998,20 @@ var useCommand = new Command18("use").description("Select an MCP to use for subs
 });
 
 // src/commands/mcp/index.ts
-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);
+var mcpCommand = new Command19("mcp").description("MCP sandbox management commands").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 Command22 } from "commander";
 
 // src/commands/org/list.ts
-import chalk11 from "chalk";
+import chalk12 from "chalk";
 import { Command as Command20 } from "commander";
-import ora16 from "ora";
+import ora17 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 = ora16("Fetching organizations...").start();
+    const spinner = ora17("Fetching organizations...").start();
     const result = await api.get("/api/oauth/orgs");
     spinner.stop();
     const { orgs, activeOrgId } = result;
@@ -1732,11 +2031,11 @@ var listCommand3 = new Command20("list").description("List your organizations").
         console.log("No organizations found.");
         return;
       }
-      console.log(chalk11.bold("\nOrganizations:\n"));
+      console.log(chalk12.bold("\nOrganizations:\n"));
       const rows = orgs.map((o) => {
         const isActive = o.id === activeOrgId;
         return [
-          isActive ? chalk11.cyan(`* ${o.name}`) : `  ${o.name}`,
+          isActive ? chalk12.cyan(`* ${o.name}`) : `  ${o.name}`,
           o.slug,
           o.role
         ];
@@ -1746,7 +2045,7 @@ var listCommand3 = new Command20("list").description("List your organizations").
       if (activeOrgId) {
         const activeOrg = orgs.find((o) => o.id === activeOrgId);
         if (activeOrg) {
-          console.log(`Active organization: ${chalk11.cyan(activeOrg.name)}`);
+          console.log(`Active organization: ${chalk12.cyan(activeOrg.name)}`);
         }
       }
       console.log("\nSwitch organization: waniwani org switch <name>");
@@ -1759,12 +2058,12 @@ var listCommand3 = new Command20("list").description("List your organizations").
 
 // src/commands/org/switch.ts
 import { Command as Command21 } from "commander";
-import ora17 from "ora";
+import ora18 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 = ora17("Fetching organizations...").start();
+    const spinner = ora18("Fetching organizations...").start();
     const { orgs } = await api.get("/api/oauth/orgs");
     const org = orgs.find((o) => o.name === name || o.slug === name);
     if (!org) {
@@ -1799,11 +2098,92 @@ var switchCommand = new Command21("switch").description("Switch to a different o
 // src/commands/org/index.ts
 var orgCommand = new Command22("org").description("Organization management commands").addCommand(listCommand3).addCommand(switchCommand);
 
-// src/commands/task.ts
-import chalk12 from "chalk";
+// src/commands/push.ts
+import chalk13 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) => {
+import ora19 from "ora";
+var BATCH_SIZE2 = 50;
+var pushCommand = new Command23("push").description("Sync local files to MCP sandbox").option("--dry-run", "Show what would be synced without uploading").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const cwd = process.cwd();
+    const projectRoot = await findProjectRoot(cwd);
+    if (!projectRoot) {
+      throw new CLIError(
+        "Not in a WaniWani project. Run 'waniwani init <name>' first.",
+        "NOT_IN_PROJECT"
+      );
+    }
+    const mcpId = await loadProjectMcpId(projectRoot);
+    if (!mcpId) {
+      throw new CLIError(
+        "No MCP ID found in project config. Run 'waniwani init <name>' first.",
+        "NO_MCP_ID"
+      );
+    }
+    const spinner = ora19("Collecting files...").start();
+    const files = await collectFiles(projectRoot);
+    if (files.length === 0) {
+      spinner.info("No files to sync");
+      if (json) {
+        formatOutput({ synced: 0, files: [] }, true);
+      }
+      return;
+    }
+    spinner.text = `Found ${files.length} files`;
+    if (options.dryRun) {
+      spinner.stop();
+      console.log();
+      console.log(chalk13.bold("Files that would be synced:"));
+      for (const file of files) {
+        console.log(`  ${file.path}`);
+      }
+      console.log();
+      console.log(`Total: ${files.length} files`);
+      return;
+    }
+    const allWritten = [];
+    const totalBatches = Math.ceil(files.length / BATCH_SIZE2);
+    for (let i = 0; i < totalBatches; i++) {
+      const batch = files.slice(i * BATCH_SIZE2, (i + 1) * BATCH_SIZE2);
+      spinner.text = `Syncing files (${i + 1}/${totalBatches})...`;
+      const result = await api.post(
+        `/api/mcp/sandboxes/${mcpId}/files`,
+        {
+          files: batch.map((f) => ({
+            path: f.path,
+            content: f.content,
+            encoding: f.encoding
+          }))
+        }
+      );
+      allWritten.push(...result.written);
+    }
+    spinner.succeed(`Synced ${allWritten.length} files`);
+    if (json) {
+      formatOutput(
+        {
+          synced: allWritten.length,
+          files: allWritten
+        },
+        true
+      );
+    } else {
+      console.log();
+      formatSuccess(`${allWritten.length} files synced to sandbox`, false);
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/task.ts
+import chalk14 from "chalk";
+import { Command as Command24 } from "commander";
+import ora20 from "ora";
+var taskCommand = new Command24("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 {
@@ -1827,10 +2207,10 @@ var taskCommand = new Command23("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(chalk12.bold("Task:"), prompt);
+      console.log(chalk14.bold("Task:"), prompt);
       console.log();
     }
-    const spinner = ora18("Starting task...").start();
+    const spinner = ora20("Starting task...").start();
     const baseUrl = await api.getBaseUrl();
     const response = await fetch(
       `${baseUrl}/api/mcp/sandboxes/${mcpId}/task`,
@@ -1884,7 +2264,7 @@ var taskCommand = new Command23("task").description("Send a task to Claude runni
               const event = parsed;
               steps.push({ type: "text", text: event.content });
               if (!json && event.content) {
-                console.log(chalk12.white(event.content));
+                console.log(chalk14.white(event.content));
               }
             } else if (parsed.type === "tool_call") {
               const event = parsed;
@@ -1895,24 +2275,24 @@ var taskCommand = new Command23("task").description("Send a task to Claude runni
                 output: event.output
               });
               if (!json) {
-                console.log(chalk12.cyan(`> Using tool: ${event.tool}`));
+                console.log(chalk14.cyan(`> Using tool: ${event.tool}`));
                 if (event.input?.command) {
-                  console.log(chalk12.gray(`  $ ${event.input.command}`));
+                  console.log(chalk14.gray(`  $ ${event.input.command}`));
                 }
                 if (event.output) {
                   const outputLines = event.output.split("\n");
                   if (outputLines.length > 10) {
                     console.log(
-                      chalk12.gray(outputLines.slice(0, 5).join("\n"))
+                      chalk14.gray(outputLines.slice(0, 5).join("\n"))
                     );
                     console.log(
-                      chalk12.gray(
+                      chalk14.gray(
                         `  ... (${outputLines.length - 10} more lines)`
                       )
                     );
-                    console.log(chalk12.gray(outputLines.slice(-5).join("\n")));
+                    console.log(chalk14.gray(outputLines.slice(-5).join("\n")));
                   } else {
-                    console.log(chalk12.gray(event.output));
+                    console.log(chalk14.gray(event.output));
                   }
                 }
                 console.log();
@@ -1939,12 +2319,12 @@ var taskCommand = new Command23("task").description("Send a task to Claude runni
     } else {
       console.log();
       console.log(
-        chalk12.green("\u2713"),
+        chalk14.green("\u2713"),
         `Task completed in ${finalStepCount} steps.`
       );
       if (maxStepsReached) {
         console.log(
-          chalk12.yellow("\u26A0"),
+          chalk14.yellow("\u26A0"),
           "Maximum steps reached. Task may be incomplete."
         );
       }
@@ -1957,10 +2337,12 @@ var taskCommand = new Command23("task").description("Send a task to Claude runni
 
 // src/cli.ts
 var version = "0.1.0";
-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");
+var program = new Command25().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);
+program.addCommand(pushCommand);
+program.addCommand(devCommand);
 program.addCommand(mcpCommand);
 program.addCommand(taskCommand);
 program.addCommand(orgCommand);