@whenlabs/when 0.7.3 → 0.8.1

package/dist/{chunk-FJBDHGXG.js → chunk-3PDLNC63.js}

@@ -2,15 +2,18 @@
 
 // src/utils/mcp-config.ts
 import { execSync } from "child_process";
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { resolve } from "path";
 function registerServer(name, command) {
+  try {
+    execSync(`claude mcp remove -s user ${name}`, { stdio: "pipe" });
+  } catch {
+  }
   try {
     execSync(`claude mcp add -s user ${name} -- ${command}`, { stdio: "pipe" });
-    return { success: true, message: `MCP server "${name}" registered successfully.` };
+    return { success: true, message: `MCP server "${name}" registered.` };
   } catch (err) {
     const output = err instanceof Error && "stderr" in err ? err.stderr?.toString() ?? "" : "";
-    if (output.includes("already exists") || output.includes("already registered")) {
-      return { success: true, message: `MCP server "${name}" is already registered.` };
-    }
     return {
       success: false,
       message: `Failed to register "${name}": ${output || (err instanceof Error ? err.message : String(err))}`
@@ -32,27 +35,59 @@ function unregisterServer(name) {
     };
   }
 }
+function cleanLegacyMcpJson() {
+  let dir = process.cwd();
+  const root = resolve("/");
+  while (dir !== root) {
+    const mcpJson = resolve(dir, ".mcp.json");
+    if (existsSync(mcpJson)) {
+      try {
+        const data = JSON.parse(readFileSync(mcpJson, "utf-8"));
+        if (data?.mcpServers?.["velocity-mcp"]) {
+          delete data.mcpServers["velocity-mcp"];
+          writeFileSync(mcpJson, JSON.stringify(data, null, 2) + "\n", "utf-8");
+          return mcpJson;
+        }
+      } catch {
+      }
+    }
+    dir = resolve(dir, "..");
+  }
+  return null;
+}
 function registerMcpServer() {
-  const velocity = registerServer("velocity-mcp", "npx @whenlabs/velocity-mcp");
   const whenlabs = registerServer("whenlabs", "npx @whenlabs/when when-mcp");
+  const legacyCleanup = unregisterServer("velocity-mcp");
+  const cleanedFile = cleanLegacyMcpJson();
+  const messages = [whenlabs.message];
+  if (legacyCleanup.success && !legacyCleanup.message.includes("was not registered")) {
+    messages.push("Removed legacy velocity-mcp from user config (now bundled in whenlabs)");
+  }
+  if (cleanedFile) {
+    messages.push(`Removed legacy velocity-mcp from ${cleanedFile}`);
+  }
   return {
-    success: velocity.success && whenlabs.success,
-    message: [velocity.message, whenlabs.message].join("\n  ")
+    success: whenlabs.success,
+    message: messages.join("\n  ")
   };
 }
 function unregisterMcpServer() {
-  const velocity = unregisterServer("velocity-mcp");
   const whenlabs = unregisterServer("whenlabs");
+  const velocity = unregisterServer("velocity-mcp");
+  const messages = [whenlabs.message];
+  if (velocity.success && !velocity.message.includes("was not registered")) {
+    messages.push(velocity.message);
+  }
   return {
-    success: velocity.success && whenlabs.success,
-    message: [velocity.message, whenlabs.message].join("\n  ")
+    success: whenlabs.success,
+    message: messages.join("\n  ")
   };
 }
 
 // src/utils/editor-config.ts
 import { join } from "path";
 import { homedir } from "os";
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, mkdirSync } from "fs";
 var MCP_SERVERS = {
   "velocity-mcp": { command: "npx", args: ["@whenlabs/velocity-mcp"] },
   whenlabs: { command: "when-mcp", args: [] }
@@ -69,16 +104,16 @@ function getConfigPath(editor) {
   }
 }
 function readJsonFile(filePath) {
-  if (!existsSync(filePath)) return {};
+  if (!existsSync2(filePath)) return {};
   try {
-    return JSON.parse(readFileSync(filePath, "utf-8"));
+    return JSON.parse(readFileSync2(filePath, "utf-8"));
   } catch {
     return {};
   }
 }
 function ensureDir(filePath) {
   const dir = filePath.substring(0, filePath.lastIndexOf("/"));
-  if (!existsSync(dir)) {
+  if (!existsSync2(dir)) {
     mkdirSync(dir, { recursive: true });
   }
 }
@@ -94,7 +129,7 @@ function installCursorOrWindsurf(editor) {
     }
   };
   ensureDir(configPath);
-  writeFileSync(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
+  writeFileSync2(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
   return { editor, success: true, message: `${capitalize(editor)}: MCP servers registered at ${configPath}` };
 }
 function installVSCode() {
@@ -113,12 +148,12 @@ function installVSCode() {
     }
   };
   ensureDir(configPath);
-  writeFileSync(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
+  writeFileSync2(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
   return { editor: "vscode", success: true, message: `VS Code: MCP servers registered at ${configPath}` };
 }
 function uninstallCursorOrWindsurf(editor) {
   const configPath = getConfigPath(editor);
-  if (!existsSync(configPath)) {
+  if (!existsSync2(configPath)) {
     return { editor, success: true, message: `${capitalize(editor)}: config not found, nothing to remove` };
   }
   const existing = readJsonFile(configPath);
@@ -127,12 +162,12 @@ function uninstallCursorOrWindsurf(editor) {
     delete mcpServers[key];
   }
   const updated = { ...existing, mcpServers };
-  writeFileSync(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
+  writeFileSync2(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
   return { editor, success: true, message: `${capitalize(editor)}: MCP servers removed from ${configPath}` };
 }
 function uninstallVSCode() {
   const configPath = getConfigPath("vscode");
-  if (!existsSync(configPath)) {
+  if (!existsSync2(configPath)) {
     return { editor: "vscode", success: true, message: "VS Code: config not found, nothing to remove" };
   }
   const existing = readJsonFile(configPath);
@@ -145,7 +180,7 @@ function uninstallVSCode() {
     ...existing,
     mcp: { ...mcpSection, servers }
   };
-  writeFileSync(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
+  writeFileSync2(configPath, JSON.stringify(updated, null, 2) + "\n", "utf-8");
   return { editor: "vscode", success: true, message: `VS Code: MCP servers removed from ${configPath}` };
 }
 function capitalize(s) {

package/dist/index.js

@@ -495,11 +495,11 @@ function createInitCommand() {
 var program = new Command4();
 program.name("when").version("0.1.0").description("The WhenLabs developer toolkit \u2014 6 tools, one install");
 program.command("install").description("Install all WhenLabs tools globally (MCP server + CLAUDE.md instructions)").option("--cursor", "Install MCP servers into Cursor (~/.cursor/mcp.json)").option("--vscode", "Install MCP servers into VS Code (settings.json)").option("--windsurf", "Install MCP servers into Windsurf (~/.codeium/windsurf/mcp_config.json)").option("--all", "Install MCP servers into all supported editors").action(async (options) => {
-  const { install } = await import("./install-O4QZ3TA4.js");
+  const { install } = await import("./install-HPF26YW2.js");
   await install(options);
 });
 program.command("uninstall").description("Remove all WhenLabs tools").option("--cursor", "Remove MCP servers from Cursor").option("--vscode", "Remove MCP servers from VS Code").option("--windsurf", "Remove MCP servers from Windsurf").option("--all", "Remove MCP servers from all supported editors").action(async (options) => {
-  const { uninstall } = await import("./uninstall-5LRMB2EV.js");
+  const { uninstall } = await import("./uninstall-X5NO3Z6I.js");
   await uninstall(options);
 });
 program.command("status").description("Show installation status and velocity stats").action(async () => {

package/dist/{install-O4QZ3TA4.js → install-HPF26YW2.js}

@@ -3,7 +3,7 @@ import {
   ALL_EDITORS,
   installForEditor,
   registerMcpServer
-} from "./chunk-FJBDHGXG.js";
+} from "./chunk-3PDLNC63.js";
 import {
   injectBlock
 } from "./chunk-NYUYV3UL.js";
@@ -19,7 +19,7 @@ var CLAUDE_MD_CONTENT = `# WhenLabs Toolkit
 
 ## Task Timing (velocity-mcp)
 
-You have access to \`velocity-mcp\` tools. Follow these rules for EVERY session:
+Velocity tools are part of the unified \`whenlabs\` MCP server. Follow these rules for EVERY session:
 
 1. **Before starting any discrete coding task**, call \`velocity_start_task\` with:
    - Appropriate \`category\` (scaffold, implement, refactor, debug, test, config, docs, deploy)
@@ -46,7 +46,7 @@ You have access to \`velocity-mcp\` tools. Follow these rules for EVERY session:
 
 ## WhenLabs MCP Tools (ALWAYS prefer these over shell commands)
 
-You have access to the \`whenlabs\` MCP server. **ALWAYS use these MCP tools instead of running shell commands like lsof, grep, or manual checks.** These tools are purpose-built and give better results:
+All six tools (including velocity) are available through the unified \`whenlabs\` MCP server. **ALWAYS use these MCP tools instead of running shell commands like lsof, grep, or manual checks.** These tools are purpose-built and give better results:
 
 | When to use | Call this tool | NOT this |
 |-------------|---------------|----------|

package/dist/mcp.js

@@ -9,6 +9,15 @@ import { resolve, dirname, join } from "path";
 import { existsSync, mkdirSync, writeFileSync, readFileSync } from "fs";
 import { fileURLToPath } from "url";
 import { homedir } from "os";
+import {
+  initDb,
+  TaskQueries,
+  registerStartTask,
+  registerEndTask,
+  registerEstimate,
+  registerStats,
+  registerHistory
+} from "@whenlabs/velocity-mcp/lib";
 var __dirname = dirname(fileURLToPath(import.meta.url));
 function findBin(name) {
   const pkgRoot = resolve(__dirname, "..");
@@ -91,8 +100,16 @@ Note: Conflicts found in project "${projectName}".`);
 }
 var server = new McpServer({
   name: "whenlabs",
-  version: "0.1.0"
+  version: "0.2.0"
 });
+var velocityDb = initDb();
+var velocityQueries = new TaskQueries(velocityDb);
+var s = server;
+registerStartTask(s, velocityQueries);
+registerEndTask(s, velocityQueries);
+registerEstimate(s, velocityQueries);
+registerStats(s, velocityQueries);
+registerHistory(s, velocityQueries);
 function formatOutput(result) {
   const parts = [];
   if (result.stdout.trim()) parts.push(result.stdout.trim());
@@ -580,6 +597,14 @@ server.tool(
     return { content: [{ type: "text", text: outputText }] };
   }
 );
+process.on("SIGINT", () => {
+  velocityDb.close();
+  process.exit(0);
+});
+process.on("SIGTERM", () => {
+  velocityDb.close();
+  process.exit(0);
+});
 async function main() {
   const transport = new StdioServerTransport();
   await server.connect(transport);

package/dist/{uninstall-5LRMB2EV.js → uninstall-X5NO3Z6I.js}

@@ -3,7 +3,7 @@ import {
   ALL_EDITORS,
   uninstallForEditor,
   unregisterMcpServer
-} from "./chunk-FJBDHGXG.js";
+} from "./chunk-3PDLNC63.js";
 import {
   removeBlock
 } from "./chunk-NYUYV3UL.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whenlabs/when",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "The WhenLabs developer toolkit — 6 tools, one install",
   "type": "module",
   "main": "dist/index.js",
@@ -33,7 +33,7 @@
     "@whenlabs/berth": "^0.1.0",
     "@whenlabs/envalid": "^0.1.2",
     "@whenlabs/stale": "^0.1.0",
-    "@whenlabs/velocity-mcp": "^0.1.0",
+    "@whenlabs/velocity-mcp": "^0.1.2",
     "@whenlabs/vow": "^0.1.3",
     "commander": "^12.0.0",
     "zod": "^4.3.6"

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-
-export {  }

package/dist/mcp.d.ts

@@ -1,2 +0,0 @@
-
-export {  }