@rehpic/vcli 0.1.0-beta.50.1 → 0.1.0-beta.52.1

package/dist/index.js

@@ -9,248 +9,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/menubar.ts
-var menubar_exports = {};
-__export(menubar_exports, {
-  startMenuBar: () => startMenuBar
-});
-import SysTrayModule from "systray2";
-import { existsSync, readFileSync } from "fs";
-import { homedir as homedir2 } from "os";
-import { join } from "path";
-import { execSync } from "child_process";
-function loadIconBase64() {
-  const iconPath = join(CONFIG_DIR, "assets", "vector-menubar.png");
-  if (existsSync(iconPath)) {
-    return readFileSync(iconPath).toString("base64");
-  }
-  return "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==";
-}
-function loadConfig() {
-  try {
-    return JSON.parse(readFileSync(BRIDGE_CONFIG_FILE, "utf-8"));
-  } catch {
-    return null;
-  }
-}
-function loadActivities() {
-  try {
-    return JSON.parse(readFileSync(LIVE_ACTIVITIES_FILE, "utf-8"));
-  } catch {
-    return [];
-  }
-}
-function isBridgeRunning() {
-  try {
-    const pid = Number(readFileSync(PID_FILE, "utf-8").trim());
-    process.kill(pid, 0);
-    return { running: true, pid };
-  } catch {
-    return { running: false };
-  }
-}
-function getSessionInfo() {
-  try {
-    const session = JSON.parse(
-      readFileSync(join(CONFIG_DIR, "cli-default.json"), "utf-8")
-    );
-    return {
-      orgSlug: session.activeOrgSlug ?? "oss-lab",
-      appUrl: session.appUrl
-    };
-  } catch {
-    return { orgSlug: "oss-lab" };
-  }
-}
-function getOrgSlug() {
-  try {
-    const session = JSON.parse(
-      readFileSync(join(CONFIG_DIR, "cli-default.json"), "utf-8")
-    );
-    return session.activeOrgSlug ?? "oss-lab";
-  } catch {
-    return "oss-lab";
-  }
-}
-function providerLabel(provider) {
-  if (provider === "claude_code") return "Claude";
-  if (provider === "codex") return "Codex";
-  return provider;
-}
-function buildMenu() {
-  const config = loadConfig();
-  const { running, pid } = isBridgeRunning();
-  const activities = loadActivities();
-  const items = [];
-  const actions = /* @__PURE__ */ new Map();
-  let idx = 0;
-  if (running && config) {
-    items.push({
-      title: `Vector Bridge \u2014 Running (PID ${pid})`,
-      enabled: false
-    });
-    idx++;
-    items.push({ title: `  ${config.displayName}`, enabled: false });
-    idx++;
-  } else if (config) {
-    items.push({ title: "Vector Bridge \u2014 Offline", enabled: false });
-    idx++;
-  } else {
-    items.push({ title: "Vector Bridge \u2014 Not Configured", enabled: false });
-    idx++;
-    items.push({
-      title: "  Run: vcli service start",
-      enabled: false
-    });
-    idx++;
-  }
-  items.push({ title: "---", enabled: false });
-  idx++;
-  if (activities.length > 0) {
-    items.push({ title: "Active Sessions", enabled: false });
-    idx++;
-    const orgSlug = getOrgSlug();
-    for (const a of activities) {
-      const label = `${a.issueKey} \u2014 ${a.title ?? a.issueTitle} (${providerLabel(a.provider)})`;
-      items.push({ title: label, tooltip: a.latestSummary });
-      const issueKey = a.issueKey;
-      actions.set(idx, () => {
-        const url = `http://localhost:3000/${orgSlug}/issues/${issueKey}`;
-        try {
-          execSync(`open "${url}"`, { stdio: "ignore" });
-        } catch {
-        }
-      });
-      idx++;
-    }
-    items.push({ title: "---", enabled: false });
-    idx++;
-  }
-  if (running) {
-    items.push({ title: "Stop Bridge" });
-    actions.set(idx, () => {
-      try {
-        if (pid) process.kill(pid, "SIGTERM");
-      } catch {
-      }
-    });
-    idx++;
-    items.push({ title: "Restart Bridge" });
-    actions.set(idx, () => {
-      try {
-        if (pid) process.kill(pid, "SIGTERM");
-        setTimeout(() => {
-          execSync("vcli service start", { stdio: "ignore" });
-        }, 2e3);
-      } catch {
-      }
-    });
-    idx++;
-  } else if (config) {
-    items.push({ title: "Start Bridge" });
-    actions.set(idx, () => {
-      try {
-        execSync("vcli service start", { stdio: "ignore" });
-      } catch {
-      }
-    });
-    idx++;
-  }
-  items.push({ title: "---", enabled: false });
-  idx++;
-  if (config) {
-    const { orgSlug, appUrl } = getSessionInfo();
-    items.push({
-      title: `Account: ${config.userId.slice(0, 12)}...`,
-      enabled: false
-    });
-    idx++;
-    if (orgSlug) {
-      items.push({ title: `Org: ${orgSlug}`, enabled: false });
-      idx++;
-    }
-    items.push({ title: "---", enabled: false });
-    idx++;
-  }
-  items.push({ title: "Open Vector" });
-  actions.set(idx, () => {
-    const { appUrl } = getSessionInfo();
-    const url = appUrl ?? "http://localhost:3000";
-    try {
-      execSync(`open "${url}"`, { stdio: "ignore" });
-    } catch {
-    }
-  });
-  idx++;
-  items.push({ title: "Quit Vector" });
-  actions.set(idx, () => {
-    try {
-      const { pid: bridgePid } = isBridgeRunning();
-      if (bridgePid) process.kill(bridgePid, "SIGTERM");
-    } catch {
-    }
-    process.exit(0);
-  });
-  idx++;
-  return { items, actions };
-}
-async function startMenuBar() {
-  try {
-    const { fileURLToPath: fileURLToPath3 } = await import("url");
-    const { dirname: dirname2, join: pjoin } = await import("path");
-    const { chmodSync } = await import("fs");
-    const systrayIndex = fileURLToPath3(import.meta.resolve("systray2"));
-    const binName = process.platform === "darwin" ? "tray_darwin_release" : process.platform === "win32" ? "tray_windows_release.exe" : "tray_linux_release";
-    const trayBin = pjoin(dirname2(systrayIndex), "traybin", binName);
-    chmodSync(trayBin, 493);
-  } catch {
-  }
-  const icon = loadIconBase64();
-  const { items, actions } = buildMenu();
-  const systray = new SysTray({
-    menu: {
-      icon,
-      title: "",
-      tooltip: "Vector Bridge",
-      items: items.map((item) => ({
-        title: item.title,
-        tooltip: item.tooltip ?? "",
-        checked: item.checked ?? false,
-        enabled: item.enabled ?? true,
-        hidden: false
-      }))
-    },
-    debug: false,
-    copyDir: false
-  });
-  void systray.onClick((action) => {
-    const handler = actions.get(action.seq_id);
-    if (handler) handler();
-  });
-  setInterval(() => {
-    const { items: newItems, actions: newActions } = buildMenu();
-    void newItems;
-    void newActions;
-  }, 15e3);
-}
-var SysTray, CONFIG_DIR, BRIDGE_CONFIG_FILE, PID_FILE, LIVE_ACTIVITIES_FILE;
-var init_menubar = __esm({
-  "src/menubar.ts"() {
-    "use strict";
-    SysTray = typeof SysTrayModule.default === "function" ? SysTrayModule.default : SysTrayModule;
-    CONFIG_DIR = join(homedir2(), ".vector");
-    BRIDGE_CONFIG_FILE = join(CONFIG_DIR, "bridge.json");
-    PID_FILE = join(CONFIG_DIR, "bridge.pid");
-    LIVE_ACTIVITIES_FILE = join(CONFIG_DIR, "live-activities.json");
-    if (process.argv[1]?.endsWith("menubar.ts") || process.argv[1]?.endsWith("menubar.js")) {
-      startMenuBar().catch((e) => {
-        console.error("Menu bar error:", e);
-        process.exit(1);
-      });
-    }
-  }
-});
-
 // ../../node_modules/.pnpm/is-docker@3.0.0/node_modules/is-docker/index.js
 import fs from "fs";
 function hasDockerEnv() {
@@ -978,9 +736,9 @@ var init_open = __esm({
 });
 
 // src/index.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
 import { readFile as readFile2 } from "fs/promises";
-import { dirname, extname, join as join3 } from "path";
+import { dirname, extname, join as join2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { config as loadEnv } from "dotenv";
 import { Command } from "commander";
@@ -1338,38 +1096,43 @@ function createEmptySession() {
 
 // src/bridge-service.ts
 import { ConvexHttpClient as ConvexHttpClient2 } from "convex/browser";
-import { execSync as execSync2 } from "child_process";
+import { execSync } from "child_process";
 import {
-  existsSync as existsSync2,
+  existsSync,
   mkdirSync,
-  readFileSync as readFileSync2,
+  readFileSync,
   writeFileSync,
   unlinkSync
 } from "fs";
-import { homedir as homedir3, hostname, platform } from "os";
-import { join as join2 } from "path";
+import { homedir as homedir2, hostname, platform } from "os";
+import { join } from "path";
 import { randomUUID } from "crypto";
-var CONFIG_DIR2 = join2(homedir3(), ".vector");
-var BRIDGE_CONFIG_FILE2 = join2(CONFIG_DIR2, "bridge.json");
-var PID_FILE2 = join2(CONFIG_DIR2, "bridge.pid");
-var LIVE_ACTIVITIES_CACHE = join2(CONFIG_DIR2, "live-activities.json");
-var LAUNCHAGENT_DIR = join2(homedir3(), "Library", "LaunchAgents");
-var LAUNCHAGENT_PLIST = join2(LAUNCHAGENT_DIR, "com.vector.bridge.plist");
+var CONFIG_DIR = join(homedir2(), ".vector");
+var BRIDGE_CONFIG_FILE = join(CONFIG_DIR, "bridge.json");
+var PID_FILE = join(CONFIG_DIR, "bridge.pid");
+var LIVE_ACTIVITIES_CACHE = join(CONFIG_DIR, "live-activities.json");
+var LAUNCHAGENT_DIR = join(homedir2(), "Library", "LaunchAgents");
+var LAUNCHAGENT_PLIST = join(LAUNCHAGENT_DIR, "com.vector.bridge.plist");
 var LAUNCHAGENT_LABEL = "com.vector.bridge";
+var LEGACY_MENUBAR_LAUNCHAGENT_LABEL = "com.vector.menubar";
+var LEGACY_MENUBAR_LAUNCHAGENT_PLIST = join(
+  LAUNCHAGENT_DIR,
+  `${LEGACY_MENUBAR_LAUNCHAGENT_LABEL}.plist`
+);
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var COMMAND_POLL_INTERVAL_MS = 5e3;
 var PROCESS_DISCOVERY_INTERVAL_MS = 6e4;
 function loadBridgeConfig() {
-  if (!existsSync2(BRIDGE_CONFIG_FILE2)) return null;
+  if (!existsSync(BRIDGE_CONFIG_FILE)) return null;
   try {
-    return JSON.parse(readFileSync2(BRIDGE_CONFIG_FILE2, "utf-8"));
+    return JSON.parse(readFileSync(BRIDGE_CONFIG_FILE, "utf-8"));
   } catch {
     return null;
   }
 }
 function saveBridgeConfig(config) {
-  if (!existsSync2(CONFIG_DIR2)) mkdirSync(CONFIG_DIR2, { recursive: true });
-  writeFileSync(BRIDGE_CONFIG_FILE2, JSON.stringify(config, null, 2));
+  if (!existsSync(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true });
+  writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(config, null, 2));
 }
 function discoverLocalProcesses() {
   const processes = [];
@@ -1384,7 +1147,7 @@ function discoverLocalProcesses() {
   ];
   for (const { grep, provider, label, prefix } of patterns) {
     try {
-      const ps = execSync2(
+      const ps = execSync(
         `ps aux | grep -E '${grep}' | grep -v vector-bridge | grep -v grep`,
         { encoding: "utf-8", timeout: 5e3 }
       );
@@ -1393,7 +1156,7 @@ function discoverLocalProcesses() {
         if (!pid) continue;
         let cwd;
         try {
-          cwd = execSync2(
+          cwd = execSync(
             `lsof -p ${pid} 2>/dev/null | grep cwd | awk '{print $NF}'`,
             { encoding: "utf-8", timeout: 3e3 }
           ).trim() || void 0;
@@ -1419,12 +1182,12 @@ function discoverLocalProcesses() {
 }
 function getGitInfo(cwd) {
   try {
-    const branch = execSync2("git rev-parse --abbrev-ref HEAD", {
+    const branch = execSync("git rev-parse --abbrev-ref HEAD", {
       encoding: "utf-8",
       cwd,
       timeout: 3e3
     }).trim();
-    const repoRoot = execSync2("git rev-parse --show-toplevel", {
+    const repoRoot = execSync("git rev-parse --show-toplevel", {
       encoding: "utf-8",
       cwd,
       timeout: 3e3
@@ -1537,8 +1300,8 @@ var BridgeService = class {
     console.log(`  Convex:  ${this.config.convexUrl}`);
     console.log(`  PID:     ${process.pid}`);
     console.log("");
-    if (!existsSync2(CONFIG_DIR2)) mkdirSync(CONFIG_DIR2, { recursive: true });
-    writeFileSync(PID_FILE2, String(process.pid));
+    if (!existsSync(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true });
+    writeFileSync(PID_FILE, String(process.pid));
     await this.heartbeat();
     await this.reportProcesses();
     await this.refreshLiveActivities();
@@ -1572,7 +1335,7 @@ var BridgeService = class {
 [${ts()}] Shutting down...`);
       for (const t of this.timers) clearInterval(t);
       try {
-        unlinkSync(PID_FILE2);
+        unlinkSync(PID_FILE);
       } catch {
       }
       process.exit(0);
@@ -1635,9 +1398,9 @@ function installLaunchAgent(vcliPath) {
   <key>KeepAlive</key>
   <true/>
   <key>StandardOutPath</key>
-  <string>${CONFIG_DIR2}/bridge.log</string>
+  <string>${CONFIG_DIR}/bridge.log</string>
   <key>StandardErrorPath</key>
-  <string>${CONFIG_DIR2}/bridge.err.log</string>
+  <string>${CONFIG_DIR}/bridge.err.log</string>
   <key>EnvironmentVariables</key>
   <dict>
     <key>PATH</key>
@@ -1645,46 +1408,16 @@ function installLaunchAgent(vcliPath) {
   </dict>
 </dict>
 </plist>`;
-  const menuBarCandidates = [
-    join2(CONFIG_DIR2, "VectorMenuBar"),
-    "/usr/local/bin/VectorMenuBar",
-    join2(homedir3(), ".local", "bin", "VectorMenuBar")
-  ];
-  const menuBarBinary = menuBarCandidates.find((p) => existsSync2(p));
-  if (menuBarBinary) {
-    const menuBarPlist = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>com.vector.menubar</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>${menuBarBinary}</string>
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <false/>
-</dict>
-</plist>`;
-    const menuBarPlistPath = join2(LAUNCHAGENT_DIR, "com.vector.menubar.plist");
-    writeFileSync(menuBarPlistPath, menuBarPlist);
-    try {
-      execSync2(`launchctl load ${menuBarPlistPath}`, { stdio: "pipe" });
-      console.log("Menu bar helper installed.");
-    } catch {
-    }
-  }
-  if (!existsSync2(LAUNCHAGENT_DIR)) {
+  if (!existsSync(LAUNCHAGENT_DIR)) {
     mkdirSync(LAUNCHAGENT_DIR, { recursive: true });
   }
+  removeLegacyMenuBarLaunchAgent();
   writeFileSync(LAUNCHAGENT_PLIST, plist);
   console.log(`Installed LaunchAgent: ${LAUNCHAGENT_PLIST}`);
 }
 function loadLaunchAgent() {
   try {
-    execSync2(`launchctl load ${LAUNCHAGENT_PLIST}`, { stdio: "inherit" });
+    execSync(`launchctl load ${LAUNCHAGENT_PLIST}`, { stdio: "inherit" });
     console.log(
       "LaunchAgent loaded. Bridge will start automatically on login."
     );
@@ -1694,7 +1427,7 @@ function loadLaunchAgent() {
 }
 function unloadLaunchAgent() {
   try {
-    execSync2(`launchctl unload ${LAUNCHAGENT_PLIST}`, { stdio: "inherit" });
+    execSync(`launchctl unload ${LAUNCHAGENT_PLIST}`, { stdio: "inherit" });
     console.log("LaunchAgent unloaded.");
   } catch {
     console.error("Failed to unload LaunchAgent (may not be loaded)");
@@ -1702,17 +1435,82 @@ function unloadLaunchAgent() {
 }
 function uninstallLaunchAgent() {
   unloadLaunchAgent();
+  removeLegacyMenuBarLaunchAgent();
   try {
     unlinkSync(LAUNCHAGENT_PLIST);
     console.log("LaunchAgent removed.");
   } catch {
   }
 }
+var MENUBAR_PID_FILE = join(CONFIG_DIR, "menubar.pid");
+function removeLegacyMenuBarLaunchAgent() {
+  if (platform() !== "darwin" || !existsSync(LEGACY_MENUBAR_LAUNCHAGENT_PLIST)) {
+    return;
+  }
+  try {
+    execSync(`launchctl unload ${LEGACY_MENUBAR_LAUNCHAGENT_PLIST}`, {
+      stdio: "pipe"
+    });
+  } catch {
+  }
+  try {
+    unlinkSync(LEGACY_MENUBAR_LAUNCHAGENT_PLIST);
+  } catch {
+  }
+}
+function findMenuBarScript() {
+  const candidates = [
+    join(import.meta.dirname ?? "", "menubar.js"),
+    join(import.meta.dirname ?? "", "..", "dist", "menubar.js")
+  ];
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
+  return null;
+}
+function isKnownMenuBarProcess(pid) {
+  try {
+    const command = execSync(`ps -p ${pid} -o args=`, {
+      encoding: "utf-8",
+      timeout: 3e3
+    });
+    return command.includes("menubar.js") || command.includes("menubar.ts") || command.includes("VectorMenuBar");
+  } catch {
+    return false;
+  }
+}
+function killExistingMenuBar() {
+  if (existsSync(MENUBAR_PID_FILE)) {
+    try {
+      const pid = Number(readFileSync(MENUBAR_PID_FILE, "utf-8").trim());
+      if (Number.isFinite(pid) && pid > 0 && isKnownMenuBarProcess(pid)) {
+        process.kill(pid, "SIGTERM");
+      }
+    } catch {
+    }
+    try {
+      unlinkSync(MENUBAR_PID_FILE);
+    } catch {
+    }
+  }
+}
 async function launchMenuBar() {
+  if (platform() !== "darwin") return;
+  removeLegacyMenuBarLaunchAgent();
+  const script = findMenuBarScript();
+  if (!script) return;
+  killExistingMenuBar();
   try {
-    const { startMenuBar: startMenuBar2 } = await Promise.resolve().then(() => (init_menubar(), menubar_exports));
-    void startMenuBar2();
-    console.log("Menu bar started.");
+    const { spawn: spawnChild } = await import("child_process");
+    const child = spawnChild(process.execPath, [script], {
+      detached: true,
+      stdio: "ignore",
+      env: { ...process.env }
+    });
+    child.unref();
+    if (child.pid) {
+      writeFileSync(MENUBAR_PID_FILE, String(child.pid));
+    }
   } catch {
   }
 }
@@ -1722,8 +1520,8 @@ function getBridgeStatus() {
   let running = false;
   let starting = false;
   let pid;
-  if (existsSync2(PID_FILE2)) {
-    const pidStr = readFileSync2(PID_FILE2, "utf-8").trim();
+  if (existsSync(PID_FILE)) {
+    const pidStr = readFileSync(PID_FILE, "utf-8").trim();
     pid = Number(pidStr);
     try {
       process.kill(pid, 0);
@@ -1734,7 +1532,7 @@ function getBridgeStatus() {
   }
   if (!running && platform() === "darwin") {
     try {
-      const result = execSync2(
+      const result = execSync(
         `launchctl list ${LAUNCHAGENT_LABEL} 2>/dev/null`,
         { encoding: "utf-8", timeout: 3e3 }
       );
@@ -1747,8 +1545,9 @@ function getBridgeStatus() {
   return { configured: true, running, starting, pid, config };
 }
 function stopBridge() {
-  if (!existsSync2(PID_FILE2)) return false;
-  const pid = Number(readFileSync2(PID_FILE2, "utf-8").trim());
+  killExistingMenuBar();
+  if (!existsSync(PID_FILE)) return false;
+  const pid = Number(readFileSync(PID_FILE, "utf-8").trim());
   try {
     process.kill(pid, "SIGTERM");
     return true;
@@ -2204,7 +2003,7 @@ var program = new Command();
 function readPackageVersionSync() {
   try {
     const dir = import.meta.dirname ?? dirname(fileURLToPath2(import.meta.url));
-    const raw = readFileSync3(join3(dir, "..", "package.json"), "utf8");
+    const raw = readFileSync2(join2(dir, "..", "package.json"), "utf8");
     return JSON.parse(raw).version ?? "unknown";
   } catch {
     return "unknown";
@@ -3783,7 +3582,6 @@ serviceCommand.command("start").description("Start the bridge service via Launch
     const vcliPath = process.argv[1] ?? "vcli";
     installLaunchAgent(vcliPath);
     loadLaunchAgent();
-    await launchMenuBar();
     s.stop("Bridge service started.");
   } else {
     console.log(
@@ -3807,6 +3605,9 @@ serviceCommand.command("run").description("Run the bridge service in the foregro
     if (!user) throw new Error("Not logged in. Run `vcli auth login` first.");
     config = await setupBridgeDevice(runtime.convexUrl, user._id);
   }
+  if (osPlatform() === "darwin") {
+    await launchMenuBar();
+  }
   const bridge = new BridgeService(config);
   await bridge.run();
 });
@@ -3868,9 +3669,6 @@ serviceCommand.command("install").description("Install the bridge as a system se
   s.start("Starting bridge service...");
   loadLaunchAgent();
   s.stop("Bridge service started");
-  s.start("Launching menu bar...");
-  await launchMenuBar();
-  s.stop("Menu bar ready");
   console.log("");
   console.log(
     "Bridge installed and running. Will start automatically on login."