@waniwani/cli 0.0.6 → 0.0.12

package/dist/index.js

@@ -1,117 +1,13 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command as Command15 } from "commander";
-
-// src/commands/login.ts
-import { spawn } from "child_process";
-import { createServer } from "http";
-import chalk3 from "chalk";
-import { Command } from "commander";
-import ora from "ora";
+import { Command as Command16 } from "commander";
 
-// src/lib/auth.ts
-import { access, mkdir, readFile, writeFile } from "fs/promises";
-import { homedir } from "os";
+// src/commands/init.ts
+import { existsSync } from "fs";
+import { mkdir, writeFile } from "fs/promises";
 import { join } from "path";
-import { z } from "zod";
-var CONFIG_DIR = join(homedir(), ".waniwani");
-var AUTH_FILE = join(CONFIG_DIR, "auth.json");
-var AuthStoreSchema = z.object({
-  accessToken: z.string().nullable().default(null),
-  refreshToken: z.string().nullable().default(null),
-  expiresAt: z.string().nullable().default(null)
-});
-var API_BASE_URL = process.env.WANIWANI_API_URL || "https://waniwani.com";
-async function ensureConfigDir() {
-  await mkdir(CONFIG_DIR, { recursive: true });
-}
-async function readAuthStore() {
-  await ensureConfigDir();
-  try {
-    await access(AUTH_FILE);
-    const content = await readFile(AUTH_FILE, "utf-8");
-    return AuthStoreSchema.parse(JSON.parse(content));
-  } catch {
-    return AuthStoreSchema.parse({});
-  }
-}
-async function writeAuthStore(store) {
-  await ensureConfigDir();
-  await writeFile(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;
-  }
-  async getAccessToken() {
-    const store = await this.getStore();
-    return store.accessToken;
-  }
-  async getRefreshToken() {
-    const store = await this.getStore();
-    return store.refreshToken;
-  }
-  async setTokens(accessToken, refreshToken, expiresIn) {
-    const expiresAt = new Date(Date.now() + expiresIn * 1e3).toISOString();
-    const store = await this.getStore();
-    store.accessToken = accessToken;
-    store.refreshToken = refreshToken;
-    store.expiresAt = expiresAt;
-    await this.saveStore(store);
-  }
-  async clear() {
-    const emptyStore = AuthStoreSchema.parse({});
-    await this.saveStore(emptyStore);
-  }
-  async isTokenExpired() {
-    const store = await this.getStore();
-    if (!store.expiresAt) return true;
-    return new Date(store.expiresAt).getTime() - 5 * 60 * 1e3 < Date.now();
-  }
-  async tryRefreshToken() {
-    const refreshToken = await this.getRefreshToken();
-    if (!refreshToken) return false;
-    try {
-      const response = await fetch(`${API_BASE_URL}/api/auth/oauth2/token`, {
-        method: "POST",
-        headers: { "Content-Type": "application/x-www-form-urlencoded" },
-        body: new URLSearchParams({
-          grant_type: "refresh_token",
-          refresh_token: refreshToken,
-          client_id: "waniwani-cli"
-        }).toString()
-      });
-      if (!response.ok) {
-        await this.clear();
-        return false;
-      }
-      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();
+import { Command } from "commander";
 
 // src/lib/errors.ts
 import chalk from "chalk";
@@ -237,8 +133,297 @@ function prettyPrint(data, indent = 0) {
   }
 }
 
+// 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 ora from "ora";
+
+// src/lib/auth.ts
+import { access, mkdir as mkdir4, readFile as readFile3, writeFile as writeFile4 } from "fs/promises";
+import { homedir as homedir2 } from "os";
+import { join as join4 } from "path";
+import { z as z3 } from "zod";
+
+// src/lib/config.ts
+import { mkdir as mkdir3, readFile as readFile2, writeFile as writeFile3 } from "fs/promises";
+import { homedir } from "os";
+import { join as join3 } from "path";
+import { z as z2 } from "zod";
+
+// src/lib/project-config.ts
+import { existsSync as existsSync2 } from "fs";
+import { mkdir as mkdir2, readFile, writeFile as writeFile2 } from "fs/promises";
+import { join as join2 } from "path";
+import { z } from "zod";
+var PROJECT_CONFIG_DIR2 = ".waniwani";
+var PROJECT_CONFIG_FILE2 = "settings.local.json";
+var ProjectConfigSchema = z.object({
+  mcpId: z.string().optional(),
+  defaults: z.object({
+    model: z.string().optional(),
+    maxSteps: z.number().optional()
+  }).optional()
+});
+var projectConfigCache;
+function getProjectConfigPath() {
+  return join2(process.cwd(), PROJECT_CONFIG_DIR2, PROJECT_CONFIG_FILE2);
+}
+function getProjectConfigDir() {
+  return join2(process.cwd(), PROJECT_CONFIG_DIR2);
+}
+function hasProjectConfig() {
+  return existsSync2(getProjectConfigDir());
+}
+async function loadProjectConfig() {
+  if (projectConfigCache !== void 0) {
+    return projectConfigCache;
+  }
+  const configPath = getProjectConfigPath();
+  try {
+    const content = await readFile(configPath, "utf-8");
+    projectConfigCache = ProjectConfigSchema.parse(JSON.parse(content));
+    return projectConfigCache;
+  } catch {
+    projectConfigCache = null;
+    return null;
+  }
+}
+async function saveProjectConfig(config2) {
+  const configDir = getProjectConfigDir();
+  const configPath = getProjectConfigPath();
+  await mkdir2(configDir, { recursive: true });
+  const existing = await loadProjectConfig() ?? {};
+  const merged = ProjectConfigSchema.parse({ ...existing, ...config2 });
+  await writeFile2(configPath, JSON.stringify(merged, null, "	"), "utf-8");
+  projectConfigCache = merged;
+}
+
+// src/lib/config.ts
+var CONFIG_DIR = join3(homedir(), ".waniwani");
+var CONFIG_FILE = join3(CONFIG_DIR, "config.json");
+var DEFAULT_API_URL = "https://app.waniwani.ai";
+var ConfigSchema = z2.object({
+  defaults: z2.object({ model: z2.string(), maxSteps: z2.number() }).default({ model: "claude-sonnet-4-20250514", maxSteps: 10 }),
+  activeMcpId: z2.string().nullable().default(null),
+  apiUrl: z2.string().nullable().default(null)
+});
+var cache = null;
+async function load() {
+  if (cache) return cache;
+  try {
+    cache = ConfigSchema.parse(
+      JSON.parse(await readFile2(CONFIG_FILE, "utf-8"))
+    );
+  } catch {
+    cache = ConfigSchema.parse({});
+  }
+  return cache;
+}
+async function save(cfg) {
+  cache = cfg;
+  await mkdir3(CONFIG_DIR, { recursive: true });
+  await writeFile3(CONFIG_FILE, JSON.stringify(cfg, null, 2));
+}
+async function update(fn) {
+  const cfg = await load();
+  fn(cfg);
+  await save(cfg);
+}
+var config = {
+  getDefaults: async () => {
+    const cfg = await load();
+    return cfg.defaults;
+  },
+  getEffectiveDefaults: async () => {
+    const global = await load();
+    const project = await loadProjectConfig();
+    return { ...global.defaults, ...project?.defaults };
+  },
+  setDefaults: (defaults) => {
+    return update((cfg) => {
+      cfg.defaults = { ...cfg.defaults, ...defaults };
+    });
+  },
+  getActiveMcpId: async () => {
+    const cfg = await load();
+    return cfg.activeMcpId;
+  },
+  getEffectiveMcpId: async () => {
+    const project = await loadProjectConfig();
+    if (project?.mcpId) return project.mcpId;
+    const cfg = await load();
+    return cfg.activeMcpId;
+  },
+  setActiveMcpId: (id) => {
+    return update((cfg) => {
+      cfg.activeMcpId = id;
+    });
+  },
+  getApiUrl: async () => {
+    if (process.env.WANIWANI_API_URL) return process.env.WANIWANI_API_URL;
+    const cfg = await load();
+    return cfg.apiUrl || DEFAULT_API_URL;
+  },
+  setApiUrl: (url) => {
+    return update((cfg) => {
+      cfg.apiUrl = url;
+    });
+  },
+  clear: () => {
+    return save(ConfigSchema.parse({}));
+  }
+};
+
+// src/lib/auth.ts
+var CONFIG_DIR2 = join4(homedir2(), ".waniwani");
+var AUTH_FILE = join4(CONFIG_DIR2, "auth.json");
+var AuthStoreSchema = z3.object({
+  accessToken: z3.string().nullable().default(null),
+  refreshToken: z3.string().nullable().default(null),
+  expiresAt: z3.string().nullable().default(null)
+});
+async function ensureConfigDir() {
+  await mkdir4(CONFIG_DIR2, { recursive: true });
+}
+async function readAuthStore() {
+  await ensureConfigDir();
+  try {
+    await access(AUTH_FILE);
+    const content = await readFile3(AUTH_FILE, "utf-8");
+    return AuthStoreSchema.parse(JSON.parse(content));
+  } catch {
+    return AuthStoreSchema.parse({});
+  }
+}
+async function writeAuthStore(store) {
+  await ensureConfigDir();
+  await writeFile4(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;
+  }
+  async getAccessToken() {
+    const store = await this.getStore();
+    return store.accessToken;
+  }
+  async getRefreshToken() {
+    const store = await this.getStore();
+    return store.refreshToken;
+  }
+  async setTokens(accessToken, refreshToken, expiresIn) {
+    const expiresAt = new Date(Date.now() + expiresIn * 1e3).toISOString();
+    const store = await this.getStore();
+    store.accessToken = accessToken;
+    store.refreshToken = refreshToken;
+    store.expiresAt = expiresAt;
+    await this.saveStore(store);
+  }
+  async clear() {
+    const emptyStore = AuthStoreSchema.parse({});
+    await this.saveStore(emptyStore);
+  }
+  async isTokenExpired() {
+    const store = await this.getStore();
+    if (!store.expiresAt) return true;
+    return new Date(store.expiresAt).getTime() - 5 * 60 * 1e3 < Date.now();
+  }
+  async tryRefreshToken() {
+    const refreshToken = await this.getRefreshToken();
+    if (!refreshToken) return false;
+    try {
+      const apiUrl = await config.getApiUrl();
+      const response = await fetch(`${apiUrl}/api/auth/oauth2/token`, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: new URLSearchParams({
+          grant_type: "refresh_token",
+          refresh_token: refreshToken,
+          client_id: "waniwani-cli"
+        }).toString()
+      });
+      if (!response.ok) {
+        await this.clear();
+        return false;
+      }
+      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/commands/login.ts
-var API_BASE_URL2 = process.env.WANIWANI_API_URL || "https://waniwani.com";
 var CALLBACK_PORT = 54321;
 var CALLBACK_URL = `http://localhost:${CALLBACK_PORT}/callback`;
 var CLIENT_ID = "waniwani-cli";
@@ -362,7 +547,8 @@ async function waitForCallback(expectedState, timeoutMs = 3e5) {
   });
 }
 async function exchangeCodeForToken(code, codeVerifier) {
-  const response = await fetch(`${API_BASE_URL2}/api/auth/oauth2/token`, {
+  const apiUrl = await config.getApiUrl();
+  const response = await fetch(`${apiUrl}/api/auth/oauth2/token`, {
     method: "POST",
     headers: {
       "Content-Type": "application/x-www-form-urlencoded"
@@ -384,7 +570,7 @@ async function exchangeCodeForToken(code, codeVerifier) {
   }
   return response.json();
 }
-var loginCommand = new Command("login").description("Log in to WaniWani").option("--no-browser", "Don't open the browser automatically").action(async (options, command) => {
+var loginCommand = new Command2("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 {
@@ -406,7 +592,8 @@ var loginCommand = new Command("login").description("Log in to WaniWani").option
     const codeVerifier = generateCodeVerifier();
     const codeChallenge = await generateCodeChallenge(codeVerifier);
     const state = generateState();
-    const authUrl = new URL(`${API_BASE_URL2}/oauth/authorize`);
+    const apiUrl = await config.getApiUrl();
+    const authUrl = new URL(`${apiUrl}/oauth/authorize`);
     authUrl.searchParams.set("client_id", CLIENT_ID);
     authUrl.searchParams.set("redirect_uri", CALLBACK_URL);
     authUrl.searchParams.set("response_type", "code");
@@ -456,78 +643,8 @@ var loginCommand = new Command("login").description("Log in to WaniWani").option
 });
 
 // src/commands/logout.ts
-import { Command as Command2 } from "commander";
-
-// src/lib/config.ts
-import { access as access2, mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
-import { homedir as homedir2 } from "os";
-import { join as join2 } from "path";
-import { z as z2 } from "zod";
-var CONFIG_DIR2 = join2(homedir2(), ".waniwani");
-var CONFIG_FILE = join2(CONFIG_DIR2, "config.json");
-var ConfigSchema = z2.object({
-  defaults: z2.object({
-    model: z2.string().default("claude-sonnet-4-20250514"),
-    maxSteps: z2.number().default(10)
-  }).default(() => ({ model: "claude-sonnet-4-20250514", maxSteps: 10 })),
-  activeMcpId: z2.string().nullable().default(null)
-});
-async function ensureConfigDir2() {
-  await mkdir2(CONFIG_DIR2, { recursive: true });
-}
-async function readConfig() {
-  await ensureConfigDir2();
-  try {
-    await access2(CONFIG_FILE);
-    const content = await readFile2(CONFIG_FILE, "utf-8");
-    return ConfigSchema.parse(JSON.parse(content));
-  } catch {
-    return ConfigSchema.parse({});
-  }
-}
-async function writeConfig(config2) {
-  await ensureConfigDir2();
-  await writeFile2(CONFIG_FILE, JSON.stringify(config2, null, 2), "utf-8");
-}
-var ConfigManager = class {
-  configCache = null;
-  async getConfig() {
-    if (!this.configCache) {
-      this.configCache = await readConfig();
-    }
-    return this.configCache;
-  }
-  async saveConfig(config2) {
-    this.configCache = config2;
-    await writeConfig(config2);
-  }
-  async getDefaults() {
-    const config2 = await this.getConfig();
-    return config2.defaults;
-  }
-  async setDefaults(defaults) {
-    const config2 = await this.getConfig();
-    config2.defaults = { ...config2.defaults, ...defaults };
-    await this.saveConfig(config2);
-  }
-  async getActiveMcpId() {
-    const config2 = await this.getConfig();
-    return config2.activeMcpId;
-  }
-  async setActiveMcpId(id) {
-    const config2 = await this.getConfig();
-    config2.activeMcpId = id;
-    await this.saveConfig(config2);
-  }
-  async clear() {
-    const emptyConfig = ConfigSchema.parse({});
-    await this.saveConfig(emptyConfig);
-  }
-};
-var config = new ConfigManager();
-
-// src/commands/logout.ts
-var logoutCommand = new Command2("logout").description("Log out from WaniWani").action(async (_, command) => {
+import { Command as Command3 } from "commander";
+var logoutCommand = new Command3("logout").description("Log out from WaniWani").action(async (_, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -553,14 +670,13 @@ var logoutCommand = new Command2("logout").description("Log out from WaniWani").
 });
 
 // src/commands/mcp/index.ts
-import { Command as Command10 } from "commander";
+import { Command as Command11 } from "commander";
 
 // src/commands/mcp/create.ts
-import { Command as Command3 } from "commander";
+import { Command as Command4 } from "commander";
 import ora2 from "ora";
 
 // src/lib/api.ts
-var API_BASE_URL3 = process.env.WANIWANI_API_URL || "https://waniwani.com";
 var ApiError = class extends CLIError {
   constructor(message, code, statusCode, details) {
     super(message, code, details);
@@ -587,7 +703,8 @@ async function request(method, path, options) {
     }
     headers.Authorization = `Bearer ${token}`;
   }
-  const url = `${API_BASE_URL3}${path}`;
+  const baseUrl = await config.getApiUrl();
+  const url = `${baseUrl}${path}`;
   const response = await fetch(url, {
     method,
     headers,
@@ -624,11 +741,11 @@ 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: () => API_BASE_URL3
+  getBaseUrl: () => config.getApiUrl()
 };
 
 // src/commands/mcp/create.ts
-var createCommand = new Command3("create").description("Create a new MCP sandbox from template").argument("<name>", "Name for the MCP project").action(async (name, _, command) => {
+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 {
@@ -637,12 +754,24 @@ var createCommand = new Command3("create").description("Create a new MCP sandbox
       name
     });
     spinner.succeed("MCP sandbox created");
-    config.setActiveMcpId(result.id);
+    const useProjectConfig = !options.global && hasProjectConfig();
+    if (useProjectConfig) {
+      await saveProjectConfig({ mcpId: result.id });
+    } else {
+      await config.setActiveMcpId(result.id);
+    }
     if (json) {
-      formatOutput(result, true);
+      formatOutput(
+        { ...result, scope: useProjectConfig ? "project" : "global" },
+        true
+      );
     } else {
+      const scope = useProjectConfig ? "(saved to project)" : "(saved globally)";
       console.log();
-      formatSuccess(`MCP sandbox "${name}" created successfully!`, false);
+      formatSuccess(
+        `MCP sandbox "${name}" created successfully! ${scope}`,
+        false
+      );
       console.log();
       console.log(`  MCP ID:      ${result.id}`);
       console.log(`  Sandbox ID:  ${result.sandboxId}`);
@@ -660,9 +789,9 @@ var createCommand = new Command3("create").description("Create a new MCP sandbox
 });
 
 // src/commands/mcp/deploy.ts
-import { Command as Command4 } from "commander";
+import { Command as Command5 } from "commander";
 import ora3 from "ora";
-var deployCommand = new Command4("deploy").description("Deploy MCP server to GitHub + Vercel from sandbox").option("--repo <name>", "GitHub repository name").option("--org <name>", "GitHub organization").option("--private", "Create private repository").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var deployCommand = new Command5("deploy").description("Deploy MCP server to GitHub + Vercel from sandbox").option("--repo <name>", "GitHub repository name").option("--org <name>", "GitHub organization").option("--private", "Create private repository").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -708,9 +837,9 @@ var deployCommand = new Command4("deploy").description("Deploy MCP server to Git
 
 // src/commands/mcp/list.ts
 import chalk4 from "chalk";
-import { Command as Command5 } from "commander";
+import { Command as Command6 } from "commander";
 import ora4 from "ora";
-var listCommand = new Command5("list").description("List all MCPs in your organization").option("--all", "Include stopped/expired MCPs").action(async (options, command) => {
+var listCommand = new Command6("list").description("List all MCPs in your organization").option("--all", "Include stopped/expired MCPs").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -768,9 +897,9 @@ var listCommand = new Command5("list").description("List all MCPs in your organi
 
 // src/commands/mcp/status.ts
 import chalk5 from "chalk";
-import { Command as Command6 } from "commander";
+import { Command as Command7 } from "commander";
 import ora5 from "ora";
-var statusCommand = new Command6("status").description("Show current MCP sandbox status").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var statusCommand = new Command7("status").description("Show current MCP sandbox status").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -810,9 +939,9 @@ var statusCommand = new Command6("status").description("Show current MCP sandbox
 });
 
 // src/commands/mcp/stop.ts
-import { Command as Command7 } from "commander";
+import { Command as Command8 } from "commander";
 import ora6 from "ora";
-var stopCommand = new Command7("stop").description("Stop and clean up the MCP sandbox").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
+var stopCommand = new Command8("stop").description("Stop and clean up the MCP sandbox").option("--mcp-id <id>", "Specific MCP ID").action(async (options, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -842,9 +971,9 @@ var stopCommand = new Command7("stop").description("Stop and clean up the MCP sa
 
 // src/commands/mcp/test.ts
 import chalk6 from "chalk";
-import { Command as Command8 } from "commander";
+import { Command as Command9 } from "commander";
 import ora7 from "ora";
-var testCommand = new Command8("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(
+var testCommand = new Command9("test").description("Test MCP tools via the sandbox").argument("[tool]", "Tool name to test (lists tools if omitted)").argument("[args...]", "JSON arguments for the tool").option("--mcp-id <id>", "Specific MCP ID").action(
   async (tool, args, options, command) => {
     const globalOptions = command.optsWithGlobals();
     const json = globalOptions.json ?? false;
@@ -932,9 +1061,9 @@ Test a tool: waniwani mcp test <tool-name> '{"arg": "value"}'`
 );
 
 // src/commands/mcp/use.ts
-import { Command as Command9 } from "commander";
+import { Command as Command10 } from "commander";
 import ora8 from "ora";
-var useCommand = new Command9("use").description("Select an MCP to use for subsequent commands").argument("<name>", "Name of the MCP to use").action(async (name, _, command) => {
+var useCommand = new Command10("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 {
@@ -952,11 +1081,20 @@ var useCommand = new Command9("use").description("Select an MCP to use for subse
         `MCP "${name}" is ${mcp.status}. Only active MCPs can be used.`
       );
     }
-    await config.setActiveMcpId(mcp.id);
+    const useProjectConfig = !options.global && hasProjectConfig();
+    if (useProjectConfig) {
+      await saveProjectConfig({ mcpId: mcp.id });
+    } else {
+      await config.setActiveMcpId(mcp.id);
+    }
     if (json) {
-      formatOutput({ selected: mcp }, true);
+      formatOutput(
+        { selected: mcp, scope: useProjectConfig ? "project" : "global" },
+        true
+      );
     } else {
-      formatSuccess(`Now using MCP "${name}"`, false);
+      const scope = useProjectConfig ? "(project)" : "(global)";
+      formatSuccess(`Now using MCP "${name}" ${scope}`, false);
       console.log();
       console.log(`  MCP ID:      ${mcp.id}`);
       console.log(`  Preview URL: ${mcp.previewUrl}`);
@@ -973,16 +1111,16 @@ var useCommand = new Command9("use").description("Select an MCP to use for subse
 });
 
 // src/commands/mcp/index.ts
-var mcpCommand = new Command10("mcp").description("MCP sandbox management commands").addCommand(createCommand).addCommand(listCommand).addCommand(useCommand).addCommand(statusCommand).addCommand(stopCommand).addCommand(testCommand).addCommand(deployCommand);
+var mcpCommand = new Command11("mcp").description("MCP sandbox management commands").addCommand(createCommand).addCommand(listCommand).addCommand(useCommand).addCommand(statusCommand).addCommand(stopCommand).addCommand(testCommand).addCommand(deployCommand);
 
 // src/commands/org/index.ts
-import { Command as Command13 } from "commander";
+import { Command as Command14 } from "commander";
 
 // src/commands/org/list.ts
 import chalk7 from "chalk";
-import { Command as Command11 } from "commander";
+import { Command as Command12 } from "commander";
 import ora9 from "ora";
-var listCommand2 = new Command11("list").description("List your organizations").action(async (_, command) => {
+var listCommand2 = new Command12("list").description("List your organizations").action(async (_, command) => {
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
@@ -1032,9 +1170,9 @@ var listCommand2 = new Command11("list").description("List your organizations").
 });
 
 // src/commands/org/switch.ts
-import { Command as Command12 } from "commander";
+import { Command as Command13 } from "commander";
 import ora10 from "ora";
-var switchCommand = new Command12("switch").description("Switch to a different organization").argument("<name>", "Name or slug of the organization to switch to").action(async (name, _, command) => {
+var switchCommand = new Command13("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 {
@@ -1071,22 +1209,22 @@ var switchCommand = new Command12("switch").description("Switch to a different o
 });
 
 // src/commands/org/index.ts
-var orgCommand = new Command13("org").description("Organization management commands").addCommand(listCommand2).addCommand(switchCommand);
+var orgCommand = new Command14("org").description("Organization management commands").addCommand(listCommand2).addCommand(switchCommand);
 
 // src/commands/task.ts
 import chalk8 from "chalk";
-import { Command as Command14 } from "commander";
+import { Command as Command15 } from "commander";
 import ora11 from "ora";
-var taskCommand = new Command14("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", "claude-sonnet-4-20250514").option("--max-steps <n>", "Maximum tool use steps", "10").action(async (prompt, options, command) => {
+var taskCommand = new Command15("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 {
     let mcpId = options.mcpId;
     if (!mcpId) {
-      mcpId = await config.getActiveMcpId();
+      mcpId = await config.getEffectiveMcpId();
       if (!mcpId) {
         throw new McpError(
-          "No active MCP. Run 'waniwani mcp create <name>' or 'waniwani mcp use <name>'."
+          "No active MCP. Run 'waniwani init' then 'waniwani mcp use <name>'."
         );
       }
     }
@@ -1096,7 +1234,9 @@ var taskCommand = new Command14("task").description("Send a task to Claude runni
         "Not logged in. Run 'waniwani login' to authenticate."
       );
     }
-    const maxSteps = parseInt(options.maxSteps, 10);
+    const defaults = await config.getEffectiveDefaults();
+    const model = options.model ?? defaults.model;
+    const maxSteps = options.maxSteps ? Number.parseInt(options.maxSteps, 10) : defaults.maxSteps;
     if (!json) {
       console.log();
       console.log(chalk8.bold("Task:"), prompt);
@@ -1113,7 +1253,7 @@ var taskCommand = new Command14("task").description("Send a task to Claude runni
       },
       body: JSON.stringify({
         prompt,
-        model: options.model,
+        model,
         maxSteps
       })
     });
@@ -1222,9 +1362,10 @@ var taskCommand = new Command14("task").description("Send a task to Claude runni
 
 // src/cli.ts
 var version = "0.1.0";
-var program = new Command15().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 Command16().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(mcpCommand);
 program.addCommand(taskCommand);
 program.addCommand(orgCommand);