@rehpic/vcli 0.1.0-beta.56.1 → 0.1.0-beta.58.1

package/dist/index.js

@@ -1829,7 +1829,7 @@ var BridgeService = class {
     }
   }
 };
-async function setupBridgeDevice(client, convexUrl, userId) {
+async function setupBridgeDevice(client, convexUrl) {
   const deviceKey = `${hostname()}-${randomUUID().slice(0, 8)}`;
   const displayName = `${process.env.USER ?? "user"}'s ${platform() === "darwin" ? "Mac" : "machine"}`;
   const result = await client.mutation(
@@ -1848,7 +1848,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()
@@ -2511,6 +2511,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 authUserId = decodeSessionClaims(session).userId;
+    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 || (authUserId ? config.userId !== authUserId : false) || config.convexUrl !== runtime.convexUrl || !backendDevice;
+    if (needsRegistration) {
+      config = await setupBridgeDevice(client, runtime.convexUrl);
+    }
+    if (!config) {
+      throw new Error("Bridge device is not configured.");
+    }
+    return config;
+  } catch (error) {
+    if (config) {
+      return config;
+    }
+    throw error;
+  }
+}
 async function resolveMemberId(client, orgSlug, ref) {
   const members = await runQuery(
     client,
@@ -4246,24 +4279,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 +4297,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 +4410,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 +4460,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})`
     );