@rehpic/vcli 0.1.0-beta.57.1 → 0.1.0-beta.59.1

package/dist/index.js

@@ -1468,6 +1468,7 @@ function getGitInfo(cwd) {
 // src/bridge-service.ts
 var CONFIG_DIR = process.env.VECTOR_HOME?.trim() || join2(homedir3(), ".vector");
 var BRIDGE_CONFIG_FILE = join2(CONFIG_DIR, "bridge.json");
+var DEVICE_KEY_FILE = join2(CONFIG_DIR, "device-key");
 var PID_FILE = join2(CONFIG_DIR, "bridge.pid");
 var LIVE_ACTIVITIES_CACHE = join2(CONFIG_DIR, "live-activities.json");
 var LAUNCHAGENT_DIR = join2(homedir3(), "Library", "LaunchAgents");
@@ -1492,6 +1493,7 @@ function loadBridgeConfig() {
 function saveBridgeConfig(config) {
   if (!existsSync2(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true });
   writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(config, null, 2));
+  persistDeviceKey(config.deviceKey);
 }
 function writeLiveActivitiesCache(activities) {
   if (!existsSync2(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true });
@@ -1829,8 +1831,8 @@ var BridgeService = class {
     }
   }
 };
-async function setupBridgeDevice(client, convexUrl, userId) {
-  const deviceKey = `${hostname()}-${randomUUID().slice(0, 8)}`;
+async function setupBridgeDevice(client, convexUrl) {
+  const deviceKey = getStableDeviceKey();
   const displayName = `${process.env.USER ?? "user"}'s ${platform() === "darwin" ? "Mac" : "machine"}`;
   const result = await client.mutation(
     api.agentBridge.mutations.registerBridgeDevice,
@@ -1848,7 +1850,7 @@ async function setupBridgeDevice(client, convexUrl, userId) {
     deviceId: result.deviceId,
     deviceKey,
     deviceSecret: result.deviceSecret,
-    userId,
+    userId: result.userId,
     displayName,
     convexUrl,
     registeredAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -1856,6 +1858,28 @@ async function setupBridgeDevice(client, convexUrl, userId) {
   saveBridgeConfig(config);
   return config;
 }
+function getStableDeviceKey() {
+  const existingConfig = loadBridgeConfig();
+  const existingKey = existingConfig?.deviceKey?.trim();
+  if (existingKey) {
+    persistDeviceKey(existingKey);
+    return existingKey;
+  }
+  if (existsSync2(DEVICE_KEY_FILE)) {
+    const savedKey = readFileSync2(DEVICE_KEY_FILE, "utf-8").trim();
+    if (savedKey) {
+      return savedKey;
+    }
+  }
+  const generatedKey = `${hostname()}-${randomUUID().slice(0, 8)}`;
+  persistDeviceKey(generatedKey);
+  return generatedKey;
+}
+function persistDeviceKey(deviceKey) {
+  if (!existsSync2(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true });
+  writeFileSync(DEVICE_KEY_FILE, `${deviceKey}
+`);
+}
 function buildLaunchPrompt(issueKey, issueTitle, workspacePath) {
   return [
     `You are working on Vector issue ${issueKey}: ${issueTitle}.`,
@@ -2511,6 +2535,39 @@ async function getClient(command) {
   );
   return { client, runtime, session };
 }
+async function ensureBridgeConfig(command) {
+  let config = loadBridgeConfig();
+  try {
+    const runtime = await getRuntime(command);
+    const session = requireSession(runtime);
+    const client = await createConvexClient(
+      session,
+      runtime.appUrl,
+      runtime.convexUrl
+    );
+    const user = await runQuery(client, api.users.currentUser);
+    if (!user) {
+      throw new Error("Not logged in. Run `vcli auth login` first.");
+    }
+    const backendDevice = config ? await runQuery(client, api.agentBridge.queries.getDevice, {
+      deviceId: config.deviceId
+    }) : null;
+    const needsRegistration = !config || config.userId !== user._id || config.convexUrl !== runtime.convexUrl || !backendDevice;
+    if (needsRegistration) {
+      config = await setupBridgeDevice(client, runtime.convexUrl);
+    }
+    if (!config) {
+      throw new Error("Bridge device is not configured.");
+    }
+    saveBridgeConfig(config);
+    return config;
+  } catch (error) {
+    if (config) {
+      return config;
+    }
+    throw error;
+  }
+}
 async function resolveMemberId(client, orgSlug, ref) {
   const members = await runQuery(
     client,
@@ -4246,24 +4303,9 @@ serviceCommand.command("start").description("Start the bridge service via Launch
   }
   const { spinner } = await import("@clack/prompts");
   const s = spinner();
-  let config = loadBridgeConfig();
-  if (!config) {
-    s.start("Registering device...");
-    const runtime = await getRuntime(command);
-    const session = requireSession(runtime);
-    const client = await createConvexClient(
-      session,
-      runtime.appUrl,
-      runtime.convexUrl
-    );
-    const user = await runQuery(client, api.users.currentUser);
-    if (!user) {
-      s.stop("Failed");
-      throw new Error("Not logged in. Run `vcli auth login` first.");
-    }
-    config = await setupBridgeDevice(client, runtime.convexUrl, user._id);
-    s.stop(`Device registered: ${config.displayName}`);
-  }
+  s.start("Ensuring device registration...");
+  const config = await ensureBridgeConfig(command);
+  s.stop(`Device ready: ${config.displayName}`);
   if (osPlatform() === "darwin") {
     s.start("Starting bridge service...");
     const vcliPath = process.argv[1] ?? "vcli";
@@ -4279,19 +4321,7 @@ serviceCommand.command("start").description("Start the bridge service via Launch
   }
 });
 serviceCommand.command("run").description("Run the bridge service in the foreground (used by LaunchAgent)").action(async (_options, command) => {
-  let config = loadBridgeConfig();
-  if (!config) {
-    const runtime = await getRuntime(command);
-    const session = requireSession(runtime);
-    const client = await createConvexClient(
-      session,
-      runtime.appUrl,
-      runtime.convexUrl
-    );
-    const user = await runQuery(client, api.users.currentUser);
-    if (!user) throw new Error("Not logged in. Run `vcli auth login` first.");
-    config = await setupBridgeDevice(client, runtime.convexUrl, user._id);
-  }
+  const config = await ensureBridgeConfig(command);
   if (osPlatform() === "darwin") {
     await launchMenuBar();
   }
@@ -4404,24 +4434,9 @@ serviceCommand.command("install").description("Install the bridge as a system se
   }
   const { spinner } = await import("@clack/prompts");
   const s = spinner();
-  let config = loadBridgeConfig();
-  if (!config) {
-    s.start("Registering device...");
-    const runtime = await getRuntime(command);
-    const session = requireSession(runtime);
-    const client = await createConvexClient(
-      session,
-      runtime.appUrl,
-      runtime.convexUrl
-    );
-    const user = await runQuery(client, api.users.currentUser);
-    if (!user) {
-      s.stop("Failed");
-      throw new Error("Not logged in. Run `vcli auth login` first.");
-    }
-    config = await setupBridgeDevice(client, runtime.convexUrl, user._id);
-    s.stop(`Device registered: ${config.displayName}`);
-  }
+  s.start("Ensuring device registration...");
+  const config = await ensureBridgeConfig(command);
+  s.stop(`Device ready: ${config.displayName}`);
   s.start("Installing LaunchAgent...");
   const vcliPath = process.argv[1] ?? "vcli";
   installLaunchAgent(vcliPath);
@@ -4469,18 +4484,9 @@ serviceCommand.command("disable").description("Disable bridge from starting at l
 });
 var bridgeCommand = program.command("bridge").description("Start/stop the local agent bridge");
 bridgeCommand.command("start").description("Register device, install service, and start the bridge").action(async (_options, command) => {
-  let config = loadBridgeConfig();
-  if (!config) {
-    const runtime = await getRuntime(command);
-    const session = requireSession(runtime);
-    const client = await createConvexClient(
-      session,
-      runtime.appUrl,
-      runtime.convexUrl
-    );
-    const user = await runQuery(client, api.users.currentUser);
-    if (!user) throw new Error("Not logged in. Run `vcli auth login` first.");
-    config = await setupBridgeDevice(client, runtime.convexUrl, user._id);
+  const existingConfig = loadBridgeConfig();
+  const config = await ensureBridgeConfig(command);
+  if (!existingConfig || existingConfig.deviceId !== config.deviceId || existingConfig.userId !== config.userId) {
     console.log(
       `Device registered: ${config.displayName} (${config.deviceId})`
     );