slyplan-mcp 1.4.2 → 1.5.1

package/dist/cli.js

@@ -3,11 +3,11 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as http from 'http';
 import * as readline from 'readline';
-import { createClient } from '@supabase/supabase-js';
 import { exec } from 'child_process';
+import { createClient } from '@supabase/supabase-js';
 const SUPABASE_URL = 'https://omfzpkwtuzucwwxmyuqt.supabase.co';
 const SUPABASE_ANON_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im9tZnpwa3d0dXp1Y3d3eG15dXF0Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzA5MjMwNDIsImV4cCI6MjA4NjQ5OTA0Mn0.KXGoUez7M45RtFM9qR7mjzGX6UhlaRE-gggAJxSkIHY';
-const SLYPLAN_URL = 'https://slyplan.com';
+const SLYPLAN_ORIGIN = 'https://slyplan.com';
 // Smart transcript-aware hook: checks if set_project + add_to_work_mode have been called.
 // Silent when OK, reminds only when needed.
 const PRE_HOOK_FILE_CONTENT = `#!/usr/bin/env node
@@ -218,136 +218,66 @@ You MUST keep SlyPlan updated. This is not optional. Follow these rules:
 function log(msg) {
     process.stderr.write(msg + '\n');
 }
-function promptUser(question, hidden = false) {
+function promptUser(question) {
     return new Promise((resolve) => {
-        if (hidden && process.stdin.isTTY) {
-            // Password masking via raw mode
-            process.stderr.write(question);
-            const stdin = process.stdin;
-            stdin.setRawMode(true);
-            stdin.resume();
-            stdin.setEncoding('utf8');
-            let password = '';
-            const onData = (ch) => {
-                const c = ch.toString();
-                if (c === '\n' || c === '\r' || c === '\u0004') {
-                    stdin.setRawMode(false);
-                    stdin.pause();
-                    stdin.removeListener('data', onData);
-                    process.stderr.write('\n');
-                    resolve(password);
-                }
-                else if (c === '\u0003') {
-                    // Ctrl+C
-                    stdin.setRawMode(false);
-                    process.exit(1);
-                }
-                else if (c === '\u007f' || c === '\b') {
-                    // Backspace
-                    if (password.length > 0) {
-                        password = password.slice(0, -1);
-                        process.stderr.write('\b \b');
-                    }
-                }
-                else {
-                    password += c;
-                    process.stderr.write('*');
-                }
-            };
-            stdin.on('data', onData);
-        }
-        else {
-            // Non-TTY or visible input
-            const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
-            rl.question(question, (answer) => {
-                rl.close();
-                resolve(answer.trim());
-            });
-        }
-    });
-}
-async function validateCredentials(email, password) {
-    const client = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
-        auth: { autoRefreshToken: false, persistSession: false },
+        const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+        rl.question(question, (answer) => {
+            rl.close();
+            resolve(answer.trim());
+        });
     });
-    const { data, error } = await client.auth.signInWithPassword({ email, password });
-    if (error)
-        return { ok: false, error: error.message };
-    return { ok: true, userEmail: data.user?.email ?? email, refreshToken: data.session?.refresh_token };
 }
-function readJsonFile(filePath) {
-    try {
-        const content = fs.readFileSync(filePath, 'utf8');
-        return JSON.parse(content);
-    }
-    catch {
-        return null;
-    }
-}
-function writeJsonFile(filePath, data) {
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    fs.writeFileSync(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
-}
-// --- Browser Auth ---
 function openBrowser(url) {
     const platform = process.platform;
-    const cmd = platform === 'win32' ? 'start ""'
-        : platform === 'darwin' ? 'open'
-            : 'xdg-open';
-    exec(`${cmd} "${url}"`);
+    const cmd = platform === 'win32' ? `start "" "${url}"`
+        : platform === 'darwin' ? `open "${url}"`
+            : `xdg-open "${url}"`;
+    exec(cmd, () => {
+        // Ignore errors — user can always open manually
+    });
 }
 const SUCCESS_HTML = `<!DOCTYPE html>
-<html lang="en">
-<head><meta charset="utf-8"><title>SlyPlan - Authorized</title>
+<html>
+<head><title>SlyPlan — Authorized</title>
 <style>
-  body { margin: 0; min-height: 100vh; display: flex; align-items: center; justify-content: center;
-         background: #09090b; color: #f4f4f5; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; }
-  .card { text-align: center; padding: 3rem; }
-  .check { width: 64px; height: 64px; margin: 0 auto 1.5rem; color: #22c55e; }
-  h1 { font-size: 1.5rem; margin: 0 0 0.5rem; }
-  p { color: #a1a1aa; font-size: 0.875rem; margin: 0; }
-</style>
-</head>
-<body>
-<div class="card">
-  <svg class="check" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-    <path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/>
-  </svg>
+  body { background: #09090b; color: #e4e4e7; font-family: system-ui, sans-serif;
+         display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; }
+  .card { text-align: center; padding: 3rem; border-radius: 12px;
+          background: #18181b; border: 1px solid #27272a; max-width: 360px; }
+  .check { color: #22c55e; font-size: 3rem; margin-bottom: 1rem; }
+  h1 { font-size: 1.25rem; margin: 0 0 0.5rem; }
+  p { color: #71717a; font-size: 0.875rem; margin: 0; }
+</style></head>
+<body><div class="card">
+  <div class="check">&#10003;</div>
   <h1>Authorized!</h1>
   <p>You can close this tab and return to your terminal.</p>
-</div>
-</body>
-</html>`;
+</div></body></html>`;
 const ERROR_HTML = (msg) => `<!DOCTYPE html>
-<html lang="en">
-<head><meta charset="utf-8"><title>SlyPlan - Error</title>
+<html>
+<head><title>SlyPlan — Error</title>
 <style>
-  body { margin: 0; min-height: 100vh; display: flex; align-items: center; justify-content: center;
-         background: #09090b; color: #f4f4f5; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; }
-  .card { text-align: center; padding: 3rem; }
-  .icon { width: 64px; height: 64px; margin: 0 auto 1.5rem; color: #ef4444; }
-  h1 { font-size: 1.5rem; margin: 0 0 0.5rem; }
-  p { color: #a1a1aa; font-size: 0.875rem; margin: 0; }
-</style>
-</head>
-<body>
-<div class="card">
-  <svg class="icon" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
-    <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z"/>
-  </svg>
+  body { background: #09090b; color: #e4e4e7; font-family: system-ui, sans-serif;
+         display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; }
+  .card { text-align: center; padding: 3rem; border-radius: 12px;
+          background: #18181b; border: 1px solid #27272a; max-width: 360px; }
+  .icon { color: #ef4444; font-size: 3rem; margin-bottom: 1rem; }
+  h1 { font-size: 1.25rem; margin: 0 0 0.5rem; }
+  p { color: #71717a; font-size: 0.875rem; margin: 0; }
+</style></head>
+<body><div class="card">
+  <div class="icon">&#10007;</div>
   <h1>Authorization Failed</h1>
   <p>${msg}</p>
-</div>
-</body>
-</html>`;
+</div></body></html>`;
 function startLocalAuthServer() {
     return new Promise((resolve, reject) => {
         const server = http.createServer((req, res) => {
             const url = new URL(req.url ?? '/', `http://localhost`);
             if (url.pathname === '/callback') {
                 const refreshToken = url.searchParams.get('refresh_token');
-                const email = url.searchParams.get('email') ?? '';
-                if (refreshToken) {
+                const email = url.searchParams.get('email');
+                if (refreshToken && email) {
                     res.writeHead(200, { 'Content-Type': 'text/html' });
                     res.end(SUCCESS_HTML);
                     server.close();
@@ -355,42 +285,65 @@ function startLocalAuthServer() {
                 }
                 else {
                     res.writeHead(400, { 'Content-Type': 'text/html' });
-                    res.end(ERROR_HTML('Missing refresh token in callback.'));
+                    res.end(ERROR_HTML('Missing token or email in callback.'));
                     server.close();
-                    reject(new Error('Missing refresh token in callback'));
+                    reject(new Error('Missing token or email in callback'));
                 }
             }
             else {
-                res.writeHead(404, { 'Content-Type': 'text/plain' });
-                res.end('Not found');
+                res.writeHead(404);
+                res.end();
             }
         });
-        // Listen on random port
         server.listen(0, '127.0.0.1', () => {
             const addr = server.address();
             if (!addr || typeof addr === 'string') {
-                reject(new Error('Failed to start local server'));
+                reject(new Error('Failed to get server address'));
                 return;
             }
             const port = addr.port;
             const callbackUrl = `http://localhost:${port}/callback`;
-            const authUrl = `${SLYPLAN_URL}/cli/auth?port=${port}&callback=${encodeURIComponent(callbackUrl)}`;
-            log(`  Opening browser...`);
-            log(`  If it doesn't open, visit:`);
-            log(`  ${authUrl}`);
+            const authUrl = `${SLYPLAN_ORIGIN}/cli/auth?port=${port}&callback=${encodeURIComponent(callbackUrl)}`;
+            log(`  Opening browser to authorize...`);
+            log(`  If it doesn't open, visit: ${authUrl}`);
             log('');
             openBrowser(authUrl);
         });
         // Timeout after 120 seconds
         setTimeout(() => {
             server.close();
-            reject(new Error('Authorization timed out after 120 seconds. Please try again.'));
+            reject(new Error('Authorization timed out (120s). Try again.'));
         }, 120000);
     });
 }
+async function validateCredentials(email, password) {
+    const client = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
+        auth: { autoRefreshToken: false, persistSession: false },
+    });
+    const { data, error } = await client.auth.signInWithPassword({ email, password });
+    if (error)
+        return { ok: false, error: error.message };
+    return {
+        ok: true,
+        userEmail: data.user?.email ?? email,
+        refreshToken: data.session?.refresh_token,
+    };
+}
+function readJsonFile(filePath) {
+    try {
+        const content = fs.readFileSync(filePath, 'utf8');
+        return JSON.parse(content);
+    }
+    catch {
+        return null;
+    }
+}
+function writeJsonFile(filePath, data) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, JSON.stringify(data, null, 2) + '\n', 'utf8');
+}
 // --- Settings Merge ---
 // MCP server config goes in .mcp.json (Claude Code reads servers from here)
-// Hooks go in .claude/settings.json
 function mergeMcpJson(existing, refreshToken) {
     const result = { ...existing };
     if (!result.mcpServers)
@@ -404,8 +357,15 @@ function mergeMcpJson(existing, refreshToken) {
     };
     return result;
 }
+// Hooks go in .claude/settings.json
 function mergeSettings(existing) {
     const result = { ...existing };
+    // Remove any stale MCP server config (moved to .mcp.json)
+    if (result.mcpServers?.slyplan) {
+        delete result.mcpServers.slyplan;
+        if (Object.keys(result.mcpServers).length === 0)
+            delete result.mcpServers;
+    }
     // Hook config
     if (!result.hooks)
         result.hooks = {};
@@ -460,8 +420,8 @@ function removeFromMcpJson(existing) {
 }
 function removeFromSettings(existing) {
     const result = { ...existing };
-    // Remove MCP server (legacy — was previously in settings.json)
-    if (result.mcpServers) {
+    // Remove any stale MCP server config
+    if (result.mcpServers?.slyplan) {
         delete result.mcpServers.slyplan;
         if (Object.keys(result.mcpServers).length === 0)
             delete result.mcpServers;
@@ -486,8 +446,8 @@ async function runSetup() {
     const cwd = process.cwd();
     const claudeDir = path.join(cwd, '.claude');
     const hooksDir = path.join(claudeDir, 'hooks');
-    const settingsPath = path.join(claudeDir, 'settings.json');
     const mcpJsonPath = path.join(cwd, '.mcp.json');
+    const settingsPath = path.join(claudeDir, 'settings.json');
     const postHookFilePath = path.join(hooksDir, 'slyplan-post-tool-sync.cjs');
     const preHookFilePath = path.join(hooksDir, 'slyplan-pre-tool-sync.cjs');
     const claudeMdPath = path.join(cwd, 'CLAUDE.md');
@@ -496,7 +456,7 @@ async function runSetup() {
     log('  ==============================');
     log(`  Setting up in: ${cwd}`);
     log('');
-    // Parse flags
+    // Parse flags (--email + --password for CI/scripted use)
     const args = process.argv.slice(3);
     let flagEmail = '';
     let flagPassword = '';
@@ -509,7 +469,7 @@ async function runSetup() {
     let refreshToken = '';
     let userEmail = '';
     if (flagEmail && flagPassword) {
-        // CI/scripted mode: validate credentials and extract refresh token
+        // CI mode: validate credentials and extract refresh token
         process.stderr.write('  Validating credentials... ');
         const result = await validateCredentials(flagEmail, flagPassword);
         if (!result.ok) {
@@ -526,8 +486,6 @@ async function runSetup() {
     }
     else {
         // Interactive mode: browser-based auth
-        log('  Waiting for authorization in browser...');
-        log('');
         try {
             const result = await startLocalAuthServer();
             refreshToken = result.refreshToken;
@@ -535,7 +493,6 @@ async function runSetup() {
             log(`  Authorized as ${userEmail}`);
         }
         catch (err) {
-            log('');
             log(`  ${err.message}`);
             process.exit(1);
         }
@@ -547,15 +504,12 @@ async function runSetup() {
     log('  [+] Created .claude/hooks/slyplan-pre-tool-sync.cjs');
     fs.writeFileSync(postHookFilePath, POST_HOOK_FILE_CONTENT, 'utf8');
     log('  [+] Created .claude/hooks/slyplan-post-tool-sync.cjs');
-    // 2a. Merge .mcp.json (MCP server config — Claude Code reads servers from here)
-    let existingMcp = {};
-    const rawMcp = readJsonFile(mcpJsonPath);
-    if (rawMcp)
-        existingMcp = rawMcp;
+    // 2. Write MCP server config to .mcp.json
+    const existingMcp = readJsonFile(mcpJsonPath) ?? {};
     const mergedMcp = mergeMcpJson(existingMcp, refreshToken);
     writeJsonFile(mcpJsonPath, mergedMcp);
-    log('  [+] Updated .mcp.json (MCP server)');
-    // 2b. Merge .claude/settings.json (hooks)
+    log('  [+] Updated .mcp.json');
+    // 3. Write hooks to .claude/settings.json
     let existingSettings = {};
     const rawSettings = readJsonFile(settingsPath);
     if (rawSettings === null && fs.existsSync(settingsPath)) {
@@ -571,7 +525,7 @@ async function runSetup() {
     const mergedSettings = mergeSettings(existingSettings);
     writeJsonFile(settingsPath, mergedSettings);
     log('  [+] Updated .claude/settings.json (hooks)');
-    // 3. Optional CLAUDE.md append
+    // 4. Optional CLAUDE.md append
     const appendAnswer = await promptUser('  Append SlyPlan sync instructions to CLAUDE.md? [Y/n]: ');
     if (appendAnswer.toLowerCase() !== 'n') {
         if (fs.existsSync(claudeMdPath)) {
@@ -606,8 +560,8 @@ async function runSetup() {
 async function runRemove() {
     const cwd = process.cwd();
     const claudeDir = path.join(cwd, '.claude');
-    const settingsPath = path.join(claudeDir, 'settings.json');
     const mcpJsonPath = path.join(cwd, '.mcp.json');
+    const settingsPath = path.join(claudeDir, 'settings.json');
     const postHookFilePath = path.join(claudeDir, 'hooks', 'slyplan-post-tool-sync.cjs');
     const preHookFilePath = path.join(claudeDir, 'hooks', 'slyplan-pre-tool-sync.cjs');
     log('');
@@ -628,7 +582,7 @@ async function runRemove() {
             log(`  [=] .claude/hooks/${name} not found — skipped`);
         }
     }
-    // 2a. Clean .mcp.json (MCP server)
+    // 2. Clean .mcp.json
     const existingMcp = readJsonFile(mcpJsonPath);
     if (existingMcp) {
         const cleanedMcp = removeFromMcpJson(existingMcp);
@@ -641,7 +595,7 @@ async function runRemove() {
             log('  [-] Removed SlyPlan from .mcp.json');
         }
     }
-    // 2b. Clean settings.json (hooks + legacy MCP server)
+    // 3. Clean settings.json
     const existing = readJsonFile(settingsPath);
     if (existing) {
         const cleaned = removeFromSettings(existing);

package/dist/supabase.js

@@ -7,51 +7,34 @@ export const supabase = createClient(SUPABASE_URL, SUPABASE_ANON_KEY, {
     auth: { autoRefreshToken: true, persistSession: false },
 });
 let userId = null;
-function findMcpJsonPath() {
-    // Walk up from cwd looking for .mcp.json
-    let dir = process.cwd();
-    while (true) {
-        const candidate = path.join(dir, '.mcp.json');
-        if (fs.existsSync(candidate))
-            return candidate;
-        const parent = path.dirname(dir);
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    return null;
-}
 function persistNewRefreshToken(newToken) {
+    const mcpJsonPath = path.join(process.cwd(), '.mcp.json');
     try {
-        const mcpPath = findMcpJsonPath();
-        if (!mcpPath)
-            return;
-        const raw = fs.readFileSync(mcpPath, 'utf8');
-        const config = JSON.parse(raw);
-        const env = config?.mcpServers?.slyplan?.env;
-        if (!env)
-            return;
-        env.SLYPLAN_REFRESH_TOKEN = newToken;
-        fs.writeFileSync(mcpPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
+        const content = fs.readFileSync(mcpJsonPath, 'utf8');
+        const config = JSON.parse(content);
+        if (config?.mcpServers?.slyplan?.env) {
+            config.mcpServers.slyplan.env.SLYPLAN_REFRESH_TOKEN = newToken;
+            fs.writeFileSync(mcpJsonPath, JSON.stringify(config, null, 2) + '\n', 'utf8');
+        }
     }
     catch {
-        // Silent — token rotation is best-effort
+        // Best-effort — don't crash if file is missing/malformed
     }
 }
 export async function authenticate() {
     const refreshToken = process.env.SLYPLAN_REFRESH_TOKEN;
     const email = process.env.SLYPLAN_EMAIL;
     const password = process.env.SLYPLAN_PASSWORD;
-    // Prefer refresh token (browser auth flow)
+    // Prefer refresh token (new browser-based flow)
     if (refreshToken) {
         const { data, error } = await supabase.auth.refreshSession({ refresh_token: refreshToken });
         if (error) {
             console.error(`Token refresh failed: ${error.message}`);
-            console.error('Re-run "npx slyplan-mcp setup" to re-authorize.');
+            console.error('Run "npx slyplan-mcp setup" to re-authenticate.');
             process.exit(1);
         }
         userId = data.user.id;
-        // Persist rotated token for next startup
+        // Self-healing: persist rotated token
         if (data.session?.refresh_token && data.session.refresh_token !== refreshToken) {
             persistNewRefreshToken(data.session.refresh_token);
         }
@@ -67,8 +50,8 @@ export async function authenticate() {
         userId = data.user.id;
         return;
     }
-    console.error('Missing SLYPLAN_REFRESH_TOKEN (or legacy SLYPLAN_EMAIL + SLYPLAN_PASSWORD).');
-    console.error('Run "npx slyplan-mcp setup" to authorize.');
+    console.error('Missing SLYPLAN_REFRESH_TOKEN (or SLYPLAN_EMAIL + SLYPLAN_PASSWORD).');
+    console.error('Run "npx slyplan-mcp setup" to configure authentication.');
     process.exit(1);
 }
 export function getUserId() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slyplan-mcp",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "description": "MCP server for Slyplan — visual project management via Claude",
   "type": "module",
   "bin": {