@rehpic/vcli 0.1.0-beta.44.1 → 0.1.0-beta.46.1

package/dist/index.js

@@ -49,6 +49,19 @@ function isBridgeRunning() {
     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(
@@ -145,16 +158,37 @@ function buildMenu() {
   }
   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 http://localhost:3000", { stdio: "ignore" });
+      execSync(`open "${url}"`, { stdio: "ignore" });
     } catch {
     }
   });
   idx++;
-  items.push({ title: "Quit" });
+  items.push({ title: "Quit Vector" });
   actions.set(idx, () => {
+    try {
+      const { pid: bridgePid } = isBridgeRunning();
+      if (bridgePid) process.kill(bridgePid, "SIGTERM");
+    } catch {
+    }
     process.exit(0);
   });
   idx++;
@@ -1673,8 +1707,9 @@ async function launchMenuBar() {
 }
 function getBridgeStatus() {
   const config = loadBridgeConfig();
-  if (!config) return { configured: false, running: false };
+  if (!config) return { configured: false, running: false, starting: false };
   let running = false;
+  let starting = false;
   let pid;
   if (existsSync2(PID_FILE2)) {
     const pidStr = readFileSync2(PID_FILE2, "utf-8").trim();
@@ -1686,7 +1721,19 @@ function getBridgeStatus() {
       running = false;
     }
   }
-  return { configured: true, running, pid, config };
+  if (!running && platform() === "darwin") {
+    try {
+      const result = execSync2(
+        `launchctl list ${LAUNCHAGENT_LABEL} 2>/dev/null`,
+        { encoding: "utf-8", timeout: 3e3 }
+      );
+      if (result.includes(LAUNCHAGENT_LABEL)) {
+        starting = true;
+      }
+    } catch {
+    }
+  }
+  return { configured: true, running, starting, pid, config };
 }
 function stopBridge() {
   if (!existsSync2(PID_FILE2)) return false;
@@ -3722,9 +3769,6 @@ serviceCommand.command("start").description("Start the bridge service via Launch
     loadLaunchAgent();
     await launchMenuBar();
     console.log("Bridge service started.");
-    console.log("");
-    console.log("Run `vcli service status` to check.");
-    console.log("Run `vcli service stop` to stop.");
   } else {
     console.log(
       "Starting bridge in foreground (use systemd for background)..."
@@ -3771,9 +3815,8 @@ serviceCommand.command("status").description("Show bridge service status").actio
     `  Device:  ${status.config.displayName} (${status.config.deviceId})`
   );
   console.log(`  User:    ${status.config.userId}`);
-  console.log(
-    `  Status:  ${status.running ? `Running (PID ${status.pid})` : "Not running"}`
-  );
+  const statusLabel = status.running ? `Running (PID ${status.pid})` : status.starting ? "Starting..." : "Not running";
+  console.log(`  Status:  ${statusLabel}`);
   console.log(`  Config:  ~/.vector/bridge.json`);
 });
 serviceCommand.command("install").description("Install the bridge as a system service (macOS LaunchAgent)").action(async (_options, command) => {
@@ -3801,14 +3844,9 @@ serviceCommand.command("install").description("Install the bridge as a system se
   const vcliPath = process.argv[1] ?? "vcli";
   installLaunchAgent(vcliPath);
   loadLaunchAgent();
-  console.log("");
-  console.log("Bridge is now running and will start automatically on login.");
-  console.log("");
-  console.log("To start the service manually:");
-  console.log("  vcli service start");
-  console.log("");
-  console.log("To check status:");
-  console.log("  vcli service status");
+  console.log(
+    "Bridge installed and running. Will start automatically on login."
+  );
 });
 serviceCommand.command("uninstall").description("Uninstall the bridge system service").action(() => {
   uninstallLaunchAgent();