md4ai 0.10.0 → 0.10.2

package/dist/index.bundled.js

@@ -45,6 +45,23 @@ function createSupabaseClient(anonKey, accessToken) {
   const options = accessToken ? { global: { headers: { Authorization: `Bearer ${accessToken}` } } } : {};
   return createClient(SUPABASE_URL, anonKey, options);
 }
+async function createSupabaseClientWithSession(anonKey, accessToken, refreshToken) {
+  const client = createClient(SUPABASE_URL, anonKey);
+  const { data, error } = await client.auth.setSession({
+    access_token: accessToken,
+    refresh_token: refreshToken
+  });
+  if (error || !data.session) {
+    throw new Error(error?.message ?? "Failed to establish session");
+  }
+  return {
+    client,
+    userId: data.session.user.id,
+    newAccessToken: data.session.access_token,
+    newRefreshToken: data.session.refresh_token,
+    expiresAt: Date.now() + data.session.expires_in * 1e3
+  };
+}
 var init_supabase = __esm({
   "../packages/shared/dist/supabase.js"() {
     "use strict";
@@ -192,6 +209,51 @@ async function getAuthenticatedClient() {
   const supabase = createSupabaseClient(anonKey, creds.accessToken);
   return { supabase, userId: creds.userId };
 }
+async function refreshSession() {
+  const creds = await loadCredentials();
+  if (!creds?.refreshToken)
+    return null;
+  try {
+    const anonKey = getAnonKey();
+    const result = await createSupabaseClientWithSession(anonKey, creds.accessToken, creds.refreshToken);
+    await saveCredentials({
+      ...creds,
+      accessToken: result.newAccessToken,
+      refreshToken: result.newRefreshToken,
+      expiresAt: result.expiresAt
+    });
+    return { supabase: result.client, userId: result.userId };
+  } catch {
+    return null;
+  }
+}
+async function getLongLivedClient() {
+  const creds = await loadCredentials();
+  if (!creds?.accessToken || !creds?.refreshToken) {
+    console.log(chalk4.yellow("Not logged in."));
+    const shouldLogin = await confirm({ message: "Would you like to log in now?" });
+    if (!shouldLogin)
+      process.exit(0);
+    return promptLogin();
+  }
+  const anonKey = getAnonKey();
+  try {
+    const result = await createSupabaseClientWithSession(anonKey, creds.accessToken, creds.refreshToken);
+    await saveCredentials({
+      ...creds,
+      accessToken: result.newAccessToken,
+      refreshToken: result.newRefreshToken,
+      expiresAt: result.expiresAt
+    });
+    return { supabase: result.client, userId: result.userId };
+  } catch {
+    console.log(chalk4.yellow("Session expired \u2014 please log in again."));
+    const shouldLogin = await confirm({ message: "Would you like to log in now?" });
+    if (!shouldLogin)
+      process.exit(0);
+    return promptLogin();
+  }
+}
 async function promptLogin() {
   console.log("");
   const email = await input2({ message: "Email:" });
@@ -1723,7 +1785,7 @@ var CURRENT_VERSION;
 var init_check_update = __esm({
   "dist/check-update.js"() {
     "use strict";
-    CURRENT_VERSION = true ? "0.10.0" : "0.0.0-dev";
+    CURRENT_VERSION = true ? "0.10.2" : "0.0.0-dev";
   }
 });
 
@@ -2687,8 +2749,14 @@ function formatUptime(seconds) {
   const m = Math.floor(seconds % 3600 / 60);
   return `${h}h ${m}m`;
 }
+function isJwtError(error) {
+  if (!error?.message)
+    return false;
+  const msg = error.message.toLowerCase();
+  return msg.includes("jwt expired") || msg.includes("invalid jwt") || msg.includes("invalid token") || msg.includes("not authenticated") || msg.includes("invalid refresh_token");
+}
 async function mcpWatchCommand() {
-  const { supabase, userId } = await getAuthenticatedClient();
+  let { supabase, userId } = await getLongLivedClient();
   const deviceId = await resolveDeviceId(supabase, userId);
   const deviceName = detectDeviceName();
   const myPid = process.pid;
@@ -2740,6 +2808,10 @@ async function mcpWatchCommand() {
     const rows = buildRows(configs, httpResults, cdpStatus);
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const { error: deleteError } = await supabase.from("mcp_server_status").delete().eq("device_id", deviceId);
+    if (deleteError && isJwtError(deleteError)) {
+      await handleJwtExpiry();
+      return;
+    }
     if (deleteError) {
       console.error(chalk20.red(`  [debug] Failed to delete old status: ${deleteError.message}`));
     }
@@ -2749,13 +2821,69 @@ async function mcpWatchCommand() {
         ...row,
         checked_at: now
       })));
+      if (insertError && isJwtError(insertError)) {
+        await handleJwtExpiry();
+        return;
+      }
       if (insertError) {
         console.error(chalk20.red(`  [debug] Failed to write MCP status: ${insertError.message}`));
       }
     }
-    await supabase.from("mcp_watchers").update({ last_heartbeat: now }).eq("device_id", deviceId).eq("pid", myPid);
+    const { error: heartbeatError } = await supabase.from("mcp_watchers").update({ last_heartbeat: now }).eq("device_id", deviceId).eq("pid", myPid);
+    if (heartbeatError && isJwtError(heartbeatError)) {
+      await handleJwtExpiry();
+      return;
+    }
     printTable(rows, deviceName, myPid, cdpStatus);
   }
+  let jwtRefreshAttempted = false;
+  async function handleJwtExpiry() {
+    if (jwtRefreshAttempted) {
+      printSessionExpired();
+      await forceShutdown();
+      return;
+    }
+    jwtRefreshAttempted = true;
+    console.log(chalk20.yellow("\n  Session token expired \u2014 attempting to refresh..."));
+    const refreshed = await refreshSession();
+    if (refreshed) {
+      supabase = refreshed.supabase;
+      console.log(chalk20.green("  Session refreshed successfully. Resuming monitoring.\n"));
+      jwtRefreshAttempted = false;
+      await supabase.from("mcp_watchers").upsert({
+        device_id: deviceId,
+        pid: myPid,
+        tty: myTty,
+        cli_version: CURRENT_VERSION,
+        started_at: (/* @__PURE__ */ new Date()).toISOString(),
+        last_heartbeat: (/* @__PURE__ */ new Date()).toISOString()
+      }, { onConflict: "device_id,pid" });
+    } else {
+      printSessionExpired();
+      await forceShutdown();
+    }
+  }
+  function printSessionExpired() {
+    process.stdout.write("\x1B[3J\x1B[2J\x1B[H");
+    console.log("");
+    console.log(chalk20.bgRed.white.bold("  \u2717  SESSION EXPIRED \u2014 this watcher is no longer sending data to the dashboard  \u2717  "));
+    console.log("");
+    console.log(chalk20.yellow("  Your authentication token has expired and could not be refreshed."));
+    console.log(chalk20.yellow('  The dashboard will show "No watchers" because this process can no longer update it.'));
+    console.log("");
+    console.log(chalk20.white("  To fix this:"));
+    console.log(chalk20.cyan("    1. Run: md4ai login"));
+    console.log(chalk20.cyan("    2. Then restart the watcher: md4ai mcp-watch"));
+    console.log("");
+  }
+  let interval;
+  let envInterval;
+  async function forceShutdown() {
+    clearInterval(interval);
+    clearInterval(envInterval);
+    process.stdout.write(`\x1B]0;MCP mon (EXPIRED)\x07`);
+    process.exit(1);
+  }
   await cycle();
   let lastEnvHash = "";
   async function envCycle() {
@@ -2775,7 +2903,7 @@ async function mcpWatchCommand() {
     await supabase.from("claude_folders").update({ env_manifest_json: envManifest }).eq("id", state.lastFolderId);
   }
   await envCycle();
-  const envInterval = setInterval(envCycle, ENV_POLL_INTERVAL_MS);
+  envInterval = setInterval(envCycle, ENV_POLL_INTERVAL_MS);
   async function rescanCycle() {
     await checkPendingRescans(supabase, deviceId, deviceName);
   }
@@ -2783,7 +2911,7 @@ async function mcpWatchCommand() {
     await cycle();
     await rescanCycle();
   }
-  const interval = setInterval(fullCycle, POLL_INTERVAL_MS);
+  interval = setInterval(fullCycle, POLL_INTERVAL_MS);
   const shutdown = async () => {
     clearInterval(interval);
     clearInterval(envInterval);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "md4ai",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "CLI for MD4AI — scan Claude projects and sync to your dashboard",
   "type": "module",
   "bin": {
@@ -33,15 +33,15 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.0.0",
+    "@inquirer/prompts": "^8.3.0",
     "@supabase/supabase-js": "^2.98.0",
-    "chalk": "^5.4.0",
-    "commander": "^14.0.0",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.3",
     "jszip": "^3.10.1"
   },
   "devDependencies": {
     "@md4ai/shared": "workspace:*",
-    "@types/node": "^22.0.0",
+    "@types/node": "^22.15.31",
     "esbuild": "^0.27.3",
     "typescript": "^5.7.0"
   }