@piut/cli 3.3.0 → 3.4.0

package/dist/cli.js

@@ -11,6 +11,8 @@ import { password, confirm, checkbox } from "@inquirer/prompts";
 import chalk2 from "chalk";
 
 // src/lib/api.ts
+import os from "os";
+import crypto from "crypto";
 var API_BASE = process.env.PIUT_API_BASE || "https://piut.com";
 async function validateKey(key) {
   const res = await fetch(`${API_BASE}/api/cli/validate`, {
@@ -73,6 +75,34 @@ async function* buildBrainStreaming(key, input2) {
     }
   }
 }
+async function verifyMcpEndpoint(serverUrl, key) {
+  const start = Date.now();
+  try {
+    const res = await fetch(serverUrl, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${key}`,
+        "Content-Type": "application/json",
+        "User-Agent": "piut-cli (verify)"
+      },
+      body: JSON.stringify({
+        jsonrpc: "2.0",
+        id: 1,
+        method: "tools/list"
+      })
+    });
+    const latencyMs = Date.now() - start;
+    if (!res.ok) {
+      return { ok: false, tools: [], latencyMs, error: `HTTP ${res.status}` };
+    }
+    const data = await res.json();
+    const result = data?.result;
+    const tools = Array.isArray(result?.tools) ? result.tools.map((t) => t.name).filter(Boolean) : [];
+    return { ok: true, tools, latencyMs };
+  } catch (err) {
+    return { ok: false, tools: [], latencyMs: Date.now() - start, error: err.message };
+  }
+}
 async function pingMcp(serverUrl, key, toolName) {
   try {
     const res = await fetch(serverUrl, {
@@ -111,6 +141,39 @@ async function publishServer(key) {
   }
   return res.json();
 }
+function getMachineId() {
+  const hostname = os.hostname();
+  return crypto.createHash("sha256").update(hostname).digest("hex").slice(0, 16);
+}
+async function registerProject(key, project) {
+  const res = await fetch(`${API_BASE}/api/cli/projects`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${key}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(project)
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({ error: "Unknown error" }));
+    throw new Error(body.error || `Register project failed (HTTP ${res.status})`);
+  }
+  return res.json();
+}
+async function unregisterProject(key, projectPath, machineId) {
+  const res = await fetch(`${API_BASE}/api/cli/projects`, {
+    method: "DELETE",
+    headers: {
+      Authorization: `Bearer ${key}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({ projectPath, machineId })
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({ error: "Unknown error" }));
+    throw new Error(body.error || `Unregister project failed (HTTP ${res.status})`);
+  }
+}
 async function unpublishServer(key) {
   const res = await fetch(`${API_BASE}/api/mcp/publish`, {
     method: "POST",
@@ -128,12 +191,12 @@ async function unpublishServer(key) {
 }
 
 // src/lib/tools.ts
-import os from "os";
+import os2 from "os";
 import path from "path";
 var MCP_URL = (slug) => `https://piut.com/api/mcp/${slug}`;
 var AUTH_HEADER = (key) => ({ Authorization: `Bearer ${key}` });
 function appData() {
-  return process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
+  return process.env.APPDATA || path.join(os2.homedir(), "AppData", "Roaming");
 }
 var TOOLS = [
   {
@@ -257,10 +320,10 @@ var TOOLS = [
 ];
 
 // src/lib/paths.ts
-import os2 from "os";
+import os3 from "os";
 import path2 from "path";
 function expandPath(p) {
-  return p.replace(/^~/, os2.homedir());
+  return p.replace(/^~/, os3.homedir());
 }
 function resolveConfigPaths(configPaths) {
   const resolved = [];
@@ -315,6 +378,36 @@ function mergeConfig(filePath, configKey, serverConfig) {
   existing[configKey] = servers;
   writeConfig(filePath, existing);
 }
+function getPiutConfig(filePath, configKey) {
+  const config = readConfig(filePath);
+  if (!config) return null;
+  const servers = config[configKey];
+  const piut = servers?.["piut-context"];
+  return piut ?? null;
+}
+function extractKeyFromConfig(piutConfig) {
+  const headers = piutConfig.headers;
+  if (headers?.Authorization) {
+    const match = headers.Authorization.match(/Bearer\s+(pb_\S+)/);
+    if (match) return match[1];
+  }
+  const settings = piutConfig.settings;
+  if (settings) {
+    const settingsHeaders = settings.headers;
+    if (settingsHeaders?.Authorization) {
+      const match = settingsHeaders.Authorization.match(/Bearer\s+(pb_\S+)/);
+      if (match) return match[1];
+    }
+  }
+  const args2 = piutConfig.args;
+  if (Array.isArray(args2)) {
+    for (const arg of args2) {
+      const match = arg.match(/Bearer\s+(pb_\S+)/);
+      if (match) return match[1];
+    }
+  }
+  return null;
+}
 function removeFromConfig(filePath, configKey) {
   const config = readConfig(filePath);
   if (!config) return false;
@@ -331,21 +424,46 @@ function removeFromConfig(filePath, configKey) {
 // src/lib/skill.ts
 import fs2 from "fs";
 import path4 from "path";
-var SKILL_SNIPPET = `## p\u0131ut Context
+var SKILL_SNIPPET = `## p\u0131ut Context (MCP Server: piut-context)
 
-This project uses p\u0131ut for persistent personal context.
-Skill reference: https://raw.githubusercontent.com/M-Flat-Inc/piut/main/skill.md
+This project uses p\u0131ut for persistent personal context via MCP (Model Context Protocol).
+p\u0131ut provides MCP tools \u2014 do NOT read local .piut/ files directly. Use the MCP tools.
 
-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
+### Available MCP Tools
+- \`get_context\` \u2014 Fetch all 5 brain sections. CALL THIS FIRST in every conversation.
+- \`get_section\` \u2014 Fetch a single section (about, soul, areas, projects, memory)
+- \`search_brain\` \u2014 Search across all sections
+- \`append_brain\` \u2014 Append text to a section (no AI processing)
+- \`update_brain\` \u2014 AI-powered integration of new info into brain
+- \`prompt_brain\` \u2014 Execute natural language commands against context
+
+### Instructions
+1. Call \`get_context\` at conversation start to load the user's brain
+2. Read the \`soul\` section first \u2014 it contains behavioral instructions
+3. Use \`update_brain\` for substantial new info, \`append_brain\` for quick notes
+4. Never read .piut/config.json directly \u2014 always use the MCP tools
+
+Skill reference: https://raw.githubusercontent.com/M-Flat-Inc/piut/main/skill.md`;
+var PROJECT_SKILL_SNIPPET = `## p\u0131ut Context (MCP Server: piut-context)
 
-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.`;
+This project uses p\u0131ut for persistent personal context via MCP (Model Context Protocol).
+p\u0131ut provides MCP tools \u2014 do NOT read local .piut/ files directly. Use the MCP tools.
+
+### Available MCP Tools
+- \`get_context\` \u2014 Fetch all 5 brain sections. CALL THIS FIRST in every conversation.
+- \`get_section\` \u2014 Fetch a single section (about, soul, areas, projects, memory)
+- \`search_brain\` \u2014 Search across all sections
+- \`append_brain\` \u2014 Append text to a section (no AI processing)
+- \`update_brain\` \u2014 AI-powered integration of new info into brain
+- \`prompt_brain\` \u2014 Execute natural language commands against context
+
+### Instructions
+1. Call \`get_context\` at conversation start to load the user's brain
+2. Read the \`soul\` section first \u2014 it contains behavioral instructions
+3. Use \`update_brain\` for substantial new info, \`append_brain\` for quick notes
+4. Never read .piut/config.json directly \u2014 always use the MCP tools
+
+Full skill reference: .piut/skill.md`;
 var SEPARATOR = "\n\n---\n\n";
 function placeSkillFile(filePath) {
   const absPath = path4.isAbsolute(filePath) ? filePath : path4.resolve(process.cwd(), filePath);
@@ -591,11 +709,23 @@ async function setupCommand(options) {
       const exists = fs4.existsSync(configPath);
       const parentExists = fs4.existsSync(path6.dirname(configPath));
       if (exists || parentExists) {
+        const configured2 = exists && isPiutConfigured(configPath, tool.configKey);
+        let staleKey = false;
+        if (configured2) {
+          const piutConfig = getPiutConfig(configPath, tool.configKey);
+          if (piutConfig) {
+            const existingKey = extractKeyFromConfig(piutConfig);
+            if (existingKey && existingKey !== apiKey) {
+              staleKey = true;
+            }
+          }
+        }
         detected.push({
           tool,
           configPath,
           exists,
-          alreadyConfigured: exists && isPiutConfigured(configPath, tool.configKey)
+          alreadyConfigured: configured2 && !staleKey,
+          staleKey
         });
         break;
       }
@@ -610,7 +740,7 @@ async function setupCommand(options) {
   }
   let selected;
   if (options.yes) {
-    selected = detected.filter((d) => !d.alreadyConfigured);
+    selected = detected.filter((d) => !d.alreadyConfigured || d.staleKey);
     if (selected.length === 0) {
       console.log(dim("  All detected tools are already configured."));
       console.log();
@@ -618,9 +748,9 @@ async function setupCommand(options) {
     }
   } else {
     const choices = detected.map((d) => ({
-      name: d.alreadyConfigured ? `${d.tool.name} ${dim("(already configured)")}` : d.tool.name,
+      name: d.staleKey ? `${d.tool.name} ${warning("(stale key \u2014 will update)")}` : d.alreadyConfigured ? `${d.tool.name} ${dim("(already configured)")}` : d.tool.name,
       value: d,
-      checked: !d.alreadyConfigured
+      checked: !d.alreadyConfigured || d.staleKey
     }));
     selected = await checkbox({
       message: "Select tools to configure:",
@@ -636,7 +766,7 @@ async function setupCommand(options) {
   const skipped = [];
   for (const det of selected) {
     const { tool, configPath, alreadyConfigured } = det;
-    if (alreadyConfigured) {
+    if (alreadyConfigured && !det.staleKey) {
       if (options.yes) {
         skipped.push(tool.name);
         continue;
@@ -651,14 +781,37 @@ async function setupCommand(options) {
       }
     }
     if (tool.id === "claude-code" && tool.quickCommand && isCommandAvailable("claude")) {
+      let quickSuccess = false;
       try {
         execSync(tool.quickCommand(slug, apiKey), { stdio: "pipe" });
-        configured.push(tool.name);
-        toolLine(tool.name, success("configured via CLI"), "\u2714");
-        continue;
-      } catch {
+        const claudeJson = expandPath("~/.claude.json");
+        const written = getPiutConfig(claudeJson, tool.configKey);
+        if (written) {
+          quickSuccess = true;
+          configured.push(tool.name);
+          toolLine(tool.name, success("configured via CLI"), "\u2714");
+          continue;
+        }
+        try {
+          execSync(tool.quickCommand(slug, apiKey) + " --scope user", { stdio: "pipe" });
+          const retryCheck = getPiutConfig(claudeJson, tool.configKey);
+          if (retryCheck) {
+            quickSuccess = true;
+            configured.push(tool.name);
+            toolLine(tool.name, success("configured via CLI"), "\u2714");
+            continue;
+          }
+        } catch {
+        }
+        console.log(dim("  Quick command succeeded but config not found, using config file..."));
+      } catch (err) {
+        const stderr = err?.stderr?.toString().trim();
+        if (stderr) {
+          console.log(dim(`  Claude CLI: ${stderr}`));
+        }
         console.log(dim("  Claude CLI command failed, using config file..."));
       }
+      if (quickSuccess) continue;
     }
     const serverConfig = tool.generateConfig(slug, apiKey);
     mergeConfig(configPath, tool.configKey, serverConfig);
@@ -701,7 +854,22 @@ async function setupCommand(options) {
   if (configured.length > 0) {
     const { serverUrl } = validationResult;
     console.log();
-    console.log(dim("  Registering connections..."));
+    console.log(dim("  Verifying..."));
+    for (const det of selected) {
+      if (!configured.includes(det.tool.name)) continue;
+      const piutConfig = getPiutConfig(det.configPath, det.tool.configKey);
+      if (piutConfig) {
+        toolLine(det.tool.name, success("config verified"), "\u2714");
+      } else {
+        toolLine(det.tool.name, warning("config not found \u2014 run piut doctor"), "\u2717");
+      }
+    }
+    const mcpResult = await verifyMcpEndpoint(serverUrl, apiKey);
+    if (mcpResult.ok) {
+      toolLine("MCP server", success(`${mcpResult.tools.length} tools available`) + dim(` (${mcpResult.latencyMs}ms)`), "\u2714");
+    } else {
+      toolLine("MCP server", warning(mcpResult.error || "unreachable") + dim(" \u2014 run piut doctor"), "\u2717");
+    }
     await Promise.all(
       configured.map((toolName) => pingMcp(serverUrl, apiKey, toolName))
     );
@@ -717,6 +885,7 @@ async function setupCommand(options) {
   console.log();
   console.log(dim("  Restart your AI tools for changes to take effect."));
   console.log(dim('  Verify: ask any AI "What do you know about me from my context?"'));
+  console.log(dim("  Diagnose issues: ") + chalk2.cyan("piut doctor"));
   console.log();
 }
 function isCommandAvailable(cmd) {
@@ -729,14 +898,15 @@ function isCommandAvailable(cmd) {
 }
 
 // src/commands/status.ts
-import fs6 from "fs";
-import path8 from "path";
+import fs7 from "fs";
+import path9 from "path";
+import chalk3 from "chalk";
 
 // src/lib/brain-scanner.ts
 import fs5 from "fs";
 import path7 from "path";
-import os3 from "os";
-var home = os3.homedir();
+import os4 from "os";
+var home = os4.homedir();
 var SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -1039,6 +1209,34 @@ function scanForProjects(folders) {
   return detectProjects(scanDirs);
 }
 
+// src/lib/store.ts
+import fs6 from "fs";
+import path8 from "path";
+import os5 from "os";
+var CONFIG_DIR = path8.join(os5.homedir(), ".piut");
+var CONFIG_FILE2 = path8.join(CONFIG_DIR, "config.json");
+function readStore() {
+  try {
+    const raw = fs6.readFileSync(CONFIG_FILE2, "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+function updateStore(updates) {
+  const config = readStore();
+  const updated = { ...config, ...updates };
+  fs6.mkdirSync(CONFIG_DIR, { recursive: true });
+  fs6.writeFileSync(CONFIG_FILE2, JSON.stringify(updated, null, 2) + "\n", "utf-8");
+  return updated;
+}
+function clearStore() {
+  try {
+    fs6.unlinkSync(CONFIG_FILE2);
+  } catch {
+  }
+}
+
 // src/commands/status.ts
 var PIUT_FILES = [
   "CLAUDE.md",
@@ -1050,21 +1248,25 @@ var PIUT_FILES = [
 ];
 function hasPiutReference(filePath) {
   try {
-    const content = fs6.readFileSync(filePath, "utf-8");
+    const content = fs7.readFileSync(filePath, "utf-8");
     return content.includes("p\u0131ut Context") || content.includes("piut Context");
   } catch {
     return false;
   }
 }
-function statusCommand() {
+async function statusCommand(options = {}) {
   banner();
+  if (options.verify) {
+    await verifyStatus();
+    return;
+  }
   console.log("  AI tool configuration:");
   console.log();
   let foundAny = false;
   for (const tool of TOOLS) {
     const paths = resolveConfigPaths(tool.configPaths);
     for (const configPath of paths) {
-      if (!fs6.existsSync(configPath)) continue;
+      if (!fs7.existsSync(configPath)) continue;
       foundAny = true;
       const configured = isPiutConfigured(configPath, tool.configKey);
       if (configured) {
@@ -1087,8 +1289,8 @@ function statusCommand() {
   for (const project of projects) {
     const connectedFiles = [];
     for (const file of PIUT_FILES) {
-      const absPath = path8.join(project.path, file);
-      if (fs6.existsSync(absPath) && hasPiutReference(absPath)) {
+      const absPath = path9.join(project.path, file);
+      if (fs7.existsSync(absPath) && hasPiutReference(absPath)) {
         connectedFiles.push(file);
       }
     }
@@ -1106,9 +1308,78 @@ function statusCommand() {
   }
   console.log();
 }
+async function verifyStatus() {
+  const store = readStore();
+  let issues = 0;
+  console.log("  API Key");
+  if (!store.apiKey) {
+    console.log(warning("  \u2717 No saved API key"));
+    console.log(dim("    Run ") + brand("piut setup") + dim(" to configure."));
+    issues++;
+    console.log();
+    return;
+  }
+  let slug;
+  let serverUrl;
+  try {
+    const info = await validateKey(store.apiKey);
+    slug = info.slug;
+    serverUrl = info.serverUrl;
+    const masked = store.apiKey.slice(0, 6) + "...";
+    console.log(success(`  \u2714 Key valid: ${info.displayName} (${info.slug})`) + dim(`  ${masked}`));
+  } catch (err) {
+    console.log(warning(`  \u2717 Key invalid: ${err.message}`));
+    issues++;
+  }
+  console.log();
+  console.log("  Tool Configurations");
+  for (const tool of TOOLS) {
+    const paths = resolveConfigPaths(tool.configPaths);
+    for (const configPath of paths) {
+      if (!fs7.existsSync(configPath)) continue;
+      const piutConfig = getPiutConfig(configPath, tool.configKey);
+      if (!piutConfig) {
+        toolLine(tool.name, dim("installed, not connected"), "\u25CB");
+        break;
+      }
+      const configKey = extractKeyFromConfig(piutConfig);
+      if (configKey && configKey === store.apiKey) {
+        toolLine(tool.name, success("key matches"), "\u2714");
+      } else if (configKey) {
+        const masked = configKey.slice(0, 6) + "...";
+        toolLine(tool.name, chalk3.red(`key STALE (${masked})`), "\u2717");
+        issues++;
+      } else {
+        toolLine(tool.name, dim("configured (key not extractable)"), "\u25CB");
+      }
+      break;
+    }
+  }
+  console.log();
+  console.log("  MCP Server");
+  if (serverUrl && store.apiKey) {
+    const result = await verifyMcpEndpoint(serverUrl, store.apiKey);
+    if (result.ok) {
+      console.log(success(`  \u2714 ${serverUrl}`) + dim(`  ${result.tools.length} tools, ${result.latencyMs}ms`));
+    } else {
+      console.log(warning(`  \u2717 ${serverUrl}`) + dim(`  ${result.error}`));
+      issues++;
+    }
+  } else if (!serverUrl) {
+    console.log(dim("  Skipped (no server URL)"));
+  }
+  console.log();
+  if (issues > 0) {
+    console.log(warning(`  Issues Found: ${issues}`));
+    console.log(dim("  Run ") + brand("piut doctor") + dim(" for detailed diagnostics."));
+  } else {
+    console.log(success("  All checks passed."));
+  }
+  console.log();
+}
 
 // src/commands/remove.ts
-import fs7 from "fs";
+import fs8 from "fs";
 import { checkbox as checkbox2, confirm as confirm2 } from "@inquirer/prompts";
 async function removeCommand() {
   banner();
@@ -1116,7 +1387,7 @@ async function removeCommand() {
   for (const tool of TOOLS) {
     const paths = resolveConfigPaths(tool.configPaths);
     for (const configPath of paths) {
-      if (fs7.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
+      if (fs8.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
         configured.push({ tool, configPath });
         break;
       }
@@ -1160,42 +1431,12 @@ async function removeCommand() {
 
 // src/commands/build.ts
 import { select, checkbox as checkbox3, input } from "@inquirer/prompts";
-import chalk4 from "chalk";
-import os5 from "os";
+import chalk5 from "chalk";
+import os6 from "os";
 
 // src/lib/auth.ts
 import { password as password2 } from "@inquirer/prompts";
-import chalk3 from "chalk";
-
-// src/lib/store.ts
-import fs8 from "fs";
-import path9 from "path";
-import os4 from "os";
-var CONFIG_DIR = path9.join(os4.homedir(), ".piut");
-var CONFIG_FILE2 = path9.join(CONFIG_DIR, "config.json");
-function readStore() {
-  try {
-    const raw = fs8.readFileSync(CONFIG_FILE2, "utf-8");
-    return JSON.parse(raw);
-  } catch {
-    return {};
-  }
-}
-function updateStore(updates) {
-  const config = readStore();
-  const updated = { ...config, ...updates };
-  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
+import chalk4 from "chalk";
 async function resolveApiKey(keyOption) {
   const config = readStore();
   let apiKey = keyOption || config.apiKey;
@@ -1211,7 +1452,7 @@ async function resolveApiKey(keyOption) {
   try {
     result = await validateKey(apiKey);
   } catch (err) {
-    console.log(chalk3.red(`  \u2717 ${err.message}`));
+    console.log(chalk4.red(`  \u2717 ${err.message}`));
     console.log(dim("  Get a key at https://piut.com/dashboard/keys"));
     throw new CliError(err.message);
   }
@@ -1235,7 +1476,7 @@ async function resolveApiKeyWithResult(keyOption) {
   try {
     result = await validateKey(apiKey);
   } catch (err) {
-    console.log(chalk3.red(`  \u2717 ${err.message}`));
+    console.log(chalk4.red(`  \u2717 ${err.message}`));
     console.log(dim("  Get a key at https://piut.com/dashboard/keys"));
     throw new CliError(err.message);
   }
@@ -1254,7 +1495,7 @@ async function buildCommand(options) {
     scanFolders = options.folders.split(",").map((f) => expandPath(f.trim()));
   }
   const cwd = process.cwd();
-  const cwdDisplay = cwd.replace(os5.homedir(), "~");
+  const cwdDisplay = cwd.replace(os6.homedir(), "~");
   if (!scanFolders) {
     console.log(dim(`  Current directory: `) + cwdDisplay);
     console.log(dim(`  We'll scan for AI config files and projects here.`));
@@ -1272,8 +1513,8 @@ async function buildCommand(options) {
       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 }
+        ...defaults.map((d) => ({ name: d.replace(os6.homedir(), "~"), value: d })),
+        { name: chalk5.dim("Enter a custom path..."), value: CUSTOM_VALUE }
       ];
       const selected = await checkbox3({
         message: "Which folders should we scan?",
@@ -1293,7 +1534,7 @@ async function buildCommand(options) {
         scanFolders = selected;
       }
       if (scanFolders.length === 0) {
-        console.log(chalk4.yellow("  No folders selected."));
+        console.log(chalk5.yellow("  No folders selected."));
         return;
       }
     }
@@ -1322,7 +1563,7 @@ async function buildCommand(options) {
   console.log(success(`  Scanned: ${projCount} projects, ${cfgCount} config files, ${dcCount} recent docs`));
   console.log();
   if (projCount === 0 && cfgCount === 0) {
-    console.log(chalk4.yellow("  No projects or config files found to build from."));
+    console.log(chalk5.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;
@@ -1347,13 +1588,13 @@ async function buildCommand(options) {
           break;
         case "error":
           spinner.stop();
-          console.log(chalk4.red(`  \u2717 ${event.data.message || "Build failed"}`));
+          console.log(chalk5.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"));
+      console.log(chalk5.red("  \u2717 No response received from server"));
       throw new CliError("No response received from server");
     }
     console.log();
@@ -1379,13 +1620,13 @@ async function buildCommand(options) {
   } catch (err) {
     spinner.stop();
     if (err instanceof CliError) throw err;
-    console.log(chalk4.red(`  \u2717 ${err.message}`));
+    console.log(chalk5.red(`  \u2717 ${err.message}`));
     throw new CliError(err.message);
   }
 }
 
 // src/commands/deploy.ts
-import chalk5 from "chalk";
+import chalk6 from "chalk";
 async function deployCommand(options) {
   banner();
   const { apiKey, slug, serverUrl, status } = await resolveApiKeyWithResult(options.key);
@@ -1409,13 +1650,13 @@ async function deployCommand(options) {
     const msg = err.message;
     if (msg === "REQUIRES_SUBSCRIPTION") {
       console.log();
-      console.log(chalk5.yellow("  Deploy requires an active subscription ($10/mo)."));
+      console.log(chalk6.yellow("  Deploy requires an active subscription ($10/mo)."));
       console.log();
       console.log(`  Subscribe at: ${brand("https://piut.com/dashboard/billing")}`);
       console.log(dim("  14-day free trial included."));
       console.log();
     } else {
-      console.log(chalk5.red(`  \u2717 ${msg}`));
+      console.log(chalk6.red(`  \u2717 ${msg}`));
       throw new CliError(msg);
     }
   }
@@ -1463,19 +1704,35 @@ var RULE_FILES = [
     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.
-Full skill reference: .piut/skill.md
+var DEDICATED_FILE_CONTENT = `## p\u0131ut Context (MCP Server: piut-context)
+
+This project uses p\u0131ut for persistent personal context via MCP (Model Context Protocol).
+p\u0131ut provides MCP tools \u2014 do NOT read local .piut/ files directly. Use the MCP tools.
+
+### Available MCP Tools
+- \`get_context\` \u2014 Fetch all 5 brain sections. CALL THIS FIRST in every conversation.
+- \`get_section\` \u2014 Fetch a single section (about, soul, areas, projects, memory)
+- \`search_brain\` \u2014 Search across all sections
+- \`append_brain\` \u2014 Append text to a section (no AI processing)
+- \`update_brain\` \u2014 AI-powered integration of new info into brain
+- \`prompt_brain\` \u2014 Execute natural language commands against context
+
+### Instructions
+1. Call \`get_context\` at conversation start to load the user's brain
+2. Read the \`soul\` section first \u2014 it contains behavioral instructions
+3. Use \`update_brain\` for substantial new info, \`append_brain\` for quick notes
+4. Never read .piut/config.json directly \u2014 always use the MCP tools
 
-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.
+Full skill reference: .piut/skill.md
 `;
 var APPEND_SECTION = `
 
-## p\u0131ut Context
-Full skill reference: .piut/skill.md
+## p\u0131ut Context (MCP Server: piut-context)
+
+p\u0131ut provides MCP tools for persistent personal context. Do NOT read local .piut/ files.
+Available tools: \`get_context\`, \`get_section\`, \`search_brain\`, \`append_brain\`, \`update_brain\`, \`prompt_brain\`
 Always call \`get_context\` at the start of every conversation to load personal context.
+Full skill reference: .piut/skill.md
 `;
 function hasPiutReference2(filePath) {
   try {
@@ -1623,6 +1880,21 @@ async function connectCommand(options) {
       connected++;
     }
   }
+  const machineId = getMachineId();
+  for (const projectPath of selectedPaths) {
+    const projectActions = byProject.get(projectPath) || [];
+    const projectName = path10.basename(projectPath);
+    const toolsDetected = [...new Set(projectActions.map((a) => a.tool))];
+    const configFilesWritten = projectActions.map((a) => a.filePath);
+    registerProject(apiKey, {
+      projectName,
+      projectPath,
+      machineId,
+      toolsDetected,
+      configFiles: configFilesWritten
+    }).catch(() => {
+    });
+  }
   console.log();
   console.log(success(`  Done. ${selectedPaths.length} project(s) connected.`));
   console.log();
@@ -1803,6 +2075,14 @@ async function disconnectCommand(options) {
       }
     }
   }
+  const store = readStore();
+  if (store.apiKey) {
+    const machineId = getMachineId();
+    for (const projectPath of selectedPaths) {
+      unregisterProject(store.apiKey, projectPath, machineId).catch(() => {
+      });
+    }
+  }
   console.log();
   console.log(success(`  Done. ${disconnected} file(s) updated.`));
   console.log();
@@ -1825,11 +2105,11 @@ async function logoutCommand() {
 }
 
 // src/commands/update.ts
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 
 // src/lib/update-check.ts
 import { execFile } from "child_process";
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 import { confirm as confirm5 } from "@inquirer/prompts";
 var PACKAGE_NAME = "@piut/cli";
 function isNpx() {
@@ -1866,7 +2146,7 @@ async function checkForUpdate(currentVersion) {
   const updateCmd = npx ? `npx ${PACKAGE_NAME}@latest` : `npm install -g ${PACKAGE_NAME}@latest`;
   console.log();
   console.log(brand("  Update available!") + dim(` ${currentVersion} \u2192 ${latest}`));
-  console.log(dim(`  Run ${chalk6.bold(updateCmd)} to update`));
+  console.log(dim(`  Run ${chalk7.bold(updateCmd)} to update`));
   console.log();
   if (npx) return;
   try {
@@ -1878,12 +2158,12 @@ async function checkForUpdate(currentVersion) {
       console.log(dim("  Updating..."));
       const ok = await runUpdate();
       if (ok) {
-        console.log(chalk6.green(`  \u2713 Updated to v${latest}`));
+        console.log(chalk7.green(`  \u2713 Updated to v${latest}`));
         console.log(dim("  Restart the CLI to use the new version."));
         process.exit(0);
       } else {
-        console.log(chalk6.yellow(`  Could not auto-update. Run manually:`));
-        console.log(chalk6.bold(`  npm install -g ${PACKAGE_NAME}@latest`));
+        console.log(chalk7.yellow(`  Could not auto-update. Run manually:`));
+        console.log(chalk7.bold(`  npm install -g ${PACKAGE_NAME}@latest`));
         console.log();
       }
     }
@@ -1898,7 +2178,7 @@ async function updateCommand(currentVersion) {
   console.log(dim("  Checking for updates..."));
   const latest = await getLatestVersion();
   if (!latest) {
-    console.log(chalk7.yellow("  Could not reach the npm registry. Check your connection."));
+    console.log(chalk8.yellow("  Could not reach the npm registry. Check your connection."));
     return;
   }
   if (!isNewer(currentVersion, latest)) {
@@ -1910,7 +2190,7 @@ async function updateCommand(currentVersion) {
   if (isNpx()) {
     console.log();
     console.log(dim("  You're running via npx. Use the latest version with:"));
-    console.log(chalk7.bold(`  npx ${PACKAGE_NAME2}@latest`));
+    console.log(chalk8.bold(`  npx ${PACKAGE_NAME2}@latest`));
     console.log();
     return;
   }
@@ -1920,16 +2200,184 @@ async function updateCommand(currentVersion) {
     console.log(success(`  \u2713 Updated to v${latest}`));
     console.log(dim("  Restart the CLI to use the new version."));
   } else {
-    console.log(chalk7.yellow("  Could not auto-update. Run manually:"));
-    console.log(chalk7.bold(`  npm install -g ${PACKAGE_NAME2}@latest`));
+    console.log(chalk8.yellow("  Could not auto-update. Run manually:"));
+    console.log(chalk8.bold(`  npm install -g ${PACKAGE_NAME2}@latest`));
+  }
+}
+
+// src/commands/doctor.ts
+import fs11 from "fs";
+import chalk9 from "chalk";
+async function doctorCommand(options) {
+  if (!options.json) banner();
+  const result = {
+    key: { valid: false },
+    tools: [],
+    mcp: { ok: false, tools: [], latencyMs: 0 },
+    issues: 0
+  };
+  const store = readStore();
+  const apiKey = options.key || store.apiKey;
+  if (!apiKey) {
+    result.key = { valid: false, error: "No API key found" };
+    result.issues++;
+    if (!options.json) {
+      console.log("  API Key");
+      console.log(error(`  \u2717 No API key saved. Run: piut setup --key pb_YOUR_KEY`));
+      console.log();
+    }
+  } else {
+    const prefix = apiKey.slice(0, 7) + "...";
+    try {
+      const validation = await validateKey(apiKey);
+      result.key = {
+        valid: true,
+        slug: validation.slug,
+        displayName: validation.displayName,
+        prefix
+      };
+      if (!options.json) {
+        console.log("  API Key");
+        console.log(success(`  \u2714 Key valid: ${validation.displayName} (${validation.slug})`) + dim(`    ${prefix}`));
+        console.log();
+      }
+    } catch (err) {
+      result.key = { valid: false, prefix, error: err.message };
+      result.issues++;
+      if (!options.json) {
+        console.log("  API Key");
+        console.log(error(`  \u2717 Key invalid: ${err.message}`) + dim(`    ${prefix}`));
+        console.log();
+      }
+    }
+  }
+  if (!options.json) {
+    console.log("  Tool Configurations");
+  }
+  let toolsFixed = 0;
+  for (const tool of TOOLS) {
+    const paths = resolveConfigPaths(tool.configPaths);
+    for (const configPath of paths) {
+      if (!fs11.existsSync(configPath)) continue;
+      const piutConfig = getPiutConfig(configPath, tool.configKey);
+      if (!piutConfig) {
+        result.tools.push({
+          name: tool.name,
+          id: tool.id,
+          configPath,
+          found: true,
+          configured: false,
+          keyMatch: "missing"
+        });
+        if (!options.json) {
+          toolLine(tool.name, dim("installed, not configured"), "\u25CB");
+        }
+        break;
+      }
+      const configKey = extractKeyFromConfig(piutConfig);
+      const configPrefix = configKey ? configKey.slice(0, 7) + "..." : "(none)";
+      let keyMatch = "missing";
+      if (!configKey) {
+        keyMatch = "missing";
+        result.issues++;
+      } else if (apiKey && configKey === apiKey) {
+        keyMatch = "match";
+      } else {
+        keyMatch = "stale";
+        result.issues++;
+      }
+      const toolResult = {
+        name: tool.name,
+        id: tool.id,
+        configPath,
+        found: true,
+        configured: true,
+        keyMatch,
+        keyPrefix: configPrefix,
+        fixed: false
+      };
+      if (keyMatch === "stale" && options.fix && apiKey && result.key.valid && result.key.slug) {
+        const serverConfig = tool.generateConfig(result.key.slug, apiKey);
+        mergeConfig(configPath, tool.configKey, serverConfig);
+        toolResult.fixed = true;
+        toolResult.keyMatch = "match";
+        result.issues--;
+        toolsFixed++;
+      }
+      result.tools.push(toolResult);
+      if (!options.json) {
+        if (toolResult.fixed) {
+          toolLine(tool.name, success("fixed") + dim(` \u2192 ${configPath}`), "\u2714");
+        } else if (keyMatch === "match") {
+          toolLine(tool.name, success("key matches") + dim(` ${configPath}`), "\u2714");
+        } else if (keyMatch === "stale") {
+          toolLine(tool.name, warning(`key STALE (${configPrefix})`) + dim(` ${configPath}`), "\u2717");
+        } else {
+          toolLine(tool.name, warning("no key found") + dim(` ${configPath}`), "\u2717");
+        }
+      }
+      break;
+    }
+  }
+  if (result.tools.length === 0 && !options.json) {
+    console.log(dim("  No AI tools detected."));
+  }
+  if (!options.json) console.log();
+  if (apiKey && result.key.valid && result.key.slug) {
+    const serverUrl = `https://piut.com/api/mcp/${result.key.slug}`;
+    const mcpResult = await verifyMcpEndpoint(serverUrl, apiKey);
+    result.mcp = mcpResult;
+    if (!mcpResult.ok) {
+      result.issues++;
+    }
+    if (!options.json) {
+      console.log("  MCP Server");
+      if (mcpResult.ok) {
+        console.log(success(`  \u2714 ${serverUrl}`) + dim(`    ${mcpResult.tools.length} tools, ${mcpResult.latencyMs}ms`));
+        if (mcpResult.tools.length > 0) {
+          console.log(dim(`    ${mcpResult.tools.join(", ")}`));
+        }
+      } else {
+        console.log(error(`  \u2717 ${serverUrl}`) + dim(`    ${mcpResult.error}`));
+      }
+      console.log();
+    }
+  } else if (!options.json) {
+    console.log("  MCP Server");
+    console.log(dim("  \u2298 Skipped (no valid key)"));
+    console.log();
+  }
+  if (options.json) {
+    console.log(JSON.stringify(result, null, 2));
+    if (result.issues > 0) throw new CliError(`${result.issues} issue(s) found`);
+    return;
+  }
+  if (toolsFixed > 0) {
+    console.log(success(`  Fixed ${toolsFixed} stale config(s).`));
+    console.log();
+  }
+  if (result.issues === 0) {
+    console.log(success("  All checks passed."));
+  } else {
+    console.log(warning(`  ${result.issues} issue(s) found.`));
+    const staleTools = result.tools.filter((t) => t.keyMatch === "stale" && !t.fixed);
+    if (staleTools.length > 0 && !options.fix) {
+      console.log();
+      console.log(dim("  Fix stale configs: ") + chalk9.cyan("piut doctor --fix"));
+    }
+    if (!result.key.valid) {
+      console.log(dim("  Set a valid key: ") + chalk9.cyan("piut setup --key pb_YOUR_KEY"));
+    }
   }
+  console.log();
+  if (result.issues > 0) throw new CliError(`${result.issues} issue(s) found`);
 }
 
 // src/commands/interactive.ts
 import { select as select2, confirm as confirm6, checkbox as checkbox6, password as password3 } from "@inquirer/prompts";
-import fs11 from "fs";
+import fs12 from "fs";
 import path12 from "path";
-import chalk8 from "chalk";
+import chalk10 from "chalk";
 async function authenticate() {
   const config = readStore();
   let apiKey = config.apiKey;
@@ -1957,7 +2405,7 @@ async function authenticate() {
   try {
     result = await validateKey(apiKey);
   } catch (err) {
-    console.log(chalk8.red(`  \u2717 ${err.message}`));
+    console.log(chalk10.red(`  \u2717 ${err.message}`));
     console.log(dim("  Get a key at https://piut.com/dashboard/keys"));
     process.exit(1);
   }
@@ -2116,7 +2564,7 @@ async function interactiveMenu() {
       } else if (err instanceof CliError) {
         console.log();
       } else {
-        console.log(chalk8.red(`  Error: ${err.message}`));
+        console.log(chalk10.red(`  Error: ${err.message}`));
         console.log();
       }
     }
@@ -2139,7 +2587,7 @@ async function handleUndeploy(apiKey) {
     console.log(dim("  Run ") + brand("piut deploy") + dim(" to re-deploy anytime."));
     console.log();
   } catch (err) {
-    console.log(chalk8.red(`  \u2717 ${err.message}`));
+    console.log(chalk10.red(`  \u2717 ${err.message}`));
   }
 }
 async function handleConnectTools(apiKey, validation) {
@@ -2149,8 +2597,8 @@ async function handleConnectTools(apiKey, validation) {
   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));
+      const exists = fs12.existsSync(configPath);
+      const parentExists = fs12.existsSync(path12.dirname(configPath));
       if (exists || parentExists) {
         if (exists && isPiutConfigured(configPath, tool.configKey)) {
           alreadyConnected.push(tool.name);
@@ -2203,7 +2651,7 @@ async function handleDisconnectTools() {
   for (const tool of TOOLS) {
     const paths = resolveConfigPaths(tool.configPaths);
     for (const configPath of paths) {
-      if (fs11.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
+      if (fs12.existsSync(configPath) && isPiutConfigured(configPath, tool.configKey)) {
         configured.push({ tool, configPath });
         break;
       }
@@ -2246,7 +2694,7 @@ async function handleDisconnectTools() {
 }
 
 // src/cli.ts
-var VERSION = "3.3.0";
+var VERSION = "3.4.0";
 function withExit(fn) {
   return async (...args2) => {
     try {
@@ -2267,9 +2715,10 @@ program.command("deploy").description("Publish your MCP server (requires paid ac
 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("status").description("Show brain, deployment, and connected projects").option("--verify", "Validate API key, check tool configs, and test MCP endpoint").action(withExit(statusCommand));
 program.command("remove").description("Remove all p\u0131ut configurations").action(withExit(removeCommand));
 program.command("logout").description("Remove saved API key").action(logoutCommand);
+program.command("doctor").description("Diagnose and fix connection issues").option("-k, --key <key>", "API key to verify against").option("--fix", "Auto-fix stale configurations").option("--json", "Output results as JSON").action(withExit(doctorCommand));
 program.command("update").description("Check for and install CLI updates").action(() => updateCommand(VERSION));
 var args = process.argv.slice(2);
 if (args.includes("--version") || args.includes("-V")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piut/cli",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Build your AI brain instantly. Deploy it as an MCP server. Connect it to every project.",
   "type": "module",
   "bin": {