@piut/cli 3.1.0 → 3.2.0

package/dist/cli.js

@@ -4,8 +4,8 @@
 import { Command } from "commander";
 
 // src/commands/setup.ts
-import fs3 from "fs";
-import path5 from "path";
+import fs4 from "fs";
+import path6 from "path";
 import { execSync } from "child_process";
 import { password, confirm, checkbox } from "@inquirer/prompts";
 import chalk2 from "chalk";
@@ -22,14 +22,15 @@ async function validateKey(key) {
   }
   return res.json();
 }
-async function buildBrain(key, input) {
+async function* buildBrainStreaming(key, input2) {
   const res = await fetch(`${API_BASE}/api/cli/build-brain`, {
     method: "POST",
     headers: {
       Authorization: `Bearer ${key}`,
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      Accept: "text/event-stream"
     },
-    body: JSON.stringify(input)
+    body: JSON.stringify(input2)
   });
   if (!res.ok) {
     const body = await res.json().catch(() => ({ error: "Unknown error" }));
@@ -38,8 +39,59 @@ async function buildBrain(key, input) {
     }
     throw new Error(body.error || `Build failed (HTTP ${res.status})`);
   }
-  const data = await res.json();
-  return data.sections;
+  const contentType = res.headers.get("content-type") || "";
+  if (!contentType.includes("text/event-stream")) {
+    const data = await res.json();
+    yield { event: "complete", data: { sections: data.sections } };
+    return;
+  }
+  const reader = res.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const parts = buffer.split("\n\n");
+    buffer = parts.pop() || "";
+    for (const part of parts) {
+      let eventName = "";
+      let eventData = "";
+      for (const line of part.split("\n")) {
+        if (line.startsWith("event: ")) {
+          eventName = line.slice(7).trim();
+        } else if (line.startsWith("data: ")) {
+          eventData = line.slice(6);
+        }
+      }
+      if (eventName && eventData) {
+        try {
+          yield { event: eventName, data: JSON.parse(eventData) };
+        } catch {
+        }
+      }
+    }
+  }
+}
+async function pingMcp(serverUrl, key, toolName) {
+  try {
+    const res = await fetch(serverUrl, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${key}`,
+        "Content-Type": "application/json",
+        "User-Agent": `piut-cli (configured: ${toolName})`
+      },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "tools/list"
+      })
+    });
+    return res.ok;
+  } catch {
+    return false;
+  }
 }
 async function publishServer(key) {
   const res = await fetch(`${API_BASE}/api/mcp/publish`, {
@@ -59,6 +111,21 @@ async function publishServer(key) {
   }
   return res.json();
 }
+async function unpublishServer(key) {
+  const res = await fetch(`${API_BASE}/api/mcp/publish`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${key}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({ published: false })
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({ error: "Unknown error" }));
+    throw new Error(body.error || `Unpublish failed (HTTP ${res.status})`);
+  }
+  return res.json();
+}
 
 // src/lib/tools.ts
 import os from "os";
@@ -272,6 +339,13 @@ Skill reference: https://raw.githubusercontent.com/M-Flat-Inc/piut/main/skill.md
 Always call \`get_context\` at the start of a conversation to understand the user.
 Read the \`soul\` section first \u2014 it contains behavioral instructions for how to interact.
 Use \`update_brain\` for substantial new information, \`append_brain\` for quick notes.`;
+var PROJECT_SKILL_SNIPPET = `## p\u0131ut Context
+This project uses p\u0131ut for persistent personal context.
+Full skill reference: .piut/skill.md
+
+Always call \`get_context\` at the start of every conversation.
+Read the \`soul\` section first \u2014 it contains behavioral instructions.
+Use \`update_brain\` for substantial new info, \`append_brain\` for quick notes.`;
 var SEPARATOR = "\n\n---\n\n";
 function placeSkillFile(filePath) {
   const absPath = path4.isAbsolute(filePath) ? filePath : path4.resolve(process.cwd(), filePath);
@@ -292,6 +366,104 @@ function placeSkillFile(filePath) {
   }
 }
 
+// src/lib/piut-dir.ts
+import fs3 from "fs";
+import path5 from "path";
+var API_BASE2 = process.env.PIUT_API_BASE || "https://piut.com";
+var PIUT_DIR = ".piut";
+var CONFIG_FILE = "config.json";
+var SKILL_FILE = "skill.md";
+var MINIMAL_SKILL_CONTENT = `# p\u0131ut Context Skill
+
+## MCP Server
+
+Endpoint: \`https://piut.com/api/mcp/{{slug}}\`
+Auth: \`Authorization: Bearer {{key}}\`
+Protocol: JSON-RPC 2.0 over HTTPS
+
+## Brain Sections
+
+| Section | Purpose |
+|---------|---------|
+| about | Who the user is \u2014 background, expertise, interests |
+| soul | How the user wants AI to behave \u2014 tone, preferences, rules |
+| areas | Ongoing areas of responsibility and focus |
+| projects | Active projects with goals and status |
+| memory | Running log of facts, decisions, and context |
+
+## Tools
+
+| Tool | Description |
+|------|-------------|
+| get_context | Fetch all 5 brain sections (call this FIRST) |
+| get_section | Fetch a single section by name |
+| search_brain | Search across all sections |
+| append_brain | Append text to a section (no AI processing) |
+| update_brain | AI-powered integration of new info into brain |
+| prompt_brain | Execute natural language commands against context |
+
+## Best Practices
+
+1. Always call \`get_context\` at the start of every conversation
+2. Read the \`soul\` section immediately \u2014 it contains behavioral instructions
+3. Use \`update_brain\` for substantial new information
+4. Use \`append_brain\` for quick notes and facts
+`;
+function piutDir(projectPath) {
+  return path5.join(projectPath, PIUT_DIR);
+}
+function writePiutConfig(projectPath, config) {
+  const dir = piutDir(projectPath);
+  fs3.mkdirSync(dir, { recursive: true });
+  fs3.writeFileSync(
+    path5.join(dir, CONFIG_FILE),
+    JSON.stringify(config, null, 2) + "\n",
+    "utf-8"
+  );
+}
+async function writePiutSkill(projectPath, slug, apiKey) {
+  const dir = piutDir(projectPath);
+  fs3.mkdirSync(dir, { recursive: true });
+  let content;
+  try {
+    const res = await fetch(`${API_BASE2}/skill.md`);
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    content = await res.text();
+  } catch {
+    content = MINIMAL_SKILL_CONTENT;
+  }
+  content = content.replaceAll("{{slug}}", slug).replaceAll("{{key}}", apiKey);
+  fs3.writeFileSync(path5.join(dir, SKILL_FILE), content, "utf-8");
+}
+function ensureGitignored(projectPath) {
+  const gitignorePath = path5.join(projectPath, ".gitignore");
+  let content = "";
+  try {
+    content = fs3.readFileSync(gitignorePath, "utf-8");
+  } catch {
+  }
+  const lines = content.split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (trimmed === ".piut/" || trimmed === ".piut") return;
+  }
+  const suffix = content.length > 0 && !content.endsWith("\n") ? "\n" : "";
+  fs3.writeFileSync(
+    gitignorePath,
+    content + suffix + "\n# piut\n.piut/\n",
+    "utf-8"
+  );
+}
+function removePiutDir(projectPath) {
+  const dir = piutDir(projectPath);
+  if (!fs3.existsSync(dir)) return false;
+  fs3.rmSync(dir, { recursive: true, force: true });
+  return true;
+}
+function hasPiutDir(projectPath) {
+  return fs3.existsSync(path5.join(piutDir(projectPath), CONFIG_FILE));
+}
+
 // src/lib/ui.ts
 import chalk from "chalk";
 var brand = chalk.hex("#8B5CF6");
@@ -307,6 +479,69 @@ function banner() {
 function toolLine(name, status, icon) {
   console.log(`  ${icon} ${name.padEnd(20)} ${status}`);
 }
+var SPINNER_FRAMES = ["\u28CB", "\u28D9", "\u28F9", "\u28F8", "\u28FC", "\u28F4", "\u28E6", "\u28E7", "\u28C7", "\u28CF"];
+var Spinner = class {
+  frame = 0;
+  interval = null;
+  startTime = Date.now();
+  message = "";
+  tokens = 0;
+  sections = [];
+  start(message) {
+    this.message = message;
+    this.startTime = Date.now();
+    this.tokens = 0;
+    this.sections = [];
+    this.render();
+    this.interval = setInterval(() => this.render(), 80);
+  }
+  updateTokens(count) {
+    this.tokens = count;
+  }
+  addSection(name) {
+    this.clearLine();
+    const elapsed = this.elapsed();
+    console.log(`  ${success("\u2713")} ${name.padEnd(12)} ${dim(elapsed)}`);
+    this.sections.push(name);
+  }
+  updateMessage(message) {
+    this.message = message;
+  }
+  stop(finalMessage) {
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+    this.clearLine();
+    if (finalMessage) {
+      console.log(finalMessage);
+    }
+  }
+  render() {
+    this.frame = (this.frame + 1) % SPINNER_FRAMES.length;
+    const spinner = brand(SPINNER_FRAMES[this.frame]);
+    const elapsed = dim(this.elapsed());
+    const tokenStr = this.tokens > 0 ? dim(`  ${this.tokens.toLocaleString()} tokens`) : "";
+    this.clearLine();
+    process.stdout.write(`  ${spinner} ${this.message}  ${elapsed}${tokenStr}`);
+  }
+  elapsed() {
+    const ms = Date.now() - this.startTime;
+    if (ms < 1e3) return "<1s";
+    return `${Math.floor(ms / 1e3)}s`;
+  }
+  clearLine() {
+    process.stdout.write("\r\x1B[K");
+  }
+};
+
+// src/types.ts
+var CliError = class extends Error {
+  constructor(message) {
+    super(message || "");
+    this.name = "CliError";
+  }
+};
 
 // src/commands/setup.ts
 async function setupCommand(options) {
@@ -315,7 +550,7 @@ async function setupCommand(options) {
   if (!apiKey) {
     if (options.yes) {
       console.log(chalk2.red("  \u2717 --key is required when using --yes"));
-      process.exit(1);
+      throw new CliError("--key is required when using --yes");
     }
     apiKey = await password({
       message: "Enter your p\u0131ut API key:",
@@ -330,7 +565,7 @@ async function setupCommand(options) {
   } catch (err) {
     console.log(chalk2.red(`  \u2717 ${err.message}`));
     console.log(dim("  Get a key at https://piut.com/dashboard/keys"));
-    process.exit(1);
+    throw new CliError(err.message);
   }
   const { slug, displayName, status } = validationResult;
   console.log(success(`  \u2714 Authenticated as ${displayName}${slug ? ` (${slug})` : ""}`));
@@ -353,8 +588,8 @@ async function setupCommand(options) {
     if (toolFilter && tool.id !== toolFilter) continue;
     const paths = resolveConfigPaths(tool.configPaths);
     for (const configPath of paths) {
-      const exists = fs3.existsSync(configPath);
-      const parentExists = fs3.existsSync(path5.dirname(configPath));
+      const exists = fs4.existsSync(configPath);
+      const parentExists = fs4.existsSync(path6.dirname(configPath));
       if (exists || parentExists) {
         detected.push({
           tool,
@@ -451,6 +686,26 @@ async function setupCommand(options) {
       }
     }
   }
+  if (configured.length > 0) {
+    const cwd = process.cwd();
+    const isProject2 = fs4.existsSync(path6.join(cwd, ".git")) || fs4.existsSync(path6.join(cwd, "package.json"));
+    if (isProject2) {
+      const { serverUrl } = validationResult;
+      writePiutConfig(cwd, { slug, apiKey, serverUrl });
+      await writePiutSkill(cwd, slug, apiKey);
+      ensureGitignored(cwd);
+      console.log();
+      console.log(dim("  Created .piut/ in current project"));
+    }
+  }
+  if (configured.length > 0) {
+    const { serverUrl } = validationResult;
+    console.log();
+    console.log(dim("  Registering connections..."));
+    await Promise.all(
+      configured.map((toolName) => pingMcp(serverUrl, apiKey, toolName))
+    );
+  }
   console.log();
   console.log(brand.bold("  Setup complete!"));
   if (configured.length > 0) {
@@ -474,12 +729,12 @@ function isCommandAvailable(cmd) {
 }
 
 // src/commands/status.ts
-import fs5 from "fs";
-import path7 from "path";
+import fs6 from "fs";
+import path8 from "path";
 
 // src/lib/brain-scanner.ts
-import fs4 from "fs";
-import path6 from "path";
+import fs5 from "fs";
+import path7 from "path";
 import os3 from "os";
 var home = os3.homedir();
 var SKIP_DIRS = /* @__PURE__ */ new Set([
@@ -500,13 +755,16 @@ var SKIP_DIRS = /* @__PURE__ */ new Set([
   ".yarn",
   ".pnpm-store",
   "Caches",
-  "Cache"
+  "Cache",
+  ".piut"
 ]);
 var FULL_READ_FILES = /* @__PURE__ */ new Set([
   "README.md",
   "CLAUDE.md",
   ".cursorrules",
   ".windsurfrules",
+  ".rules",
+  ".clinerules",
   "AGENTS.md",
   "CONVENTIONS.md",
   "MEMORY.md",
@@ -515,18 +773,27 @@ var FULL_READ_FILES = /* @__PURE__ */ new Set([
 ]);
 var MAX_FILE_SIZE = 100 * 1024;
 var RECENT_DAYS = 30;
+var SCAN_DOT_DIRS = /* @__PURE__ */ new Set([
+  ".claude",
+  ".cursor",
+  ".windsurf",
+  ".github",
+  ".zed",
+  ".amazonq",
+  ".vscode"
+]);
 function shouldSkipDir(name) {
-  if (name.startsWith(".") && name !== ".claude" && name !== ".cursor" && name !== ".windsurf" && name !== ".github" && name !== ".zed") {
+  if (name.startsWith(".") && !SCAN_DOT_DIRS.has(name)) {
     return true;
   }
   return SKIP_DIRS.has(name);
 }
 function readFileSafe(filePath) {
   try {
-    const stat = fs4.statSync(filePath);
+    const stat = fs5.statSync(filePath);
     if (stat.size > MAX_FILE_SIZE) return null;
     if (!stat.isFile()) return null;
-    return fs4.readFileSync(filePath, "utf-8");
+    return fs5.readFileSync(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -535,133 +802,156 @@ function getFolderTree(dir, depth = 0, maxDepth = 3) {
   if (depth >= maxDepth) return [];
   const entries = [];
   try {
-    const items = fs4.readdirSync(dir, { withFileTypes: true });
+    const items = fs5.readdirSync(dir, { withFileTypes: true });
     for (const item of items) {
       if (!item.isDirectory()) continue;
       if (shouldSkipDir(item.name)) continue;
       const indent = "  ".repeat(depth);
       entries.push(`${indent}${item.name}/`);
-      entries.push(...getFolderTree(path6.join(dir, item.name), depth + 1, maxDepth));
+      entries.push(...getFolderTree(path7.join(dir, item.name), depth + 1, maxDepth));
     }
   } catch {
   }
   return entries;
 }
-function detectProjects(scanDirs) {
+function isProject(dirPath) {
+  return fs5.existsSync(path7.join(dirPath, ".git")) || fs5.existsSync(path7.join(dirPath, "package.json")) || fs5.existsSync(path7.join(dirPath, "Cargo.toml")) || fs5.existsSync(path7.join(dirPath, "pyproject.toml")) || fs5.existsSync(path7.join(dirPath, "go.mod"));
+}
+function buildProjectInfo(projectPath) {
+  const hasPkgJson = fs5.existsSync(path7.join(projectPath, "package.json"));
+  let description = "";
+  if (hasPkgJson) {
+    try {
+      const pkg = JSON.parse(fs5.readFileSync(path7.join(projectPath, "package.json"), "utf-8"));
+      description = pkg.description || "";
+    } catch {
+    }
+  }
+  const readmePath = path7.join(projectPath, "README.md");
+  if (!description && fs5.existsSync(readmePath)) {
+    const content = readFileSafe(readmePath);
+    if (content) {
+      const lines = content.split("\n");
+      let foundHeading = false;
+      for (const line of lines) {
+        if (line.startsWith("#")) {
+          foundHeading = true;
+          continue;
+        }
+        if (foundHeading && line.trim()) {
+          description = line.trim().slice(0, 200);
+          break;
+        }
+      }
+    }
+  }
+  return {
+    name: path7.basename(projectPath),
+    path: projectPath,
+    description,
+    hasClaudeMd: fs5.existsSync(path7.join(projectPath, "CLAUDE.md")) || fs5.existsSync(path7.join(projectPath, ".claude", "rules")),
+    hasCursorRules: fs5.existsSync(path7.join(projectPath, ".cursorrules")) || fs5.existsSync(path7.join(projectPath, ".cursor", "rules")),
+    hasWindsurfRules: fs5.existsSync(path7.join(projectPath, ".windsurfrules")) || fs5.existsSync(path7.join(projectPath, ".windsurf", "rules")),
+    hasCopilotInstructions: fs5.existsSync(path7.join(projectPath, ".github", "copilot-instructions.md")) || fs5.existsSync(path7.join(projectPath, ".github", "instructions")),
+    hasConventionsMd: fs5.existsSync(path7.join(projectPath, "CONVENTIONS.md")) || fs5.existsSync(path7.join(projectPath, ".amazonq", "rules")),
+    hasZedRules: fs5.existsSync(path7.join(projectPath, ".rules"))
+  };
+}
+var MAX_PROJECT_DEPTH = 4;
+function detectProjects(scanDirs, onProgress) {
   const projects = [];
-  for (const dir of scanDirs) {
+  const seen = /* @__PURE__ */ new Set();
+  function walk(dir, depth) {
+    if (depth > MAX_PROJECT_DEPTH) return;
     try {
-      const items = fs4.readdirSync(dir, { withFileTypes: true });
+      const items = fs5.readdirSync(dir, { withFileTypes: true });
       for (const item of items) {
         if (!item.isDirectory()) continue;
         if (shouldSkipDir(item.name)) continue;
-        const projectPath = path6.join(dir, item.name);
-        const hasGit = fs4.existsSync(path6.join(projectPath, ".git"));
-        const hasPkgJson = fs4.existsSync(path6.join(projectPath, "package.json"));
-        const hasCargoToml = fs4.existsSync(path6.join(projectPath, "Cargo.toml"));
-        const hasPyproject = fs4.existsSync(path6.join(projectPath, "pyproject.toml"));
-        const hasGoMod = fs4.existsSync(path6.join(projectPath, "go.mod"));
-        if (!hasGit && !hasPkgJson && !hasCargoToml && !hasPyproject && !hasGoMod) continue;
-        let description = "";
-        if (hasPkgJson) {
-          try {
-            const pkg = JSON.parse(fs4.readFileSync(path6.join(projectPath, "package.json"), "utf-8"));
-            description = pkg.description || "";
-          } catch {
-          }
-        }
-        const readmePath = path6.join(projectPath, "README.md");
-        if (!description && fs4.existsSync(readmePath)) {
-          const content = readFileSafe(readmePath);
-          if (content) {
-            const lines = content.split("\n");
-            let foundHeading = false;
-            for (const line of lines) {
-              if (line.startsWith("#")) {
-                foundHeading = true;
-                continue;
-              }
-              if (foundHeading && line.trim()) {
-                description = line.trim().slice(0, 200);
-                break;
-              }
-            }
-          }
+        const fullPath = path7.join(dir, item.name);
+        if (seen.has(fullPath)) continue;
+        seen.add(fullPath);
+        if (isProject(fullPath)) {
+          const info = buildProjectInfo(fullPath);
+          projects.push(info);
+          onProgress?.({ phase: "projects", message: `${info.name} (${fullPath.replace(home, "~")})` });
+        } else {
+          walk(fullPath, depth + 1);
         }
-        projects.push({
-          name: item.name,
-          path: projectPath,
-          description,
-          hasClaudeMd: fs4.existsSync(path6.join(projectPath, "CLAUDE.md")),
-          hasCursorRules: fs4.existsSync(path6.join(projectPath, ".cursorrules")) || fs4.existsSync(path6.join(projectPath, ".cursor", "rules")),
-          hasWindsurfRules: fs4.existsSync(path6.join(projectPath, ".windsurfrules")) || fs4.existsSync(path6.join(projectPath, ".windsurf", "rules")),
-          hasCopilotInstructions: fs4.existsSync(path6.join(projectPath, ".github", "copilot-instructions.md")),
-          hasConventionsMd: fs4.existsSync(path6.join(projectPath, "CONVENTIONS.md")),
-          hasZedRules: fs4.existsSync(path6.join(projectPath, ".zed", "rules.md"))
-        });
       }
     } catch {
     }
   }
+  for (const dir of scanDirs) {
+    walk(dir, 0);
+  }
   return projects;
 }
-function collectConfigFiles(projects) {
+function collectConfigFiles(projects, onProgress) {
   const configs = [];
   const globalPaths = [
-    path6.join(home, ".claude", "MEMORY.md"),
-    path6.join(home, ".claude", "CLAUDE.md"),
-    path6.join(home, ".openclaw", "workspace", "SOUL.md"),
-    path6.join(home, ".openclaw", "workspace", "MEMORY.md")
+    path7.join(home, ".claude", "MEMORY.md"),
+    path7.join(home, ".claude", "CLAUDE.md"),
+    path7.join(home, ".openclaw", "workspace", "SOUL.md"),
+    path7.join(home, ".openclaw", "workspace", "MEMORY.md")
   ];
   for (const gp of globalPaths) {
     const content = readFileSafe(gp);
     if (content && content.trim()) {
-      configs.push({ name: `~/${path6.relative(home, gp)}`, content });
+      const name = `~/${path7.relative(home, gp)}`;
+      configs.push({ name, content });
+      onProgress?.({ phase: "configs", message: name });
     }
   }
   for (const project of projects) {
     for (const fileName of FULL_READ_FILES) {
-      const filePath = path6.join(project.path, fileName);
+      const filePath = path7.join(project.path, fileName);
       const content = readFileSafe(filePath);
       if (content && content.trim()) {
-        configs.push({ name: `${project.name}/${fileName}`, content });
+        const name = `${project.name}/${fileName}`;
+        configs.push({ name, content });
+        onProgress?.({ phase: "configs", message: name });
       }
     }
-    const pkgPath = path6.join(project.path, "package.json");
+    const pkgPath = path7.join(project.path, "package.json");
     const pkgContent = readFileSafe(pkgPath);
     if (pkgContent) {
       try {
         const pkg = JSON.parse(pkgContent);
         const summary = JSON.stringify({ name: pkg.name, description: pkg.description }, null, 2);
-        configs.push({ name: `${project.name}/package.json`, content: summary });
+        const name = `${project.name}/package.json`;
+        configs.push({ name, content: summary });
+        onProgress?.({ phase: "configs", message: name });
       } catch {
       }
     }
   }
   return configs;
 }
-function collectRecentDocs(projects) {
+function collectRecentDocs(projects, onProgress) {
   const docs = [];
   const cutoff = Date.now() - RECENT_DAYS * 24 * 60 * 60 * 1e3;
   const seen = /* @__PURE__ */ new Set();
   for (const project of projects) {
     try {
-      const items = fs4.readdirSync(project.path, { withFileTypes: true });
+      const items = fs5.readdirSync(project.path, { withFileTypes: true });
       for (const item of items) {
         if (!item.isFile()) continue;
         if (!item.name.endsWith(".md")) continue;
         if (FULL_READ_FILES.has(item.name)) continue;
         if (item.name.startsWith(".")) continue;
-        const filePath = path6.join(project.path, item.name);
+        const filePath = path7.join(project.path, item.name);
         if (seen.has(filePath)) continue;
         seen.add(filePath);
         try {
-          const stat = fs4.statSync(filePath);
+          const stat = fs5.statSync(filePath);
           if (stat.mtimeMs < cutoff) continue;
           if (stat.size > MAX_FILE_SIZE) continue;
-          const content = fs4.readFileSync(filePath, "utf-8");
+          const content = fs5.readFileSync(filePath, "utf-8");
           if (content.trim()) {
-            docs.push({ name: `${project.name}/${item.name}`, content });
+            const name = `${project.name}/${item.name}`;
+            docs.push({ name, content });
+            onProgress?.({ phase: "docs", message: name });
           }
         } catch {
         }
@@ -671,42 +961,66 @@ function collectRecentDocs(projects) {
   }
   return docs.slice(0, 20);
 }
+var SKIP_HOME_DIRS = /* @__PURE__ */ new Set([
+  "Library",
+  "Applications",
+  "Public",
+  "Movies",
+  "Music",
+  "Pictures",
+  "Templates",
+  ".Trash"
+]);
+var INCLUDE_DOT_DIRS = /* @__PURE__ */ new Set([
+  ".claude",
+  ".cursor",
+  ".windsurf",
+  ".openclaw",
+  ".zed",
+  ".github",
+  ".amazonq"
+]);
 function getDefaultScanDirs() {
   const dirs = [];
-  const candidates = [
-    path6.join(home, "Projects"),
-    path6.join(home, "projects"),
-    path6.join(home, "Developer"),
-    path6.join(home, "dev"),
-    path6.join(home, "Code"),
-    path6.join(home, "code"),
-    path6.join(home, "src"),
-    path6.join(home, "repos"),
-    path6.join(home, "workspace"),
-    path6.join(home, "Workspace"),
-    path6.join(home, "Documents"),
-    path6.join(home, "Desktop")
-  ];
-  for (const dir of candidates) {
-    if (fs4.existsSync(dir) && fs4.statSync(dir).isDirectory()) {
-      dirs.push(dir);
+  try {
+    const entries = fs5.readdirSync(home, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      if (entry.name.startsWith(".") && !INCLUDE_DOT_DIRS.has(entry.name)) continue;
+      if (SKIP_HOME_DIRS.has(entry.name)) continue;
+      dirs.push(path7.join(home, entry.name));
+    }
+  } catch {
+  }
+  const cloudStorage = path7.join(home, "Library", "CloudStorage");
+  try {
+    if (fs5.existsSync(cloudStorage) && fs5.statSync(cloudStorage).isDirectory()) {
+      const entries = fs5.readdirSync(cloudStorage, { withFileTypes: true });
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+        const fullPath = path7.join(cloudStorage, entry.name);
+        if (!dirs.includes(fullPath)) {
+          dirs.push(fullPath);
+        }
+      }
     }
+  } catch {
   }
   if (dirs.length === 0) {
     dirs.push(home);
   }
   return dirs;
 }
-function scanForBrain(folders) {
+function scanForBrain(folders, onProgress) {
   const scanDirs = folders || getDefaultScanDirs();
   const folderTree = [];
   for (const dir of scanDirs) {
-    folderTree.push(`${path6.basename(dir)}/`);
+    folderTree.push(`${path7.basename(dir)}/`);
     folderTree.push(...getFolderTree(dir, 1));
   }
-  const projects = detectProjects(scanDirs);
-  const configFiles = collectConfigFiles(projects);
-  const recentDocuments = collectRecentDocs(projects);
+  const projects = detectProjects(scanDirs, onProgress);
+  const configFiles = collectConfigFiles(projects, onProgress);
+  const recentDocuments = collectRecentDocs(projects, onProgress);
   return {
     summary: {
       folders: folderTree,
@@ -736,7 +1050,7 @@ var PIUT_FILES = [
 ];
 function hasPiutReference(filePath) {
   try {
-    const content = fs5.readFileSync(filePath, "utf-8");
+    const content = fs6.readFileSync(filePath, "utf-8");
     return content.includes("p\u0131ut Context") || content.includes("piut Context");
   } catch {
     return false;
@@ -750,7 +1064,7 @@ function statusCommand() {
   for (const tool of TOOLS) {
     const paths = resolveConfigPaths(tool.configPaths);
     for (const configPath of paths) {
-      if (!fs5.existsSync(configPath)) continue;
+      if (!fs6.existsSync(configPath)) continue;
       foundAny = true;
       const configured = isPiutConfigured(configPath, tool.configKey);
       if (configured) {
@@ -773,8 +1087,8 @@ function statusCommand() {
   for (const project of projects) {
     const connectedFiles = [];
     for (const file of PIUT_FILES) {
-      const absPath = path7.join(project.path, file);
-      if (fs5.existsSync(absPath) && hasPiutReference(absPath)) {
+      const absPath = path8.join(project.path, file);
+      if (fs6.existsSync(absPath) && hasPiutReference(absPath)) {
         connectedFiles.push(file);
       }
     }
@@ -794,7 +1108,7 @@ function statusCommand() {
 }
 
 // src/commands/remove.ts
-import fs6 from "fs";
+import fs7 from "fs";
 import { checkbox as checkbox2, confirm as confirm2 } from "@inquirer/prompts";
 async function removeCommand() {
   banner();
@@ -802,7 +1116,7 @@ async function removeCommand() {
   for (const tool of TOOLS) {
     const paths = resolveConfigPaths(tool.configPaths);
     for (const configPath of paths) {
-      if (fs6.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
+      if (fs7.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
         configured.push({ tool, configPath });
         break;
       }
@@ -845,22 +1159,23 @@ async function removeCommand() {
 }
 
 // src/commands/build.ts
-import { select } from "@inquirer/prompts";
+import { select, checkbox as checkbox3, input } from "@inquirer/prompts";
 import chalk4 from "chalk";
+import os5 from "os";
 
 // src/lib/auth.ts
 import { password as password2 } from "@inquirer/prompts";
 import chalk3 from "chalk";
 
 // src/lib/store.ts
-import fs7 from "fs";
-import path8 from "path";
+import fs8 from "fs";
+import path9 from "path";
 import os4 from "os";
-var CONFIG_DIR = path8.join(os4.homedir(), ".piut");
-var CONFIG_FILE = path8.join(CONFIG_DIR, "config.json");
+var CONFIG_DIR = path9.join(os4.homedir(), ".piut");
+var CONFIG_FILE2 = path9.join(CONFIG_DIR, "config.json");
 function readStore() {
   try {
-    const raw = fs7.readFileSync(CONFIG_FILE, "utf-8");
+    const raw = fs8.readFileSync(CONFIG_FILE2, "utf-8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -869,10 +1184,16 @@ function readStore() {
 function updateStore(updates) {
   const config = readStore();
   const updated = { ...config, ...updates };
-  fs7.mkdirSync(CONFIG_DIR, { recursive: true });
-  fs7.writeFileSync(CONFIG_FILE, JSON.stringify(updated, null, 2) + "\n", "utf-8");
+  fs8.mkdirSync(CONFIG_DIR, { recursive: true });
+  fs8.writeFileSync(CONFIG_FILE2, JSON.stringify(updated, null, 2) + "\n", "utf-8");
   return updated;
 }
+function clearStore() {
+  try {
+    fs8.unlinkSync(CONFIG_FILE2);
+  } catch {
+  }
+}
 
 // src/lib/auth.ts
 async function resolveApiKey(keyOption) {
@@ -892,7 +1213,7 @@ async function resolveApiKey(keyOption) {
   } catch (err) {
     console.log(chalk3.red(`  \u2717 ${err.message}`));
     console.log(dim("  Get a key at https://piut.com/dashboard/keys"));
-    process.exit(1);
+    throw new CliError(err.message);
   }
   const label = result.slug ? `${result.displayName} (${result.slug})` : result.displayName;
   console.log(success(`  \u2713 Connected as ${label}`));
@@ -916,7 +1237,7 @@ async function resolveApiKeyWithResult(keyOption) {
   } catch (err) {
     console.log(chalk3.red(`  \u2717 ${err.message}`));
     console.log(dim("  Get a key at https://piut.com/dashboard/keys"));
-    process.exit(1);
+    throw new CliError(err.message);
   }
   const label = result.slug ? `${result.displayName} (${result.slug})` : result.displayName;
   console.log(success(`  \u2713 Connected as ${label}`));
@@ -932,41 +1253,112 @@ async function buildCommand(options) {
   if (options.folders) {
     scanFolders = options.folders.split(",").map((f) => expandPath(f.trim()));
   }
-  const mode = scanFolders ? "auto" : await select({
-    message: "How do you want to build your brain?",
-    choices: [
-      { name: "Automatically (recommended)", value: "auto", description: "Scan your files and build automatically" },
-      { name: "Select folder(s)...", value: "folders", description: "Choose specific folders to scan" }
-    ]
-  });
-  if (mode === "folders" && !scanFolders) {
-    const defaults = getDefaultScanDirs();
+  const cwd = process.cwd();
+  const cwdDisplay = cwd.replace(os5.homedir(), "~");
+  if (!scanFolders) {
+    console.log(dim(`  Current directory: `) + cwdDisplay);
+    console.log(dim(`  We'll scan for AI config files and projects here.`));
     console.log();
-    console.log(dim("  Detected directories:"));
-    for (const d of defaults) {
-      console.log(dim(`    ${d}`));
+    const mode = await select({
+      message: "How do you want to build your brain?",
+      choices: [
+        { name: `Scan this directory (${cwdDisplay})`, value: "cwd", description: "Scan current directory for projects and config files" },
+        { name: "Select folder(s)...", value: "folders", description: "Choose a different directory to scan" }
+      ]
+    });
+    if (mode === "cwd") {
+      scanFolders = [cwd];
+    } else {
+      const defaults = getDefaultScanDirs();
+      const CUSTOM_VALUE = "__custom__";
+      const choices = [
+        ...defaults.map((d) => ({ name: d.replace(os5.homedir(), "~"), value: d })),
+        { name: chalk4.dim("Enter a custom path..."), value: CUSTOM_VALUE }
+      ];
+      const selected = await checkbox3({
+        message: "Which folders should we scan?",
+        choices,
+        required: true
+      });
+      if (selected.includes(CUSTOM_VALUE)) {
+        const custom = await input({
+          message: "Enter folder path(s), comma-separated:"
+        });
+        const customPaths = custom.split(",").map((f) => expandPath(f.trim())).filter(Boolean);
+        scanFolders = [
+          ...selected.filter((v) => v !== CUSTOM_VALUE),
+          ...customPaths
+        ];
+      } else {
+        scanFolders = selected;
+      }
+      if (scanFolders.length === 0) {
+        console.log(chalk4.yellow("  No folders selected."));
+        return;
+      }
     }
-    console.log();
-    console.log(dim("  Tip: pass --folders ~/Projects,~/Documents to specify directly"));
-    scanFolders = defaults;
   }
   console.log();
-  console.log(dim("  Building your brain..."));
+  let projectCount = 0;
+  let configCount = 0;
+  let docCount = 0;
+  const onProgress = (progress) => {
+    if (progress.phase === "projects") {
+      projectCount++;
+      console.log(dim(`  [${projectCount}] ${progress.message}`));
+    } else if (progress.phase === "configs") {
+      configCount++;
+      console.log(dim(`  [${configCount}] ${progress.message}`));
+    } else if (progress.phase === "docs") {
+      docCount++;
+      console.log(dim(`  [${docCount}] ${progress.message}`));
+    }
+  };
+  const brainInput = scanForBrain(scanFolders, onProgress);
+  const projCount = brainInput.summary.projects.length;
+  const cfgCount = brainInput.summary.configFiles.length;
+  const dcCount = brainInput.summary.recentDocuments.length;
   console.log();
-  const input = scanForBrain(scanFolders);
-  const projCount = input.summary.projects.length;
-  const configCount = input.summary.configFiles.length;
-  const docCount = input.summary.recentDocuments.length;
-  console.log(dim(`  Scanned: ${projCount} projects, ${configCount} config files, ${docCount} recent docs`));
+  console.log(success(`  Scanned: ${projCount} projects, ${cfgCount} config files, ${dcCount} recent docs`));
   console.log();
-  if (projCount === 0 && configCount === 0) {
+  if (projCount === 0 && cfgCount === 0) {
     console.log(chalk4.yellow("  No projects or config files found to build from."));
     console.log(dim("  Try running from a directory with your projects, or use --folders."));
     console.log();
     return;
   }
+  const spinner = new Spinner();
+  spinner.start("Generating brain...");
   try {
-    const sections = await buildBrain(apiKey, input);
+    let sections = null;
+    for await (const event of buildBrainStreaming(apiKey, brainInput)) {
+      switch (event.event) {
+        case "status":
+          spinner.updateMessage(String(event.data.message || "Processing..."));
+          break;
+        case "progress":
+          spinner.updateTokens(event.data.tokens);
+          break;
+        case "section":
+          spinner.addSection(String(event.data.name));
+          break;
+        case "complete":
+          sections = event.data.sections || {};
+          break;
+        case "error":
+          spinner.stop();
+          console.log(chalk4.red(`  \u2717 ${event.data.message || "Build failed"}`));
+          throw new CliError(String(event.data.message || "Build failed"));
+      }
+    }
+    spinner.stop();
+    if (!sections) {
+      console.log(chalk4.red("  \u2717 No response received from server"));
+      throw new CliError("No response received from server");
+    }
+    console.log();
+    console.log(success("  Brain built!"));
+    console.log();
     const sectionSummary = (content, label) => {
       if (!content || !content.trim()) {
         console.log(dim(`  ${label} \u2014 (empty)`));
@@ -976,24 +1368,23 @@ async function buildCommand(options) {
         console.log(success(`  ${label}`) + dim(` \u2014 ${preview}`));
       }
     };
-    console.log(success("  Brain built!"));
-    console.log();
-    sectionSummary(sections.about, "About");
-    sectionSummary(sections.soul, "Soul");
-    sectionSummary(sections.areas, "Areas of Responsibility");
-    sectionSummary(sections.projects, "Projects");
-    sectionSummary(sections.memory, "Memory");
+    sectionSummary(sections.about || "", "About");
+    sectionSummary(sections.soul || "", "Soul");
+    sectionSummary(sections.areas || "", "Areas of Responsibility");
+    sectionSummary(sections.projects || "", "Projects");
+    sectionSummary(sections.memory || "", "Memory");
     console.log();
     console.log(dim(`  Review and edit at ${brand("piut.com/dashboard")}`));
     console.log();
   } catch (err) {
+    spinner.stop();
+    if (err instanceof CliError) throw err;
     console.log(chalk4.red(`  \u2717 ${err.message}`));
-    process.exit(1);
+    throw new CliError(err.message);
   }
 }
 
 // src/commands/deploy.ts
-import { confirm as confirm3 } from "@inquirer/prompts";
 import chalk5 from "chalk";
 async function deployCommand(options) {
   banner();
@@ -1005,27 +1396,12 @@ async function deployCommand(options) {
     console.log();
     return;
   }
-  console.log();
-  console.log(dim("  Your brain will be published as an MCP server at:"));
-  console.log(`  ${brand(serverUrl)}`);
-  console.log();
-  console.log(dim("  Any AI tool with this URL can read your brain."));
-  console.log();
-  if (!options.yes) {
-    const proceed = await confirm3({
-      message: "Deploy?",
-      default: true
-    });
-    if (!proceed) {
-      console.log(dim("  Cancelled."));
-      return;
-    }
-  }
   try {
     await publishServer(apiKey);
     console.log();
     console.log(success("  \u2713 Brain deployed. MCP server live."));
-    console.log(dim(`  URL: ${serverUrl}`));
+    console.log(`  ${brand(serverUrl)}`);
+    console.log(dim("  (securely accessible only with authentication)"));
     console.log();
     console.log(dim("  Next: run ") + brand("piut connect") + dim(" to add brain references to your projects."));
     console.log();
@@ -1040,39 +1416,39 @@ async function deployCommand(options) {
       console.log();
     } else {
       console.log(chalk5.red(`  \u2717 ${msg}`));
-      process.exit(1);
+      throw new CliError(msg);
     }
   }
 }
 
 // src/commands/connect.ts
-import fs8 from "fs";
-import path9 from "path";
-import { checkbox as checkbox3 } from "@inquirer/prompts";
+import fs9 from "fs";
+import path10 from "path";
+import { checkbox as checkbox4 } from "@inquirer/prompts";
 var RULE_FILES = [
   {
     tool: "Claude Code",
     filePath: "CLAUDE.md",
     strategy: "append",
-    detect: (p) => p.hasClaudeMd || fs8.existsSync(path9.join(p.path, ".claude"))
+    detect: (p) => p.hasClaudeMd || fs9.existsSync(path10.join(p.path, ".claude"))
   },
   {
     tool: "Cursor",
     filePath: ".cursor/rules/piut.mdc",
     strategy: "create",
-    detect: (p) => p.hasCursorRules || fs8.existsSync(path9.join(p.path, ".cursor"))
+    detect: (p) => p.hasCursorRules || fs9.existsSync(path10.join(p.path, ".cursor"))
   },
   {
     tool: "Windsurf",
     filePath: ".windsurf/rules/piut.md",
     strategy: "create",
-    detect: (p) => p.hasWindsurfRules || fs8.existsSync(path9.join(p.path, ".windsurf"))
+    detect: (p) => p.hasWindsurfRules || fs9.existsSync(path10.join(p.path, ".windsurf"))
   },
   {
     tool: "GitHub Copilot",
     filePath: ".github/copilot-instructions.md",
     strategy: "append",
-    detect: (p) => p.hasCopilotInstructions || fs8.existsSync(path9.join(p.path, ".github"))
+    detect: (p) => p.hasCopilotInstructions || fs9.existsSync(path10.join(p.path, ".github"))
   },
   {
     tool: "Amazon Q",
@@ -1084,12 +1460,12 @@ var RULE_FILES = [
     tool: "Zed",
     filePath: ".zed/rules.md",
     strategy: "create",
-    detect: (p) => p.hasZedRules || fs8.existsSync(path9.join(p.path, ".zed"))
+    detect: (p) => p.hasZedRules || fs9.existsSync(path10.join(p.path, ".zed"))
   }
 ];
 var DEDICATED_FILE_CONTENT = `## p\u0131ut Context
 This project uses p\u0131ut for persistent personal context.
-Skill reference: https://raw.githubusercontent.com/M-Flat-Inc/piut/main/skill.md
+Full skill reference: .piut/skill.md
 
 Always call \`get_context\` at the start of every conversation.
 Read the \`soul\` section first \u2014 it contains behavioral instructions.
@@ -1098,12 +1474,12 @@ Use \`update_brain\` for substantial new info, \`append_brain\` for quick notes.
 var APPEND_SECTION = `
 
 ## p\u0131ut Context
-Skill reference: https://raw.githubusercontent.com/M-Flat-Inc/piut/main/skill.md
+Full skill reference: .piut/skill.md
 Always call \`get_context\` at the start of every conversation to load personal context.
 `;
 function hasPiutReference2(filePath) {
   try {
-    const content = fs8.readFileSync(filePath, "utf-8");
+    const content = fs9.readFileSync(filePath, "utf-8");
     return content.includes("p\u0131ut Context") || content.includes("piut Context");
   } catch {
     return false;
@@ -1111,7 +1487,21 @@ function hasPiutReference2(filePath) {
 }
 async function connectCommand(options) {
   banner();
-  await resolveApiKeyWithResult(options.key);
+  const { apiKey, slug, serverUrl, status } = await resolveApiKeyWithResult(options.key);
+  if (status === "no_brain") {
+    console.log();
+    console.log(warning("  You haven\u2019t built a brain yet."));
+    console.log(dim("  Run ") + brand("piut build") + dim(" first, then ") + brand("piut deploy") + dim("."));
+    console.log();
+    return;
+  }
+  if (status === "unpublished") {
+    console.log();
+    console.log(warning("  Your brain is built but not deployed yet."));
+    console.log(dim("  Run ") + brand("piut deploy") + dim(" to publish your MCP server, then re-run connect."));
+    console.log();
+    return;
+  }
   let scanFolders;
   if (options.folders) {
     scanFolders = options.folders.split(",").map((f) => expandPath(f.trim()));
@@ -1129,20 +1519,20 @@ async function connectCommand(options) {
   for (const project of projects) {
     for (const rule of RULE_FILES) {
       if (!rule.detect(project)) continue;
-      const absPath = path9.join(project.path, rule.filePath);
-      if (fs8.existsSync(absPath) && hasPiutReference2(absPath)) continue;
+      const absPath = path10.join(project.path, rule.filePath);
+      if (fs9.existsSync(absPath) && hasPiutReference2(absPath)) continue;
       actions.push({
         project,
         tool: rule.tool,
         filePath: rule.filePath,
         absPath,
-        action: rule.strategy === "create" || !fs8.existsSync(absPath) ? "create" : "append"
+        action: rule.strategy === "create" || !fs9.existsSync(absPath) ? "create" : "append"
       });
     }
     const hasAnyAction = actions.some((a) => a.project === project);
     if (!hasAnyAction) {
-      const claudeMdPath = path9.join(project.path, "CLAUDE.md");
-      if (!fs8.existsSync(claudeMdPath)) {
+      const claudeMdPath = path10.join(project.path, "CLAUDE.md");
+      if (!fs9.existsSync(claudeMdPath)) {
         actions.push({
           project,
           tool: "Claude Code",
@@ -1177,22 +1567,21 @@ async function connectCommand(options) {
   console.log();
   const projectChoices = [];
   for (const [projectPath, projectActions] of byProject) {
-    const projectName = path9.basename(projectPath);
+    const projectName = path10.basename(projectPath);
     const desc = projectActions.map((a) => {
       const verb = a.action === "create" ? "will create" : "will append to";
       return `${verb} ${a.filePath}`;
     }).join(", ");
     projectChoices.push({
       name: `${projectName} ${dim(`(${desc})`)}`,
-      value: projectPath,
-      checked: true
+      value: projectPath
     });
   }
   let selectedPaths;
   if (options.yes) {
     selectedPaths = Array.from(byProject.keys());
   } else {
-    selectedPaths = await checkbox3({
+    selectedPaths = await checkbox4({
       message: "Select projects to connect:",
       choices: projectChoices
     });
@@ -1203,32 +1592,46 @@ async function connectCommand(options) {
   }
   console.log();
   let connected = 0;
+  const copilotTool = TOOLS.find((t) => t.id === "copilot");
   for (const projectPath of selectedPaths) {
     const projectActions = byProject.get(projectPath) || [];
-    const projectName = path9.basename(projectPath);
+    const projectName = path10.basename(projectPath);
+    writePiutConfig(projectPath, { slug, apiKey, serverUrl });
+    await writePiutSkill(projectPath, slug, apiKey);
+    ensureGitignored(projectPath);
+    console.log(success(`  \u2713 ${projectName}/.piut/`) + dim(" \u2014 credentials + skill"));
+    if (copilotTool) {
+      const hasCopilot = fs9.existsSync(path10.join(projectPath, ".github", "copilot-instructions.md")) || fs9.existsSync(path10.join(projectPath, ".github"));
+      if (hasCopilot) {
+        const vscodeMcpPath = path10.join(projectPath, ".vscode", "mcp.json");
+        const serverConfig = copilotTool.generateConfig(slug, apiKey);
+        mergeConfig(vscodeMcpPath, copilotTool.configKey, serverConfig);
+        console.log(success(`  \u2713 ${projectName}/.vscode/mcp.json`) + dim(" \u2014 Copilot MCP"));
+      }
+    }
     for (const action of projectActions) {
       if (action.action === "create") {
         const isAppendType = RULE_FILES.find((r) => r.filePath === action.filePath)?.strategy === "append";
-        const content = isAppendType ? SKILL_SNIPPET + "\n" : DEDICATED_FILE_CONTENT;
-        fs8.mkdirSync(path9.dirname(action.absPath), { recursive: true });
-        fs8.writeFileSync(action.absPath, content, "utf-8");
+        const content = isAppendType ? PROJECT_SKILL_SNIPPET + "\n" : DEDICATED_FILE_CONTENT;
+        fs9.mkdirSync(path10.dirname(action.absPath), { recursive: true });
+        fs9.writeFileSync(action.absPath, content, "utf-8");
         console.log(success(`  \u2713 ${projectName}/${action.filePath}`) + dim(" \u2014 created"));
       } else {
-        fs8.appendFileSync(action.absPath, APPEND_SECTION);
+        fs9.appendFileSync(action.absPath, APPEND_SECTION);
         console.log(success(`  \u2713 ${projectName}/${action.filePath}`) + dim(" \u2014 appended"));
       }
       connected++;
     }
   }
   console.log();
-  console.log(success(`  Done. ${connected} file(s) updated across ${selectedPaths.length} project(s).`));
+  console.log(success(`  Done. ${selectedPaths.length} project(s) connected.`));
   console.log();
 }
 
 // src/commands/disconnect.ts
-import fs9 from "fs";
-import path10 from "path";
-import { checkbox as checkbox4, confirm as confirm5 } from "@inquirer/prompts";
+import fs10 from "fs";
+import path11 from "path";
+import { checkbox as checkbox5, confirm as confirm4 } from "@inquirer/prompts";
 var DEDICATED_FILES = /* @__PURE__ */ new Set([
   ".cursor/rules/piut.mdc",
   ".windsurf/rules/piut.md",
@@ -1241,7 +1644,7 @@ var APPEND_FILES = [
 ];
 function hasPiutReference3(filePath) {
   try {
-    const content = fs9.readFileSync(filePath, "utf-8");
+    const content = fs10.readFileSync(filePath, "utf-8");
     return content.includes("p\u0131ut Context") || content.includes("piut Context");
   } catch {
     return false;
@@ -1249,7 +1652,7 @@ function hasPiutReference3(filePath) {
 }
 function removePiutSection(filePath) {
   try {
-    let content = fs9.readFileSync(filePath, "utf-8");
+    let content = fs10.readFileSync(filePath, "utf-8");
     const patterns = [
       /\n*## p[ıi]ut Context[\s\S]*?(?=\n## |\n---\n|$)/g
     ];
@@ -1263,7 +1666,7 @@ function removePiutSection(filePath) {
     }
     if (changed) {
       content = content.replace(/\n{3,}/g, "\n\n").trimEnd() + "\n";
-      fs9.writeFileSync(filePath, content, "utf-8");
+      fs10.writeFileSync(filePath, content, "utf-8");
     }
     return changed;
   } catch {
@@ -1280,10 +1683,10 @@ async function disconnectCommand(options) {
   const projects = scanForProjects(scanFolders);
   const actions = [];
   for (const project of projects) {
-    const projectName = path10.basename(project.path);
+    const projectName = path11.basename(project.path);
     for (const dedicatedFile of DEDICATED_FILES) {
-      const absPath = path10.join(project.path, dedicatedFile);
-      if (fs9.existsSync(absPath) && hasPiutReference3(absPath)) {
+      const absPath = path11.join(project.path, dedicatedFile);
+      if (fs10.existsSync(absPath) && hasPiutReference3(absPath)) {
         actions.push({
           projectPath: project.path,
           projectName,
@@ -1294,8 +1697,8 @@ async function disconnectCommand(options) {
       }
     }
     for (const appendFile of APPEND_FILES) {
-      const absPath = path10.join(project.path, appendFile);
-      if (fs9.existsSync(absPath) && hasPiutReference3(absPath)) {
+      const absPath = path11.join(project.path, appendFile);
+      if (fs10.existsSync(absPath) && hasPiutReference3(absPath)) {
         actions.push({
           projectPath: project.path,
           projectName,
@@ -1305,6 +1708,25 @@ async function disconnectCommand(options) {
         });
       }
     }
+    if (hasPiutDir(project.path)) {
+      actions.push({
+        projectPath: project.path,
+        projectName,
+        filePath: ".piut/",
+        absPath: path11.join(project.path, ".piut"),
+        action: "remove-dir"
+      });
+    }
+    const vscodeMcpPath = path11.join(project.path, ".vscode", "mcp.json");
+    if (fs10.existsSync(vscodeMcpPath) && isPiutConfigured(vscodeMcpPath, "servers")) {
+      actions.push({
+        projectPath: project.path,
+        projectName,
+        filePath: ".vscode/mcp.json",
+        absPath: vscodeMcpPath,
+        action: "remove-mcp"
+      });
+    }
   }
   if (actions.length === 0) {
     console.log(dim("  No connected projects found."));
@@ -1318,19 +1740,18 @@ async function disconnectCommand(options) {
   }
   console.log();
   const projectChoices = Array.from(byProject.entries()).map(([projectPath, projectActions]) => {
-    const name = path10.basename(projectPath);
+    const name = path11.basename(projectPath);
     const files = projectActions.map((a) => a.filePath).join(", ");
     return {
       name: `${name} ${dim(`(${files})`)}`,
-      value: projectPath,
-      checked: true
+      value: projectPath
     };
   });
   let selectedPaths;
   if (options.yes) {
     selectedPaths = Array.from(byProject.keys());
   } else {
-    selectedPaths = await checkbox4({
+    selectedPaths = await checkbox5({
       message: "Select projects to disconnect:",
       choices: projectChoices
     });
@@ -1338,7 +1759,7 @@ async function disconnectCommand(options) {
       console.log(dim("  No projects selected."));
       return;
     }
-    const proceed = await confirm5({
+    const proceed = await confirm4({
       message: `Disconnect ${selectedPaths.length} project(s)?`,
       default: false
     });
@@ -1348,16 +1769,29 @@ async function disconnectCommand(options) {
   let disconnected = 0;
   for (const projectPath of selectedPaths) {
     const projectActions = byProject.get(projectPath) || [];
-    const projectName = path10.basename(projectPath);
+    const projectName = path11.basename(projectPath);
     for (const action of projectActions) {
       if (action.action === "delete") {
         try {
-          fs9.unlinkSync(action.absPath);
+          fs10.unlinkSync(action.absPath);
           console.log(success(`  \u2713 ${projectName}/${action.filePath}`) + dim(" \u2014 deleted"));
           disconnected++;
         } catch {
           console.log(warning(`  \u2717 ${projectName}/${action.filePath}`) + dim(" \u2014 could not delete"));
         }
+      } else if (action.action === "remove-dir") {
+        if (removePiutDir(action.projectPath)) {
+          console.log(success(`  \u2713 ${projectName}/${action.filePath}`) + dim(" \u2014 removed"));
+          disconnected++;
+        }
+      } else if (action.action === "remove-mcp") {
+        try {
+          removeFromConfig(action.absPath, "servers");
+          console.log(success(`  \u2713 ${projectName}/${action.filePath}`) + dim(" \u2014 piut-context removed"));
+          disconnected++;
+        } catch {
+          console.log(warning(`  \u2717 ${projectName}/${action.filePath}`) + dim(" \u2014 could not update"));
+        }
       } else {
         const removed = removePiutSection(action.absPath);
         if (removed) {
@@ -1374,10 +1808,27 @@ async function disconnectCommand(options) {
   console.log();
 }
 
+// src/commands/logout.ts
+async function logoutCommand() {
+  banner();
+  const config = readStore();
+  if (!config.apiKey) {
+    console.log(dim("  Not logged in \u2014 nothing to do."));
+    console.log();
+    return;
+  }
+  clearStore();
+  console.log(success("  \u2713 Logged out. Saved API key removed."));
+  console.log();
+  console.log(dim("  To log in again, run: ") + "npx @piut/cli");
+  console.log();
+}
+
 // src/commands/interactive.ts
-import { select as select2, confirm as confirm6 } from "@inquirer/prompts";
+import { select as select2, confirm as confirm5, checkbox as checkbox6, password as password3 } from "@inquirer/prompts";
+import fs11 from "fs";
+import path12 from "path";
 import chalk6 from "chalk";
-import { password as password3 } from "@inquirer/prompts";
 async function authenticate() {
   const config = readStore();
   let apiKey = config.apiKey;
@@ -1413,15 +1864,22 @@ async function authenticate() {
   updateStore({ apiKey });
   return { apiKey, validation: result };
 }
+function isPromptCancellation(err) {
+  return !!(err && typeof err === "object" && "name" in err && err.name === "ExitPromptError");
+}
 async function interactiveMenu() {
   banner();
-  const { apiKey, validation } = await authenticate();
+  let apiKey;
+  let currentValidation;
+  const auth = await authenticate();
+  apiKey = auth.apiKey;
+  currentValidation = auth.validation;
   console.log();
-  if (validation.status === "no_brain") {
+  if (currentValidation.status === "no_brain") {
     console.log(warning("  You haven\u2019t built a brain yet."));
     console.log(dim("  Your brain is how AI tools learn about you \u2014 your projects, preferences, and context."));
     console.log();
-    const wantBuild = await confirm6({
+    const wantBuild = await confirm5({
       message: "Build your brain now?",
       default: true
     });
@@ -1432,13 +1890,12 @@ async function interactiveMenu() {
       console.log(dim("  You can build your brain anytime with: ") + brand("piut build"));
       console.log();
     }
-    return;
   }
-  if (validation.status === "unpublished") {
+  if (currentValidation.status === "unpublished") {
     console.log(warning("  Your brain is built but not deployed yet."));
     console.log(dim("  Deploy it to make your MCP server live so AI tools can read your brain."));
     console.log();
-    const wantDeploy = await confirm6({
+    const wantDeploy = await confirm5({
       message: "Deploy your brain now?",
       default: true
     });
@@ -1449,41 +1906,248 @@ async function interactiveMenu() {
       console.log(dim("  You can deploy anytime with: ") + brand("piut deploy"));
       console.log();
     }
+  }
+  while (true) {
+    const hasBrain = currentValidation.status !== "no_brain";
+    const isDeployed = currentValidation.status === "active";
+    let action;
+    try {
+      action = await select2({
+        message: "What would you like to do?",
+        choices: [
+          {
+            name: hasBrain ? "Rebuild Brain" : "Build Brain",
+            value: "build",
+            description: hasBrain ? "Rebuild your brain from your files" : "Build your brain from your files"
+          },
+          {
+            name: isDeployed ? "Undeploy Brain" : "Deploy Brain",
+            value: "deploy",
+            description: isDeployed ? "Take your MCP server offline" : "Publish your MCP server (requires paid account)"
+          },
+          {
+            name: "Connect Tools",
+            value: "connect-tools",
+            description: "Configure AI tools to use your MCP server",
+            disabled: !isDeployed && "(deploy brain first)"
+          },
+          {
+            name: "Disconnect Tools",
+            value: "disconnect-tools",
+            description: "Remove p\u0131ut from AI tool configs",
+            disabled: !isDeployed && "(deploy brain first)"
+          },
+          {
+            name: "Connect Projects",
+            value: "connect-projects",
+            description: "Add brain references to project config files",
+            disabled: !isDeployed && "(deploy brain first)"
+          },
+          {
+            name: "Disconnect Projects",
+            value: "disconnect-projects",
+            description: "Remove brain references from project configs",
+            disabled: !isDeployed && "(deploy brain first)"
+          },
+          {
+            name: "Status",
+            value: "status",
+            description: "Show brain, deployment, and connected tools/projects"
+          },
+          {
+            name: "Logout",
+            value: "logout",
+            description: "Remove saved API key"
+          },
+          {
+            name: "Exit",
+            value: "exit",
+            description: "Quit p\u0131ut CLI"
+          }
+        ]
+      });
+    } catch {
+      return;
+    }
+    if (action === "exit") return;
+    try {
+      switch (action) {
+        case "build":
+          await buildCommand({ key: apiKey });
+          break;
+        case "deploy":
+          if (isDeployed) {
+            await handleUndeploy(apiKey);
+          } else {
+            await deployCommand({ key: apiKey });
+          }
+          break;
+        case "connect-tools":
+          await handleConnectTools(apiKey, currentValidation);
+          break;
+        case "disconnect-tools":
+          await handleDisconnectTools();
+          break;
+        case "connect-projects":
+          await connectCommand({ key: apiKey });
+          break;
+        case "disconnect-projects":
+          await disconnectCommand({});
+          break;
+        case "status":
+          statusCommand();
+          break;
+        case "logout":
+          await logoutCommand();
+          console.log();
+          try {
+            const newAuth = await authenticate();
+            apiKey = newAuth.apiKey;
+            currentValidation = newAuth.validation;
+          } catch {
+            return;
+          }
+          break;
+      }
+    } catch (err) {
+      if (isPromptCancellation(err)) {
+        console.log();
+      } else if (err instanceof CliError) {
+        console.log();
+      } else {
+        console.log(chalk6.red(`  Error: ${err.message}`));
+        console.log();
+      }
+    }
+    try {
+      currentValidation = await validateKey(apiKey);
+    } catch {
+    }
+  }
+}
+async function handleUndeploy(apiKey) {
+  const confirmed = await confirm5({
+    message: "Undeploy your brain? AI tools will lose access to your MCP server.",
+    default: false
+  });
+  if (!confirmed) return;
+  try {
+    await unpublishServer(apiKey);
+    console.log();
+    console.log(success("  \u2713 Brain undeployed. MCP server is offline."));
+    console.log(dim("  Run ") + brand("piut deploy") + dim(" to re-deploy anytime."));
+    console.log();
+  } catch (err) {
+    console.log(chalk6.red(`  \u2717 ${err.message}`));
+  }
+}
+async function handleConnectTools(apiKey, validation) {
+  const { slug } = validation;
+  const unconfigured = [];
+  const alreadyConnected = [];
+  for (const tool of TOOLS) {
+    const paths = resolveConfigPaths(tool.configPaths);
+    for (const configPath of paths) {
+      const exists = fs11.existsSync(configPath);
+      const parentExists = fs11.existsSync(path12.dirname(configPath));
+      if (exists || parentExists) {
+        if (exists && isPiutConfigured(configPath, tool.configKey)) {
+          alreadyConnected.push(tool.name);
+        } else {
+          unconfigured.push({ tool, configPath });
+        }
+        break;
+      }
+    }
+  }
+  if (unconfigured.length === 0) {
+    if (alreadyConnected.length > 0) {
+      console.log(dim("  All detected tools are already connected."));
+    } else {
+      console.log(warning("  No supported AI tools detected."));
+      console.log(dim("  Supported: Claude Code, Claude Desktop, Cursor, Windsurf, GitHub Copilot, Amazon Q, Zed"));
+    }
+    console.log();
     return;
   }
-  const action = await select2({
-    message: "What would you like to do?",
-    choices: [
-      { name: "Build Brain", value: "build", description: "Build or rebuild your brain from your files" },
-      { name: "Deploy Brain", value: "deploy", description: "Publish your MCP server (requires paid account)" },
-      { name: "Connect Projects", value: "connect", description: "Add brain references to project config files" },
-      { name: "Disconnect Projects", value: "disconnect", description: "Remove brain references from project configs" },
-      { name: "Status", value: "status", description: "Show brain, deployment, and connected projects" }
-    ]
+  if (alreadyConnected.length > 0) {
+    console.log(dim(`  Already connected: ${alreadyConnected.join(", ")}`));
+    console.log();
+  }
+  const choices = unconfigured.map((u) => ({
+    name: u.tool.name,
+    value: u,
+    checked: true
+  }));
+  const selected = await checkbox6({
+    message: "Select tools to connect:",
+    choices
   });
-  switch (action) {
-    case "build":
-      await buildCommand({ key: apiKey });
-      break;
-    case "deploy":
-      await deployCommand({ key: apiKey });
-      break;
-    case "connect":
-      await connectCommand({ key: apiKey });
-      break;
-    case "disconnect":
-      await disconnectCommand({});
-      break;
-    case "status":
-      statusCommand();
-      break;
+  if (selected.length === 0) {
+    console.log(dim("  No tools selected."));
+    return;
+  }
+  console.log();
+  for (const { tool, configPath } of selected) {
+    const serverConfig = tool.generateConfig(slug, apiKey);
+    mergeConfig(configPath, tool.configKey, serverConfig);
+    toolLine(tool.name, success("connected"), "\u2714");
+  }
+  console.log();
+  console.log(dim("  Restart your AI tools for changes to take effect."));
+  console.log();
+}
+async function handleDisconnectTools() {
+  const configured = [];
+  for (const tool of TOOLS) {
+    const paths = resolveConfigPaths(tool.configPaths);
+    for (const configPath of paths) {
+      if (fs11.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
+        configured.push({ tool, configPath });
+        break;
+      }
+    }
   }
+  if (configured.length === 0) {
+    console.log(dim("  p\u0131ut is not configured in any detected AI tools."));
+    console.log();
+    return;
+  }
+  const choices = configured.map((c) => ({
+    name: c.tool.name,
+    value: c
+  }));
+  const selected = await checkbox6({
+    message: "Select tools to disconnect:",
+    choices
+  });
+  if (selected.length === 0) {
+    console.log(dim("  No tools selected."));
+    return;
+  }
+  const proceed = await confirm5({
+    message: `Disconnect p\u0131ut from ${selected.length} tool(s)?`,
+    default: false
+  });
+  if (!proceed) return;
+  console.log();
+  for (const { tool, configPath } of selected) {
+    const removed = removeFromConfig(configPath, tool.configKey);
+    if (removed) {
+      toolLine(tool.name, success("disconnected"), "\u2714");
+    } else {
+      toolLine(tool.name, warning("not found"), "\xD7");
+    }
+  }
+  console.log();
+  console.log(dim("  Restart your AI tools for changes to take effect."));
+  console.log();
 }
 
 // src/lib/update-check.ts
 import { execFile } from "child_process";
 import chalk7 from "chalk";
-import { confirm as confirm7 } from "@inquirer/prompts";
+import { confirm as confirm6 } from "@inquirer/prompts";
 var PACKAGE_NAME = "@piut/cli";
 async function getLatestVersion() {
   try {
@@ -1517,7 +2181,7 @@ async function checkForUpdate(currentVersion) {
   console.log(dim(`  Run ${chalk7.bold(`npm install -g ${PACKAGE_NAME}@latest`)} to update`));
   console.log();
   try {
-    const shouldUpdate = await confirm7({
+    const shouldUpdate = await confirm6({
       message: `Update to v${latest} now?`,
       default: true
     });
@@ -1539,14 +2203,25 @@ async function checkForUpdate(currentVersion) {
 }
 
 // src/cli.ts
-var VERSION = "3.1.0";
+var VERSION = "3.2.0";
+function withExit(fn) {
+  return async (...args) => {
+    try {
+      await fn(...args);
+    } catch (err) {
+      if (err instanceof CliError) process.exit(1);
+      throw err;
+    }
+  };
+}
 var program = new Command();
 program.name("piut").description("Build your AI brain instantly. Deploy it as an MCP server. Connect it to every project.").version(VERSION).hook("preAction", () => checkForUpdate(VERSION)).action(interactiveMenu);
-program.command("build").description("Build or rebuild your brain from your files").option("-k, --key <key>", "API key").option("--folders <paths>", "Comma-separated folder paths to scan").action(buildCommand);
-program.command("deploy").description("Publish your MCP server (requires paid account)").option("-k, --key <key>", "API key").option("-y, --yes", "Skip confirmation prompts").action(deployCommand);
-program.command("connect").description("Add brain references to project config files").option("-k, --key <key>", "API key").option("-y, --yes", "Skip interactive prompts").option("--folders <paths>", "Comma-separated folder paths to scan").action(connectCommand);
-program.command("disconnect").description("Remove brain references from project config files").option("-y, --yes", "Skip interactive prompts").option("--folders <paths>", "Comma-separated folder paths to scan").action(disconnectCommand);
-program.command("setup").description("Auto-detect and configure AI tools (MCP config)").option("-k, --key <key>", "API key (prompts interactively if not provided)").option("-t, --tool <id>", "Configure a single tool (claude-code, cursor, windsurf, etc.)").option("-y, --yes", "Skip interactive prompts (auto-select all detected tools)").option("--project", "Prefer project-local config files").option("--skip-skill", "Skip skill.md file placement").action(setupCommand);
+program.command("build").description("Build or rebuild your brain from your files").option("-k, --key <key>", "API key").option("--folders <paths>", "Comma-separated folder paths to scan").action(withExit(buildCommand));
+program.command("deploy").description("Publish your MCP server (requires paid account)").option("-k, --key <key>", "API key").action(withExit(deployCommand));
+program.command("connect").description("Add brain references to project config files").option("-k, --key <key>", "API key").option("-y, --yes", "Skip interactive prompts").option("--folders <paths>", "Comma-separated folder paths to scan").action(withExit(connectCommand));
+program.command("disconnect").description("Remove brain references from project config files").option("-y, --yes", "Skip interactive prompts").option("--folders <paths>", "Comma-separated folder paths to scan").action(withExit(disconnectCommand));
+program.command("setup").description("Auto-detect and configure AI tools (MCP config)").option("-k, --key <key>", "API key (prompts interactively if not provided)").option("-t, --tool <id>", "Configure a single tool (claude-code, cursor, windsurf, etc.)").option("-y, --yes", "Skip interactive prompts (auto-select all detected tools)").option("--project", "Prefer project-local config files").option("--skip-skill", "Skip skill.md file placement").action(withExit(setupCommand));
 program.command("status").description("Show brain, deployment, and connected projects").action(statusCommand);
-program.command("remove").description("Remove all p\u0131ut configurations").action(removeCommand);
+program.command("remove").description("Remove all p\u0131ut configurations").action(withExit(removeCommand));
+program.command("logout").description("Remove saved API key").action(logoutCommand);
 program.parse();