@waniwani/cli 0.0.34 → 0.0.35

package/dist/index.js

@@ -14,33 +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({
-  mcp: z.object({
-    id: z.string().nullable().default(null),
-    name: z.string().nullable().default(null)
-  }),
-  apiUrl: z.string().default(DEFAULT_API_URL)
+  // Settings
+  sessionId: z.string().nullable().default(null),
+  mcpId: 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) {
@@ -59,12 +57,34 @@ 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()).mcp.id;
+    return (await this.load()).mcpId;
   }
   async setMcpId(id) {
     const data = await this.load();
-    data.mcp.id = id;
+    data.mcpId = id;
+    await this.save(data);
+  }
+  async getSessionId() {
+    return (await this.load()).sessionId;
+  }
+  async setSessionId(id) {
+    const data = await this.load();
+    data.sessionId = id;
     await this.save(data);
   }
   async getApiUrl() {
@@ -74,9 +94,42 @@ var Config = class {
   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);
@@ -241,82 +294,29 @@ 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();
@@ -468,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;
@@ -501,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>
@@ -699,6 +700,7 @@ var loginCommand = new Command3("login").description("Log in to WaniWani").optio
       apiUrl
       // RFC 8707 resource parameter
     );
+    await config.ensureConfigDir();
     await auth.setTokens(
       tokenResponse.access_token,
       tokenResponse.refresh_token,
@@ -861,16 +863,14 @@ async function requireMcpId(mcpId) {
   }
   return configMcpId;
 }
-async function requireSessionId(mcpId) {
-  const repository = await api.get(
-    `/api/mcp/repositories/${mcpId}`
-  );
-  if (!repository.activeSandbox) {
+async function requireSessionId() {
+  const sessionId = await config.getSessionId();
+  if (!sessionId) {
     throw new McpError(
       "No active session. Run 'waniwani mcp dev' to start development."
     );
   }
-  return repository.activeSandbox.id;
+  return sessionId;
 }
 var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
   ".png",
@@ -940,6 +940,7 @@ var deleteCommand = new Command5("delete").description("Delete the MCP (includes
     spinner.succeed("MCP deleted");
     if (await config.getMcpId() === mcpId) {
       await config.setMcpId(null);
+      await config.setSessionId(null);
     }
     if (json) {
       formatOutput({ deleted: mcpId }, true);
@@ -959,37 +960,26 @@ import ora3 from "ora";
 
 // 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 { 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";
-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))) {
+    if (existsSync3(join3(current, PROJECT_DIR))) {
       return current;
     }
     const parent = dirname(current);
     if (parent === current) break;
     current = parent;
   }
-  if (existsSync3(join4(current, PROJECT_DIR))) {
+  if (existsSync3(join3(current, PROJECT_DIR))) {
     return current;
   }
   return null;
 }
-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.mcp?.id ?? null;
-  } catch {
-    return null;
-  }
-}
 var DEFAULT_IGNORE_PATTERNS = [
   ".waniwani",
   ".git",
@@ -1009,10 +999,10 @@ var DEFAULT_IGNORE_PATTERNS = [
 async function loadIgnorePatterns(projectRoot) {
   const ig = ignore();
   ig.add(DEFAULT_IGNORE_PATTERNS);
-  const gitignorePath = join4(projectRoot, ".gitignore");
+  const gitignorePath = join3(projectRoot, ".gitignore");
   if (existsSync3(gitignorePath)) {
     try {
-      const content = await readFile3(gitignorePath, "utf-8");
+      const content = await readFile2(gitignorePath, "utf-8");
       ig.add(content);
     } catch {
     }
@@ -1025,7 +1015,7 @@ async function collectFiles(projectRoot) {
   async function walk(dir) {
     const entries = await readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join4(dir, entry.name);
+      const fullPath = join3(dir, entry.name);
       const relativePath = relative(projectRoot, fullPath);
       if (ig.ignores(relativePath)) {
         continue;
@@ -1034,7 +1024,7 @@ async function collectFiles(projectRoot) {
         await walk(fullPath);
       } else if (entry.isFile()) {
         try {
-          const content = await readFile3(fullPath);
+          const content = await readFile2(fullPath);
           const isBinary = isBinaryPath(fullPath) || detectBinary(content);
           files.push({
             path: relativePath,
@@ -1055,20 +1045,20 @@ async function pullFilesFromGithub(mcpId, targetDir) {
   );
   const writtenFiles = [];
   for (const file of result.files) {
-    const localPath = join4(targetDir, file.path);
+    const localPath = join3(targetDir, file.path);
     const dir = dirname(localPath);
-    await mkdir3(dir, { recursive: true });
+    await mkdir2(dir, { recursive: true });
     if (file.encoding === "base64") {
-      await writeFile3(localPath, Buffer.from(file.content, "base64"));
+      await writeFile2(localPath, Buffer.from(file.content, "base64"));
     } else {
-      await writeFile3(localPath, file.content, "utf8");
+      await writeFile2(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 fullPath = join3(projectRoot, filePath);
   const relativePath = relative(projectRoot, fullPath);
   if (!existsSync3(fullPath)) {
     return null;
@@ -1078,7 +1068,7 @@ async function collectSingleFile(projectRoot, filePath) {
     if (!fileStat.isFile()) {
       return null;
     }
-    const content = await readFile3(fullPath);
+    const content = await readFile2(fullPath);
     const isBinary = isBinaryPath(fullPath) || detectBinary(content);
     return {
       path: relativePath,
@@ -1152,9 +1142,6 @@ var devCommand = new Command7("dev").description("Start live development with sa
       );
     }
     let mcpId = options.mcpId;
-    if (!mcpId) {
-      mcpId = await loadProjectMcpId(projectRoot);
-    }
     if (!mcpId) {
       mcpId = await config.getMcpId();
     }
@@ -1182,6 +1169,7 @@ var devCommand = new Command7("dev").description("Start live development with sa
       }
       sessionId = existing.id;
     }
+    await config.setSessionId(sessionId);
     spinner.text = "Syncing files to sandbox...";
     const files = await collectFiles(projectRoot);
     if (files.length > 0) {
@@ -1270,8 +1258,8 @@ var listCommand = new Command8("list").description("List files in the MCP sandbo
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
-    const mcpId = await requireMcpId(options.mcpId);
-    const sessionId = await requireSessionId(mcpId);
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const spinner = ora5(`Listing ${path}...`).start();
     const result = await api.get(
       `/api/mcp/sessions/${sessionId}/files/list?path=${encodeURIComponent(path)}`
@@ -1308,15 +1296,15 @@ function formatSize(bytes) {
 }
 
 // src/commands/mcp/file/read.ts
-import { writeFile as writeFile4 } from "fs/promises";
+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 {
-    const mcpId = await requireMcpId(options.mcpId);
-    const sessionId = await requireSessionId(mcpId);
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const encoding = options.base64 ? "base64" : "utf8";
     const spinner = ora6(`Reading ${path}...`).start();
     const result = await api.get(
@@ -1328,7 +1316,7 @@ var readCommand = new Command9("read").description("Read a file from the MCP san
     }
     if (options.output) {
       const buffer = result.encoding === "base64" ? Buffer.from(result.content, "base64") : Buffer.from(result.content, "utf8");
-      await writeFile4(options.output, buffer);
+      await writeFile3(options.output, buffer);
       if (json) {
         formatOutput({ path, savedTo: options.output }, true);
       } else {
@@ -1349,15 +1337,15 @@ var readCommand = new Command9("read").description("Read a file from the MCP san
 });
 
 // src/commands/mcp/file/write.ts
-import { readFile as readFile4 } from "fs/promises";
+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 {
-    const mcpId = await requireMcpId(options.mcpId);
-    const sessionId = await requireSessionId(mcpId);
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     let content;
     let encoding = "utf8";
     if (options.content) {
@@ -1366,7 +1354,7 @@ var writeCommand = new Command10("write").description("Write a file to the MCP s
         encoding = "base64";
       }
     } else if (options.file) {
-      const fileBuffer = await readFile4(options.file);
+      const fileBuffer = await readFile3(options.file);
       if (options.base64) {
         content = fileBuffer.toString("base64");
         encoding = "base64";
@@ -1403,20 +1391,20 @@ var fileCommand = new Command11("file").description("File operations in MCP sand
 
 // src/commands/mcp/init.ts
 import { existsSync as existsSync4 } from "fs";
-import { readFile as readFile5 } from "fs/promises";
-import { join as join5 } from "path";
+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 = join5(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
+  const parentConfigPath = join4(cwd, LOCAL_CONFIG_DIR, CONFIG_FILE_NAME);
   if (!existsSync4(parentConfigPath)) {
     return null;
   }
   try {
-    const content = await readFile5(parentConfigPath, "utf-8");
+    const content = await readFile4(parentConfigPath, "utf-8");
     const config2 = JSON.parse(content);
-    const { mcp: _, ...rest } = config2;
+    const { mcpId: _, sessionId: __, ...rest } = config2;
     return rest;
   } catch {
     return null;
@@ -1427,7 +1415,7 @@ var initCommand = new Command12("init").description("Create a new MCP project").
   const json = globalOptions.json ?? false;
   try {
     const cwd = process.cwd();
-    const projectDir = join5(cwd, name);
+    const projectDir = join4(cwd, name);
     if (existsSync4(projectDir)) {
       if (json) {
         formatOutput(
@@ -1454,10 +1442,7 @@ var initCommand = new Command12("init").description("Create a new MCP project").
       const parentConfig = await loadParentConfig(cwd);
       await initConfigAt(projectDir, {
         ...parentConfig,
-        mcp: {
-          id: result.repository.id,
-          name: result.repository.name
-        }
+        mcpId: result.repository.id
       });
       spinner.succeed("MCP project created");
     } else {
@@ -1579,8 +1564,8 @@ var logsCommand = new Command14("logs").description("Stream logs from the MCP se
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   try {
-    const mcpId = await requireMcpId(options.mcpId);
-    const sessionId = await requireSessionId(mcpId);
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const token = await auth.getAccessToken();
     if (!token) {
       throw new AuthError(
@@ -1715,8 +1700,8 @@ var runCommandCommand = new Command15("run-command").description("Run a command
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
-    const mcpId = await requireMcpId(options.mcpId);
-    const sessionId = await requireSessionId(mcpId);
+    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(
@@ -1847,8 +1832,8 @@ var stopCommand = new Command17("stop").description("Stop the development enviro
   const globalOptions = command.optsWithGlobals();
   const json = globalOptions.json ?? false;
   try {
-    const mcpId = await requireMcpId(options.mcpId);
-    const sessionId = await requireSessionId(mcpId);
+    await requireMcpId(options.mcpId);
+    const sessionId = await requireSessionId();
     const spinner = ora13("Stopping development environment...").start();
     try {
       await api.post(`/api/mcp/sessions/${sessionId}/server`, {
@@ -1857,6 +1842,7 @@ var stopCommand = new Command17("stop").description("Stop the development enviro
     } catch {
     }
     await api.delete(`/api/mcp/sessions/${sessionId}`);
+    await config.setSessionId(null);
     spinner.succeed("Development environment stopped");
     if (json) {
       formatOutput({ stopped: true }, true);
@@ -1910,7 +1896,7 @@ var syncCommand = new Command18("sync").description("Pull files from GitHub to l
 // 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 {
@@ -1925,12 +1911,12 @@ 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.`
       );
     }
-    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();