@waniwani/cli 0.0.33 → 0.0.35

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command as Command25 } from "commander";
+import { Command as Command24 } from "commander";
 
 // src/commands/config/index.ts
 import { Command as Command2 } from "commander";
@@ -14,30 +14,31 @@ import { Command } from "commander";
 // src/lib/config.ts
 import { existsSync } from "fs";
 import { mkdir, readFile, writeFile } from "fs/promises";
-import { homedir } from "os";
 import { join } from "path";
 import { z } from "zod";
 var LOCAL_CONFIG_DIR = ".waniwani";
 var CONFIG_FILE_NAME = "settings.json";
 var LOCAL_DIR = join(process.cwd(), LOCAL_CONFIG_DIR);
 var LOCAL_FILE = join(LOCAL_DIR, CONFIG_FILE_NAME);
-var GLOBAL_DIR = join(homedir(), LOCAL_CONFIG_DIR);
-var GLOBAL_FILE = join(GLOBAL_DIR, CONFIG_FILE_NAME);
 var DEFAULT_API_URL = "https://app.waniwani.ai";
 var ConfigSchema = z.object({
+  // Settings
+  sessionId: z.string().nullable().default(null),
   mcpId: z.string().nullable().default(null),
-  apiUrl: z.string().nullable().default(null)
+  apiUrl: z.string().default(DEFAULT_API_URL),
+  // Auth (merged from auth.json)
+  accessToken: z.string().nullable().default(null),
+  refreshToken: z.string().nullable().default(null),
+  expiresAt: z.string().nullable().default(null),
+  clientId: z.string().nullable().default(null)
 });
 var Config = class {
   dir;
   file;
   cache = null;
-  scope;
-  constructor(forceGlobal = false) {
-    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";
+  constructor() {
+    this.dir = LOCAL_DIR;
+    this.file = LOCAL_FILE;
   }
   async load() {
     if (!this.cache) {
@@ -56,6 +57,20 @@ var Config = class {
     await mkdir(this.dir, { recursive: true });
     await writeFile(this.file, JSON.stringify(data, null, "	"));
   }
+  /**
+   * Ensure the .waniwani directory exists in cwd.
+   * Used by login to create config before saving tokens.
+   */
+  async ensureConfigDir() {
+    await mkdir(this.dir, { recursive: true });
+  }
+  /**
+   * Check if a .waniwani config directory exists in cwd.
+   */
+  hasConfig() {
+    return existsSync(this.dir);
+  }
+  // --- Settings methods ---
   async getMcpId() {
     return (await this.load()).mcpId;
   }
@@ -64,21 +79,57 @@ var Config = class {
     data.mcpId = id;
     await this.save(data);
   }
-  async getApiUrl() {
-    if (process.env.WANIWANI_API_URL) return process.env.WANIWANI_API_URL;
-    return (await this.load()).apiUrl || DEFAULT_API_URL;
+  async getSessionId() {
+    return (await this.load()).sessionId;
   }
-  async setApiUrl(url) {
+  async setSessionId(id) {
     const data = await this.load();
-    data.apiUrl = url;
+    data.sessionId = id;
     await this.save(data);
   }
+  async getApiUrl() {
+    if (process.env.WANIWANI_API_URL) return process.env.WANIWANI_API_URL;
+    return (await this.load()).apiUrl;
+  }
   async clear() {
     await this.save(ConfigSchema.parse({}));
   }
+  // --- Auth methods ---
+  async getAccessToken() {
+    return (await this.load()).accessToken;
+  }
+  async getRefreshToken() {
+    return (await this.load()).refreshToken;
+  }
+  async getClientId() {
+    return (await this.load()).clientId;
+  }
+  async setTokens(accessToken, refreshToken, expiresIn, clientId) {
+    const expiresAt = new Date(Date.now() + expiresIn * 1e3).toISOString();
+    const data = await this.load();
+    data.accessToken = accessToken;
+    data.refreshToken = refreshToken;
+    data.expiresAt = expiresAt;
+    if (clientId) {
+      data.clientId = clientId;
+    }
+    await this.save(data);
+  }
+  async clearAuth() {
+    const data = await this.load();
+    data.accessToken = null;
+    data.refreshToken = null;
+    data.expiresAt = null;
+    data.clientId = null;
+    await this.save(data);
+  }
+  async isTokenExpired() {
+    const data = await this.load();
+    if (!data.expiresAt) return true;
+    return new Date(data.expiresAt).getTime() - 5 * 60 * 1e3 < Date.now();
+  }
 };
 var config = new Config();
-var globalConfig = new Config(true);
 async function initConfigAt(dir, overrides = {}) {
   const configDir = join(dir, LOCAL_CONFIG_DIR);
   const configPath = join(configDir, CONFIG_FILE_NAME);
@@ -235,90 +286,37 @@ var configInitCommand = new Command("init").description("Initialize .waniwani co
 // src/commands/config/index.ts
 var configCommand = new Command2("config").description("Manage WaniWani configuration").addCommand(configInitCommand);
 
-// src/commands/dev.ts
-import { relative as relative2 } from "path";
+// src/commands/login.ts
+import { spawn } from "child_process";
+import { createServer } from "http";
 import chalk3 from "chalk";
-import chokidar from "chokidar";
 import { Command as Command3 } from "commander";
 import ora from "ora";
 
 // src/lib/auth.ts
-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 { z as z2 } from "zod";
-var CONFIG_DIR = join3(homedir2(), ".waniwani");
-var AUTH_FILE = join3(CONFIG_DIR, "auth.json");
-var AuthStoreSchema = z2.object({
-  accessToken: z2.string().nullable().default(null),
-  refreshToken: z2.string().nullable().default(null),
-  expiresAt: z2.string().nullable().default(null),
-  clientId: z2.string().nullable().default(null)
-});
-async function ensureConfigDir() {
-  await mkdir2(CONFIG_DIR, { recursive: true });
-}
-async function readAuthStore() {
-  await ensureConfigDir();
-  try {
-    await access(AUTH_FILE);
-    const content = await readFile2(AUTH_FILE, "utf-8");
-    return AuthStoreSchema.parse(JSON.parse(content));
-  } catch {
-    return AuthStoreSchema.parse({});
-  }
-}
-async function writeAuthStore(store) {
-  await ensureConfigDir();
-  await writeFile2(AUTH_FILE, JSON.stringify(store, null, 2), "utf-8");
-}
 var AuthManager = class {
-  storeCache = null;
-  async getStore() {
-    if (!this.storeCache) {
-      this.storeCache = await readAuthStore();
-    }
-    return this.storeCache;
-  }
-  async saveStore(store) {
-    this.storeCache = store;
-    await writeAuthStore(store);
-  }
   async isLoggedIn() {
-    const store = await this.getStore();
-    return !!store.accessToken;
+    const token = await config.getAccessToken();
+    return !!token;
   }
   async getAccessToken() {
-    const store = await this.getStore();
-    return store.accessToken;
+    return config.getAccessToken();
   }
   async getRefreshToken() {
-    const store = await this.getStore();
-    return store.refreshToken;
+    return config.getRefreshToken();
   }
   async setTokens(accessToken, refreshToken, expiresIn, clientId) {
-    const expiresAt = new Date(Date.now() + expiresIn * 1e3).toISOString();
-    const store = await this.getStore();
-    store.accessToken = accessToken;
-    store.refreshToken = refreshToken;
-    store.expiresAt = expiresAt;
-    if (clientId) {
-      store.clientId = clientId;
-    }
-    await this.saveStore(store);
+    return config.setTokens(accessToken, refreshToken, expiresIn, clientId);
   }
   async clear() {
-    const emptyStore = AuthStoreSchema.parse({});
-    await this.saveStore(emptyStore);
+    return config.clearAuth();
   }
   async isTokenExpired() {
-    const store = await this.getStore();
-    if (!store.expiresAt) return true;
-    return new Date(store.expiresAt).getTime() - 5 * 60 * 1e3 < Date.now();
+    return config.isTokenExpired();
   }
   async tryRefreshToken() {
-    const store = await this.getStore();
-    const { refreshToken, clientId } = store;
+    const refreshToken = await config.getRefreshToken();
+    const clientId = await config.getClientId();
     if (!refreshToken || !clientId) return false;
     try {
       const apiUrl = await config.getApiUrl();
@@ -350,532 +348,53 @@ var AuthManager = class {
 };
 var auth = new AuthManager();
 
-// 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 existsSync3 } from "fs";
-import { mkdir as mkdir3, readdir, readFile as readFile3, stat, writeFile as writeFile3 } from "fs/promises";
-import { dirname, join as join4, 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);
-  };
+// src/commands/login.ts
+var CALLBACK_PORT = 54321;
+var CALLBACK_URL = `http://localhost:${CALLBACK_PORT}/callback`;
+var CLIENT_NAME = "waniwani-cli";
+function generateCodeVerifier() {
+  const array = new Uint8Array(32);
+  crypto.getRandomValues(array);
+  return btoa(String.fromCharCode(...array)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-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);
+async function generateCodeChallenge(verifier) {
+  const encoder = new TextEncoder();
+  const data = encoder.encode(verifier);
+  const hash = await crypto.subtle.digest("SHA-256", data);
+  return btoa(String.fromCharCode(...new Uint8Array(hash))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-function detectBinary(buffer) {
-  const sample = buffer.subarray(0, 8192);
-  return sample.includes(0);
+function generateState() {
+  const array = new Uint8Array(16);
+  crypto.getRandomValues(array);
+  return Array.from(array, (b) => b.toString(16).padStart(2, "0")).join("");
 }
-
-// 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 (existsSync3(join4(current, PROJECT_DIR))) {
-      return current;
-    }
-    const parent = dirname(current);
-    if (parent === current) break;
-    current = parent;
-  }
-  if (existsSync3(join4(current, PROJECT_DIR))) {
-    return current;
+async function registerClient() {
+  const apiUrl = await config.getApiUrl();
+  const response = await fetch(`${apiUrl}/api/auth/oauth2/register`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      client_name: CLIENT_NAME,
+      redirect_uris: [CALLBACK_URL],
+      grant_types: ["authorization_code", "refresh_token"],
+      response_types: ["code"],
+      token_endpoint_auth_method: "none"
+    })
+  });
+  if (!response.ok) {
+    const error = await response.json().catch(() => ({}));
+    throw new CLIError(
+      error.error_description || "Failed to register OAuth client",
+      "CLIENT_REGISTRATION_FAILED"
+    );
   }
-  return null;
+  return response.json();
 }
-async function loadProjectMcpId(projectRoot) {
-  const settingsPath = join4(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 = join4(projectRoot, ".gitignore");
-  if (existsSync3(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 = join4(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 = join4(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 = join4(projectRoot, filePath);
-  const relativePath = relative(projectRoot, fullPath);
-  if (!existsSync3(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 Command3("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(chalk3.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(chalk3.green("Synced:"), relativePath);
-      } catch (error) {
-        console.log(chalk3.red("Failed:"), relativePath);
-        if (globalOptions.verbose) {
-          console.error(error);
-        }
-      }
-    }, debounceMs);
-    console.log();
-    console.log(chalk3.bold("Watching for changes..."));
-    console.log(chalk3.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(chalk3.yellow("Deleted (local only):"), relativePath);
-    });
-    const cleanup = () => {
-      console.log();
-      console.log(chalk3.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 existsSync4 } from "fs";
-import { mkdir as mkdir4, readFile as readFile4 } from "fs/promises";
-import { join as join5 } from "path";
-import { Command as Command4 } from "commander";
-import ora2 from "ora";
-async function loadParentConfig(cwd) {
-  const parentConfigPath = join5(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
-  if (!existsSync4(parentConfigPath)) {
-    return null;
-  }
-  try {
-    const content = await readFile4(parentConfigPath, "utf-8");
-    const config2 = JSON.parse(content);
-    const { mcpId: _, ...rest } = config2;
-    return rest;
-  } catch {
-    return null;
-  }
-}
-var initCommand = new Command4("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 = join5(cwd, name);
-    if (existsSync4(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 parentConfig = await loadParentConfig(cwd);
-    await initConfigAt(projectDir, {
-      ...parentConfig,
-      mcpId: result.id
-      // Always use the new sandbox's mcpId
-    });
-    spinner.succeed("MCP project created");
-    if (json) {
-      formatOutput(
-        {
-          success: true,
-          projectDir,
-          mcpId: result.id,
-          sandboxId: result.sandboxId,
-          previewUrl: result.previewUrl
-        },
-        true
-      );
-    } 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);
-  }
-});
-
-// src/commands/login.ts
-import { spawn } from "child_process";
-import { createServer } from "http";
-import chalk4 from "chalk";
-import { Command as Command5 } from "commander";
-import ora3 from "ora";
-var CALLBACK_PORT = 54321;
-var CALLBACK_URL = `http://localhost:${CALLBACK_PORT}/callback`;
-var CLIENT_NAME = "waniwani-cli";
-function generateCodeVerifier() {
-  const array = new Uint8Array(32);
-  crypto.getRandomValues(array);
-  return btoa(String.fromCharCode(...array)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-async function generateCodeChallenge(verifier) {
-  const encoder = new TextEncoder();
-  const data = encoder.encode(verifier);
-  const hash = await crypto.subtle.digest("SHA-256", data);
-  return btoa(String.fromCharCode(...new Uint8Array(hash))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-function generateState() {
-  const array = new Uint8Array(16);
-  crypto.getRandomValues(array);
-  return Array.from(array, (b) => b.toString(16).padStart(2, "0")).join("");
-}
-async function registerClient() {
-  const apiUrl = await config.getApiUrl();
-  const response = await fetch(`${apiUrl}/api/auth/oauth2/register`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      client_name: CLIENT_NAME,
-      redirect_uris: [CALLBACK_URL],
-      grant_types: ["authorization_code", "refresh_token"],
-      response_types: ["code"],
-      token_endpoint_auth_method: "none"
-    })
-  });
-  if (!response.ok) {
-    const error = await response.json().catch(() => ({}));
-    throw new CLIError(
-      error.error_description || "Failed to register OAuth client",
-      "CLIENT_REGISTRATION_FAILED"
-    );
-  }
-  return response.json();
-}
-async function openBrowser(url) {
-  const [cmd, ...args] = process.platform === "darwin" ? ["open", url] : process.platform === "win32" ? ["cmd", "/c", "start", url] : ["xdg-open", url];
-  spawn(cmd, args, { stdio: "ignore", detached: true }).unref();
+async function openBrowser(url) {
+  const [cmd, ...args] = process.platform === "darwin" ? ["open", url] : process.platform === "win32" ? ["cmd", "/c", "start", url] : ["xdg-open", url];
+  spawn(cmd, args, { stdio: "ignore", detached: true }).unref();
 }
 async function waitForCallback(expectedState, timeoutMs = 3e5) {
   return new Promise((resolve, reject) => {
@@ -949,7 +468,10 @@ async function waitForCallback(expectedState, timeoutMs = 3e5) {
       text-align: center;
     }
     .logo {
-      height: 40px;
+      font-size: 1.75rem;
+      font-weight: 700;
+      color: #1e293b;
+      letter-spacing: -0.025em;
     }
     .icon-circle {
       width: 80px;
@@ -982,9 +504,7 @@ async function waitForCallback(expectedState, timeoutMs = 3e5) {
   <div class="blob blob-2"></div>
   <div class="blob blob-3"></div>
   <div class="container">
-    <svg class="logo" viewBox="0 0 248 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <text x="0" y="32" font-family="system-ui" font-size="28" font-weight="bold" fill="#1e293b">WaniWani</text>
-    </svg>
+    <span class="logo">WaniWani</span>
     <div class="icon-circle">
       ${isSuccess ? '<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6 9 17l-5-5"></path></svg>' : '<svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 6 6 18"></path><path d="m6 6 12 12"></path></svg>'}
     </div>
@@ -1104,7 +624,7 @@ async function exchangeCodeForToken(code, codeVerifier, clientId, resource) {
   }
   return response.json();
 }
-var loginCommand = new Command5("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 {
@@ -1116,14 +636,14 @@ var loginCommand = new Command5("login").description("Log in to WaniWani").optio
             formatOutput({ alreadyLoggedIn: true, refreshed: true }, true);
           } else {
             console.log(
-              chalk4.green("Session refreshed. You're still logged in.")
+              chalk3.green("Session refreshed. You're still logged in.")
             );
           }
           return;
         }
         if (!json) {
           console.log(
-            chalk4.yellow("Session expired. Starting new login flow...")
+            chalk3.yellow("Session expired. Starting new login flow...")
           );
         }
         await auth.clear();
@@ -1132,7 +652,7 @@ var loginCommand = new Command5("login").description("Log in to WaniWani").optio
           formatOutput({ alreadyLoggedIn: true }, true);
         } else {
           console.log(
-            chalk4.yellow(
+            chalk3.yellow(
               "Already logged in. Use 'waniwani logout' to log out first."
             )
           );
@@ -1141,9 +661,9 @@ var loginCommand = new Command5("login").description("Log in to WaniWani").optio
       }
     }
     if (!json) {
-      console.log(chalk4.bold("\nWaniWani CLI Login\n"));
+      console.log(chalk3.bold("\nWaniWani CLI Login\n"));
     }
-    const spinner = ora3("Registering client...").start();
+    const spinner = ora("Registering client...").start();
     const { client_id: clientId } = await registerClient();
     spinner.text = "Preparing authentication...";
     const codeVerifier = generateCodeVerifier();
@@ -1163,7 +683,7 @@ var loginCommand = new Command5("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(chalk4.cyan(`  ${authUrl.toString()}`));
+      console.log(chalk3.cyan(`  ${authUrl.toString()}`));
       console.log();
     }
     const callbackPromise = waitForCallback(state);
@@ -1180,6 +700,7 @@ var loginCommand = new Command5("login").description("Log in to WaniWani").optio
       apiUrl
       // RFC 8707 resource parameter
     );
+    await config.ensureConfigDir();
     await auth.setTokens(
       tokenResponse.access_token,
       tokenResponse.refresh_token,
@@ -1209,8 +730,8 @@ var loginCommand = new Command5("login").description("Log in to WaniWani").optio
 });
 
 // src/commands/logout.ts
-import { Command as Command6 } from "commander";
-var logoutCommand = new Command6("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 {
@@ -1238,76 +759,487 @@ var logoutCommand = new Command6("logout").description("Log out from WaniWani").
 import { Command as Command20 } from "commander";
 
 // src/commands/mcp/delete.ts
-import { Command as Command7 } from "commander";
-import ora4 from "ora";
-var deleteCommand = new Command7("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 = ora4("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);
-  }
-});
+import { confirm } from "@inquirer/prompts";
+import chalk4 from "chalk";
+import { Command as Command5 } from "commander";
+import ora2 from "ora";
 
-// src/commands/mcp/deploy.ts
-import { Command as Command8 } from "commander";
-import ora5 from "ora";
-var deployCommand = new Command8("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 {
-    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>'."
-        );
+// 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."
+      );
     }
-    const spinner = ora5("Deploying to GitHub...").start();
-    const result = await api.post(
-      `/api/mcp/sandboxes/${mcpId}/deploy`,
-      {
-        repoName: options.repo,
-        org: options.org,
-        private: options.private ?? false
+    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/utils.ts
+async function requireMcpId(mcpId) {
+  if (mcpId) return mcpId;
+  const configMcpId = await config.getMcpId();
+  if (!configMcpId) {
+    throw new McpError(
+      "No active MCP. Run 'waniwani mcp init <name>' or 'waniwani mcp use <name>'."
+    );
+  }
+  return configMcpId;
+}
+async function requireSessionId() {
+  const sessionId = await config.getSessionId();
+  if (!sessionId) {
+    throw new McpError(
+      "No active session. Run 'waniwani mcp dev' to start development."
+    );
+  }
+  return sessionId;
+}
+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/commands/mcp/delete.ts
+var deleteCommand = new Command5("delete").description("Delete the MCP (includes all associated resources)").option("--mcp-id <id>", "Specific MCP ID").option("--force", "Skip confirmation prompt").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const mcpId = await requireMcpId(options.mcpId);
+    const mcp = await api.get(
+      `/api/mcp/repositories/${mcpId}`
+    );
+    if (!options.force && !json) {
+      console.log();
+      console.log(chalk4.yellow("This will permanently delete:"));
+      console.log(`  - MCP: ${mcp.name}`);
+      if (mcp.activeSandbox) {
+        console.log("  - Active sandbox");
+      }
+      console.log();
+      const confirmed = await confirm({
+        message: `Delete "${mcp.name}"?`,
+        default: false
+      });
+      if (!confirmed) {
+        console.log("Cancelled.");
+        return;
+      }
+    }
+    const spinner = ora2("Deleting MCP...").start();
+    await api.delete(`/api/mcp/repositories/${mcpId}`);
+    spinner.succeed("MCP deleted");
+    if (await config.getMcpId() === mcpId) {
+      await config.setMcpId(null);
+      await config.setSessionId(null);
+    }
+    if (json) {
+      formatOutput({ deleted: mcpId }, true);
+    } else {
+      formatSuccess("MCP deleted.", false);
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/mcp/deploy.ts
+import { input } from "@inquirer/prompts";
+import { Command as Command6 } from "commander";
+import ora3 from "ora";
+
+// src/lib/sync.ts
+import { existsSync as existsSync3 } from "fs";
+import { mkdir as mkdir2, readdir, readFile as readFile2, stat, writeFile as writeFile2 } from "fs/promises";
+import { dirname, join as join3, relative } from "path";
+import ignore from "ignore";
+var PROJECT_DIR = ".waniwani";
+async function findProjectRoot(startDir) {
+  let current = startDir;
+  const root = dirname(current);
+  while (current !== root) {
+    if (existsSync3(join3(current, PROJECT_DIR))) {
+      return current;
+    }
+    const parent = dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  if (existsSync3(join3(current, PROJECT_DIR))) {
+    return current;
+  }
+  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 (existsSync3(gitignorePath)) {
+    try {
+      const content = await readFile2(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 readFile2(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 pullFilesFromGithub(mcpId, targetDir) {
+  const result = await api.get(
+    `/api/mcp/repositories/${mcpId}/files`
+  );
+  const writtenFiles = [];
+  for (const file of result.files) {
+    const localPath = join3(targetDir, file.path);
+    const dir = dirname(localPath);
+    await mkdir2(dir, { recursive: true });
+    if (file.encoding === "base64") {
+      await writeFile2(localPath, Buffer.from(file.content, "base64"));
+    } else {
+      await writeFile2(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 (!existsSync3(fullPath)) {
+    return null;
+  }
+  try {
+    const fileStat = await stat(fullPath);
+    if (!fileStat.isFile()) {
+      return null;
+    }
+    const content = await readFile2(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/mcp/deploy.ts
+var deployCommand = new Command6("deploy").description("Push local files to GitHub and trigger deployment").option("-m, --message <msg>", "Commit message").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const mcpId = await requireMcpId(options.mcpId);
+    const projectRoot = await findProjectRoot(process.cwd());
+    if (!projectRoot) {
+      throw new CLIError(
+        "Not in a WaniWani project. Run 'waniwani mcp init <name>' first.",
+        "NOT_IN_PROJECT"
+      );
+    }
+    let message = options.message;
+    if (!message) {
+      message = await input({
+        message: "Commit message:",
+        validate: (value) => value.trim() ? true : "Commit message is required"
+      });
+    }
+    const spinner = ora3("Collecting files...").start();
+    const files = await collectFiles(projectRoot);
+    if (files.length === 0) {
+      spinner.fail("No files to deploy");
+      return;
+    }
+    spinner.text = `Pushing ${files.length} files to GitHub...`;
+    const result = await api.post(
+      `/api/mcp/repositories/${mcpId}/deploy`,
+      { files, message }
     );
-    spinner.succeed("Deployment complete!");
+    spinner.succeed(`Pushed to GitHub (${result.commitSha.slice(0, 7)})`);
     if (json) {
       formatOutput(result, true);
     } else {
       console.log();
-      formatSuccess("MCP server deployed!", false);
+      formatSuccess("Files pushed to GitHub!", false);
       console.log();
-      console.log(`  Repository: ${result.repository.url}`);
-      if (result.deployment.url) {
-        console.log(`  Deployment: ${result.deployment.url}`);
+      console.log("Deployment will start automatically via webhook.");
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
+
+// src/commands/mcp/dev.ts
+import { watch } from "chokidar";
+import { Command as Command7 } from "commander";
+import ora4 from "ora";
+var devCommand = new Command7("dev").description("Start live development with sandbox and file watching").option("--mcp-id <id>", "Specific MCP ID").option("--no-watch", "Skip file watching").option("--no-logs", "Don't stream logs to terminal").action(async (options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const projectRoot = await findProjectRoot(process.cwd());
+    if (!projectRoot) {
+      throw new CLIError(
+        "Not in a WaniWani project. Run 'waniwani mcp init <name>' first.",
+        "NOT_IN_PROJECT"
+      );
+    }
+    let mcpId = options.mcpId;
+    if (!mcpId) {
+      mcpId = await config.getMcpId();
+    }
+    if (!mcpId) {
+      throw new CLIError(
+        "No MCP found. Run 'waniwani mcp init <name>' or use --mcp-id.",
+        "NO_MCP"
+      );
+    }
+    const spinner = ora4("Starting development environment...").start();
+    spinner.text = "Starting session...";
+    let sessionId;
+    try {
+      const sessionResponse = await api.post(
+        `/api/mcp/repositories/${mcpId}/session`,
+        {}
+      );
+      sessionId = sessionResponse.sandbox.id;
+    } catch {
+      const existing = await api.get(
+        `/api/mcp/repositories/${mcpId}/session`
+      );
+      if (!existing) {
+        throw new CLIError("Failed to start session", "SESSION_ERROR");
       }
+      sessionId = existing.id;
+    }
+    await config.setSessionId(sessionId);
+    spinner.text = "Syncing files to sandbox...";
+    const files = await collectFiles(projectRoot);
+    if (files.length > 0) {
+      await api.post(
+        `/api/mcp/sessions/${sessionId}/files`,
+        { files }
+      );
+    }
+    spinner.text = "Starting MCP server...";
+    const serverResult = await api.post(
+      `/api/mcp/sessions/${sessionId}/server`,
+      { action: "start" }
+    );
+    spinner.succeed("Development environment ready");
+    console.log();
+    formatSuccess("Live preview started!", false);
+    console.log();
+    console.log(`  Preview URL: ${serverResult.previewUrl}`);
+    console.log();
+    console.log(`  MCP Inspector:`);
+    console.log(
+      `    npx @anthropic-ai/mcp-inspector@latest "${serverResult.previewUrl}/mcp"`
+    );
+    console.log();
+    if (options.watch !== false) {
+      console.log("Watching for file changes... (Ctrl+C to stop)");
       console.log();
-      if (result.deployment.note) {
-        console.log(`Note: ${result.deployment.note}`);
-      }
+      const ig = await loadIgnorePatterns(projectRoot);
+      const watcher = watch(projectRoot, {
+        ignored: (path) => {
+          const relative2 = path.replace(`${projectRoot}/`, "");
+          if (relative2 === path) return false;
+          return ig.ignores(relative2);
+        },
+        persistent: true,
+        ignoreInitial: true,
+        awaitWriteFinish: {
+          stabilityThreshold: 100,
+          pollInterval: 50
+        }
+      });
+      const syncFile = async (filePath) => {
+        const relativePath = filePath.replace(`${projectRoot}/`, "");
+        const file = await collectSingleFile(projectRoot, relativePath);
+        if (file) {
+          try {
+            await api.post(
+              `/api/mcp/sessions/${sessionId}/files`,
+              { files: [file] }
+            );
+            console.log(`  Synced: ${relativePath}`);
+          } catch {
+            console.error(`  Failed to sync: ${relativePath}`);
+          }
+        }
+      };
+      watcher.on("add", syncFile);
+      watcher.on("change", syncFile);
+      watcher.on("unlink", (filePath) => {
+        const relativePath = filePath.replace(`${projectRoot}/`, "");
+        console.log(`  Deleted: ${relativePath}`);
+      });
+      process.on("SIGINT", async () => {
+        console.log();
+        console.log("Stopping development environment...");
+        await watcher.close();
+        process.exit(0);
+      });
+      await new Promise(() => {
+      });
     }
   } catch (error) {
     handleError(error, json);
@@ -1316,28 +1248,21 @@ var deployCommand = new Command8("deploy").description("Deploy MCP server to Git
 });
 
 // src/commands/mcp/file/index.ts
-import { Command as Command12 } from "commander";
+import { Command as Command11 } from "commander";
 
 // src/commands/mcp/file/list.ts
 import chalk5 from "chalk";
-import { Command as Command9 } from "commander";
-import ora6 from "ora";
-var listCommand = new Command9("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) => {
+import { Command as Command8 } from "commander";
+import ora5 from "ora";
+var listCommand = new Command8("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 {
-    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 = ora6(`Listing ${path}...`).start();
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
+    const spinner = ora5(`Listing ${path}...`).start();
     const result = await api.get(
-      `/api/mcp/sandboxes/${mcpId}/files/list?path=${encodeURIComponent(path)}`
+      `/api/mcp/sessions/${sessionId}/files/list?path=${encodeURIComponent(path)}`
     );
     spinner.stop();
     if (json) {
@@ -1371,26 +1296,19 @@ function formatSize(bytes) {
 }
 
 // src/commands/mcp/file/read.ts
-import { writeFile as writeFile4 } from "fs/promises";
-import { Command as Command10 } from "commander";
-import ora7 from "ora";
-var readCommand = new Command10("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) => {
+import { writeFile as writeFile3 } from "fs/promises";
+import { Command as Command9 } from "commander";
+import ora6 from "ora";
+var readCommand = new Command9("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 {
-    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>'."
-        );
-      }
-    }
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const encoding = options.base64 ? "base64" : "utf8";
-    const spinner = ora7(`Reading ${path}...`).start();
+    const spinner = ora6(`Reading ${path}...`).start();
     const result = await api.get(
-      `/api/mcp/sandboxes/${mcpId}/files?path=${encodeURIComponent(path)}&encoding=${encoding}`
+      `/api/mcp/sessions/${sessionId}/files?path=${encodeURIComponent(path)}&encoding=${encoding}`
     );
     spinner.stop();
     if (!result.exists) {
@@ -1398,7 +1316,7 @@ var readCommand = new Command10("read").description("Read a file from the MCP sa
     }
     if (options.output) {
       const buffer = result.encoding === "base64" ? Buffer.from(result.content, "base64") : Buffer.from(result.content, "utf8");
-      await writeFile4(options.output, buffer);
+      await writeFile3(options.output, buffer);
       if (json) {
         formatOutput({ path, savedTo: options.output }, true);
       } else {
@@ -1419,22 +1337,15 @@ var readCommand = new Command10("read").description("Read a file from the MCP sa
 });
 
 // src/commands/mcp/file/write.ts
-import { readFile as readFile5 } from "fs/promises";
-import { Command as Command11 } from "commander";
-import ora8 from "ora";
-var writeCommand = new Command11("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) => {
+import { readFile as readFile3 } from "fs/promises";
+import { Command as Command10 } from "commander";
+import ora7 from "ora";
+var writeCommand = new Command10("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>'."
-        );
-      }
-    }
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     let content;
     let encoding = "utf8";
     if (options.content) {
@@ -1443,7 +1354,7 @@ var writeCommand = new Command11("write").description("Write a file to the MCP s
         encoding = "base64";
       }
     } else if (options.file) {
-      const fileBuffer = await readFile5(options.file);
+      const fileBuffer = await readFile3(options.file);
       if (options.base64) {
         content = fileBuffer.toString("base64");
         encoding = "base64";
@@ -1456,9 +1367,9 @@ var writeCommand = new Command11("write").description("Write a file to the MCP s
         "MISSING_CONTENT"
       );
     }
-    const spinner = ora8(`Writing ${path}...`).start();
+    const spinner = ora7(`Writing ${path}...`).start();
     const result = await api.post(
-      `/api/mcp/sandboxes/${mcpId}/files`,
+      `/api/mcp/sessions/${sessionId}/files`,
       {
         files: [{ path, content, encoding }]
       }
@@ -1476,19 +1387,116 @@ var writeCommand = new Command11("write").description("Write a file to the MCP s
 });
 
 // src/commands/mcp/file/index.ts
-var fileCommand = new Command12("file").description("File operations in MCP sandbox").addCommand(readCommand).addCommand(writeCommand).addCommand(listCommand);
+var fileCommand = new Command11("file").description("File operations in MCP sandbox").addCommand(readCommand).addCommand(writeCommand).addCommand(listCommand);
+
+// src/commands/mcp/init.ts
+import { existsSync as existsSync4 } from "fs";
+import { readFile as readFile4 } from "fs/promises";
+import { join as join4 } from "path";
+import { Command as Command12 } from "commander";
+import { execa } from "execa";
+import ora8 from "ora";
+async function loadParentConfig(cwd) {
+  const parentConfigPath = join4(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
+  if (!existsSync4(parentConfigPath)) {
+    return null;
+  }
+  try {
+    const content = await readFile4(parentConfigPath, "utf-8");
+    const config2 = JSON.parse(content);
+    const { mcpId: _, sessionId: __, ...rest } = config2;
+    return rest;
+  } catch {
+    return null;
+  }
+}
+var initCommand = new Command12("init").description("Create a new MCP project").argument("<name>", "Name for the MCP project").option("--no-clone", "Skip automatic git clone (just output the command)").action(async (name, options, command) => {
+  const globalOptions = command.optsWithGlobals();
+  const json = globalOptions.json ?? false;
+  try {
+    const cwd = process.cwd();
+    const projectDir = join4(cwd, name);
+    if (existsSync4(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 = ora8("Creating MCP...").start();
+    const result = await api.post(
+      "/api/mcp/repositories",
+      { name }
+    );
+    if (options.clone !== false) {
+      spinner.text = "Cloning repository...";
+      await execa("git", ["clone", result.cloneUrl, name], { cwd });
+      spinner.text = "Setting up project config...";
+      const parentConfig = await loadParentConfig(cwd);
+      await initConfigAt(projectDir, {
+        ...parentConfig,
+        mcpId: result.repository.id
+      });
+      spinner.succeed("MCP project created");
+    } else {
+      spinner.succeed("MCP created");
+    }
+    if (json) {
+      formatOutput(
+        {
+          success: true,
+          projectDir: options.clone !== false ? projectDir : null,
+          mcpId: result.repository.id
+        },
+        true
+      );
+    } else {
+      console.log();
+      formatSuccess(`MCP "${name}" created!`, false);
+      console.log();
+      if (options.clone !== false) {
+        console.log("Next steps:");
+        console.log(`  cd ${name}`);
+        console.log(
+          "  waniwani mcp dev      # Start live preview with file watching"
+        );
+        console.log("  waniwani mcp push     # Deploy to production");
+      } else {
+        console.log("Clone your repository:");
+        console.log(`  ${result.cloneCommand}`);
+        console.log(`  cd ${name}`);
+        console.log();
+        console.log("Then start developing:");
+        console.log(
+          "  waniwani mcp dev      # Start live preview with file watching"
+        );
+        console.log("  waniwani mcp push     # Deploy to production");
+      }
+    }
+  } catch (error) {
+    handleError(error, json);
+    process.exit(1);
+  }
+});
 
 // src/commands/mcp/list.ts
 import chalk6 from "chalk";
 import { Command as Command13 } from "commander";
 import ora9 from "ora";
-var listCommand2 = new Command13("list").description("List all MCPs in your organization").option("--all", "Include stopped/expired MCPs").action(async (options, command) => {
+var listCommand2 = new Command13("list").description("List all MCPs in your organization").action(async (_, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
     const spinner = ora9("Fetching MCPs...").start();
     const mcps = await api.get(
-      `/api/mcp/sandboxes${options.all ? "?all=true" : ""}`
+      "/api/mcp/repositories"
     );
     spinner.stop();
     const activeMcpId = await config.getMcpId();
@@ -1506,29 +1514,29 @@ var listCommand2 = new Command13("list").description("List all MCPs in your orga
     } else {
       if (mcps.length === 0) {
         console.log("No MCPs found.");
-        console.log("\nCreate a new MCP sandbox: waniwani mcp create <name>");
+        console.log("\nCreate a new MCP: waniwani mcp init <name>");
         return;
       }
       console.log(chalk6.bold("\nMCPs:\n"));
       const rows = mcps.map((m) => {
         const isActive = m.id === activeMcpId;
-        const statusColor = m.status === "active" ? chalk6.green : m.status === "stopped" ? chalk6.red : chalk6.yellow;
+        const deployStatus = m.deployedAt ? chalk6.green("Deployed") : chalk6.yellow("Pending");
+        const sandboxStatus = m.activeSandbox ? chalk6.green("Active") : chalk6.gray("None");
+        const lastDeploy = m.deployedAt ? new Date(m.deployedAt).toLocaleDateString() : chalk6.gray("Never");
         return [
-          isActive ? chalk6.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"
+          isActive ? chalk6.cyan(`* ${m.name}`) : `  ${m.name}`,
+          deployStatus,
+          sandboxStatus,
+          lastDeploy
         ];
       });
-      formatTable(
-        ["ID", "Name", "Status", "Preview URL", "Created"],
-        rows,
-        false
-      );
+      formatTable(["Name", "Status", "Sandbox", "Last Deploy"], rows, false);
       console.log();
       if (activeMcpId) {
-        console.log(`Active MCP: ${chalk6.cyan(activeMcpId.slice(0, 8))}`);
+        const activeMcp = mcps.find((m) => m.id === activeMcpId);
+        if (activeMcp) {
+          console.log(`Active MCP: ${chalk6.cyan(activeMcp.name)}`);
+        }
       }
       console.log("\nSelect an MCP: waniwani mcp use <name>");
     }
@@ -1556,15 +1564,8 @@ var logsCommand = new Command14("logs").description("Stream logs from the MCP se
   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>'."
-        );
-      }
-    }
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const token = await auth.getAccessToken();
     if (!token) {
       throw new AuthError(
@@ -1575,20 +1576,20 @@ var logsCommand = new Command14("logs").description("Stream logs from the MCP se
     if (!cmdId) {
       const spinner = ora10("Getting server status...").start();
       const status = await api.post(
-        `/api/mcp/sandboxes/${mcpId}/server`,
+        `/api/mcp/sessions/${sessionId}/server`,
         { action: "status" }
       );
       spinner.stop();
       if (!status.running || !status.cmdId) {
         throw new McpError(
-          "No server is running. Run 'waniwani mcp start' first."
+          "No server is running. Run 'waniwani mcp dev' 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}`;
+    const url = `${baseUrl}/api/mcp/sessions/${sessionId}/commands/${cmdId}${streamParam}`;
     if (!json) {
       console.log(chalk7.gray(`Streaming logs for command ${cmdId}...`));
       console.log(chalk7.gray("Press Ctrl+C to stop\n"));
@@ -1699,19 +1700,12 @@ var runCommandCommand = new Command15("run-command").description("Run a 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>'."
-        );
-      }
-    }
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const timeout = options.timeout ? Number.parseInt(options.timeout, 10) : void 0;
     const spinner = ora11(`Running: ${cmd} ${args.join(" ")}`.trim()).start();
     const result = await api.post(
-      `/api/mcp/sandboxes/${mcpId}/commands`,
+      `/api/mcp/sessions/${sessionId}/commands`,
       {
         command: cmd,
         args: args.length > 0 ? args : void 0,
@@ -1754,49 +1748,76 @@ var runCommandCommand = new Command15("run-command").description("Run a command
   }
 });
 
-// src/commands/mcp/start.ts
+// src/commands/mcp/status.ts
 import chalk9 from "chalk";
 import { Command as Command16 } from "commander";
 import ora12 from "ora";
-var startCommand = new Command16("start").description("Start the MCP server (npm run dev)").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var statusCommand = new Command16("status").description("Show current MCP status").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 = ora12("Starting MCP server...").start();
-    const result = await api.post(
-      `/api/mcp/sandboxes/${mcpId}/server`,
-      { action: "start" }
+    const mcpId = await requireMcpId(options.mcpId);
+    const spinner = ora12("Fetching MCP status...").start();
+    const result = await api.get(
+      `/api/mcp/repositories/${mcpId}`
     );
-    spinner.succeed("MCP server started");
+    let serverStatus = null;
+    if (result.activeSandbox) {
+      serverStatus = await api.post(
+        `/api/mcp/sessions/${result.activeSandbox.id}/server`,
+        { action: "status" }
+      ).catch(() => null);
+    }
+    spinner.stop();
     if (json) {
-      formatOutput(result, true);
+      formatOutput({ ...result, server: serverStatus }, true);
     } else {
+      const deployStatus = result.deployedAt ? chalk9.green("Deployed") : chalk9.yellow("Pending");
+      const items = [
+        { label: "Name", value: result.name },
+        { label: "MCP ID", value: result.id },
+        { label: "Status", value: deployStatus },
+        {
+          label: "Last Deploy",
+          value: result.deployedAt ? new Date(result.deployedAt).toLocaleString() : chalk9.gray("Never")
+        },
+        {
+          label: "Created",
+          value: new Date(result.createdAt).toLocaleString()
+        }
+      ];
+      if (result.activeSandbox) {
+        const sandbox = result.activeSandbox;
+        const serverRunning = serverStatus?.running ?? sandbox.serverRunning;
+        const serverStatusColor = serverRunning ? chalk9.green : chalk9.yellow;
+        items.push(
+          { label: "", value: "" },
+          // Separator
+          { label: "Sandbox", value: chalk9.green("Active") },
+          { label: "Preview URL", value: sandbox.previewUrl },
+          {
+            label: "Server",
+            value: serverStatusColor(serverRunning ? "Running" : "Stopped")
+          },
+          {
+            label: "Expires",
+            value: sandbox.expiresAt ? new Date(sandbox.expiresAt).toLocaleString() : chalk9.gray("N/A")
+          }
+        );
+      } else {
+        items.push(
+          { label: "", value: "" },
+          // Separator
+          { label: "Sandbox", value: chalk9.gray("None") }
+        );
+      }
+      formatList(items, false);
       console.log();
-      formatList(
-        [
-          { label: "Command ID", value: result.cmdId },
-          { label: "Preview URL", value: chalk9.cyan(result.previewUrl) }
-        ],
-        false
-      );
-      console.log();
-      console.log(chalk9.bold("Test with MCP Inspector:"));
-      console.log(
-        `  npx @modelcontextprotocol/inspector --url ${result.previewUrl}/mcp`
-      );
-      console.log();
-      console.log(
-        chalk9.gray("Run 'waniwani mcp logs' to stream server output")
-      );
+      if (!result.activeSandbox) {
+        console.log("Start development: waniwani mcp dev");
+      } else if (!serverStatus?.running) {
+        console.log("View logs: waniwani mcp logs");
+      }
     }
   } catch (error) {
     handleError(error, json);
@@ -1804,58 +1825,31 @@ var startCommand = new Command16("start").description("Start the MCP server (npm
   }
 });
 
-// src/commands/mcp/status.ts
-import chalk10 from "chalk";
+// src/commands/mcp/stop.ts
 import { Command as Command17 } from "commander";
 import ora13 from "ora";
-var statusCommand = new Command17("status").description("Show current MCP sandbox status").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var stopCommand = new Command17("stop").description("Stop the development environment (sandbox + server)").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>' to create one or 'waniwani mcp use <name>' to select one."
-        );
-      }
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
+    const spinner = ora13("Stopping development environment...").start();
+    try {
+      await api.post(`/api/mcp/sessions/${sessionId}/server`, {
+        action: "stop"
+      });
+    } catch {
     }
-    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`, {
-        action: "status"
-      }).catch(() => ({
-        running: false,
-        cmdId: void 0,
-        previewUrl: void 0
-      }))
-    ]);
-    spinner.stop();
+    await api.delete(`/api/mcp/sessions/${sessionId}`);
+    await config.setSessionId(null);
+    spinner.succeed("Development environment stopped");
     if (json) {
-      formatOutput({ ...result, server: serverStatus }, true);
+      formatOutput({ stopped: true }, true);
     } else {
-      const statusColor = result.status === "active" ? chalk10.green : chalk10.red;
-      const serverRunning = serverStatus.running;
-      const serverStatusColor = serverRunning ? chalk10.green : chalk10.yellow;
-      formatList(
-        [
-          { label: "MCP ID", value: result.id },
-          { label: "Name", value: result.name },
-          { 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" }
-        ],
-        false
-      );
+      formatSuccess("Sandbox stopped.", false);
+      console.log();
+      console.log("Start again: waniwani mcp dev");
     }
   } catch (error) {
     handleError(error, json);
@@ -1863,36 +1857,35 @@ var statusCommand = new Command17("status").description("Show current MCP sandbo
   }
 });
 
-// src/commands/mcp/stop.ts
+// src/commands/mcp/sync.ts
 import { Command as Command18 } from "commander";
 import ora14 from "ora";
-var stopCommand = new Command18("stop").description("Stop the MCP server process").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var syncCommand = new Command18("sync").description("Pull files from GitHub to local project").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 = ora14("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");
+    const mcpId = await requireMcpId(options.mcpId);
+    const projectRoot = await findProjectRoot(process.cwd());
+    if (!projectRoot) {
+      throw new CLIError(
+        "Not in a WaniWani project. Run 'waniwani mcp init <name>' first.",
+        "NOT_IN_PROJECT"
+      );
     }
+    const spinner = ora14("Pulling files from GitHub...").start();
+    const result = await pullFilesFromGithub(mcpId, projectRoot);
+    spinner.succeed(`Pulled ${result.count} files from GitHub`);
     if (json) {
-      formatOutput(result, true);
+      formatOutput({ files: result.files }, true);
     } else {
-      formatSuccess("MCP server stopped.", false);
+      console.log();
+      formatSuccess("Files synced from GitHub!", false);
+      if (result.files.length > 0 && result.files.length <= 10) {
+        console.log();
+        for (const file of result.files) {
+          console.log(`  ${file}`);
+        }
+      }
     }
   } catch (error) {
     handleError(error, json);
@@ -1903,12 +1896,14 @@ var stopCommand = new Command18("stop").description("Stop the MCP server process
 // src/commands/mcp/use.ts
 import { Command as Command19 } from "commander";
 import ora15 from "ora";
-var useCommand = new Command19("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) => {
+var useCommand = new Command19("use").description("Select an MCP to use for subsequent commands").argument("<name>", "Name of the MCP to use").action(async (name, _options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
     const spinner = ora15("Fetching MCPs...").start();
-    const mcps = await api.get("/api/mcp/sandboxes");
+    const mcps = await api.get(
+      "/api/mcp/repositories"
+    );
     spinner.stop();
     const mcp = mcps.find((m) => m.name === name);
     if (!mcp) {
@@ -1916,25 +1911,18 @@ var useCommand = new Command19("use").description("Select an MCP to use for subs
         `MCP "${name}" not found. Run 'waniwani mcp list' to see available MCPs.`
       );
     }
-    if (mcp.status !== "active") {
-      throw new McpError(
-        `MCP "${name}" is ${mcp.status}. Only active MCPs can be used.`
-      );
-    }
-    const cfg = options.global ? globalConfig : config;
-    await cfg.setMcpId(mcp.id);
+    await config.setMcpId(mcp.id);
+    await config.setSessionId(null);
     if (json) {
-      formatOutput({ selected: mcp, scope: cfg.scope }, true);
+      formatOutput({ selected: mcp }, true);
     } else {
-      formatSuccess(`Now using MCP "${name}" (${cfg.scope})`, false);
+      formatSuccess(`Now using MCP "${name}"`, false);
       console.log();
-      console.log(`  MCP ID:      ${mcp.id}`);
-      console.log(`  Preview URL: ${mcp.previewUrl}`);
+      console.log(`  MCP ID: ${mcp.id}`);
       console.log();
       console.log("Next steps:");
-      console.log('  waniwani task "Add a tool"');
-      console.log("  waniwani mcp test");
-      console.log("  waniwani mcp status");
+      console.log("  waniwani mcp dev      # Start live preview");
+      console.log("  waniwani mcp status   # Check status");
     }
   } catch (error) {
     handleError(error, json);
@@ -1943,13 +1931,13 @@ var useCommand = new Command19("use").description("Select an MCP to use for subs
 });
 
 // src/commands/mcp/index.ts
-var mcpCommand = new Command20("mcp").description("MCP sandbox management commands").addCommand(listCommand2).addCommand(useCommand).addCommand(statusCommand).addCommand(startCommand).addCommand(stopCommand).addCommand(logsCommand).addCommand(deleteCommand).addCommand(deployCommand).addCommand(fileCommand).addCommand(runCommandCommand);
+var mcpCommand = new Command20("mcp").description("MCP management commands").addCommand(initCommand).addCommand(listCommand2).addCommand(useCommand).addCommand(statusCommand).addCommand(devCommand).addCommand(stopCommand).addCommand(logsCommand).addCommand(syncCommand).addCommand(deployCommand).addCommand(deleteCommand).addCommand(fileCommand).addCommand(runCommandCommand);
 
 // src/commands/org/index.ts
 import { Command as Command23 } from "commander";
 
 // src/commands/org/list.ts
-import chalk11 from "chalk";
+import chalk10 from "chalk";
 import { Command as Command21 } from "commander";
 import ora16 from "ora";
 var listCommand3 = new Command21("list").description("List your organizations").action(async (_, command) => {
@@ -1976,11 +1964,11 @@ var listCommand3 = new Command21("list").description("List your organizations").
         console.log("No organizations found.");
         return;
       }
-      console.log(chalk11.bold("\nOrganizations:\n"));
+      console.log(chalk10.bold("\nOrganizations:\n"));
       const rows = orgs.map((o) => {
         const isActive = o.id === activeOrgId;
         return [
-          isActive ? chalk11.cyan(`* ${o.name}`) : `  ${o.name}`,
+          isActive ? chalk10.cyan(`* ${o.name}`) : `  ${o.name}`,
           o.slug,
           o.role
         ];
@@ -1990,7 +1978,7 @@ var listCommand3 = new Command21("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: ${chalk10.cyan(activeOrg.name)}`);
         }
       }
       console.log("\nSwitch organization: waniwani org switch <name>");
@@ -2043,95 +2031,11 @@ var switchCommand = new Command22("switch").description("Switch to a different o
 // src/commands/org/index.ts
 var orgCommand = new Command23("org").description("Organization management commands").addCommand(listCommand3).addCommand(switchCommand);
 
-// src/commands/push.ts
-import chalk12 from "chalk";
-import { Command as Command24 } from "commander";
-import ora18 from "ora";
-var BATCH_SIZE2 = 50;
-var pushCommand = new Command24("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 = ora18("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(chalk12.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/cli.ts
 var version = "0.1.0";
-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");
+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);
-program.addCommand(pushCommand);
-program.addCommand(devCommand);
 program.addCommand(mcpCommand);
 program.addCommand(orgCommand);
 program.addCommand(configCommand);