@quikcommit/cli 6.0.0 → 7.0.0

package/dist/index.js

@@ -41,7 +41,7 @@ var init_types = __esm({
 });
 
 // ../shared/dist/constants.js
-var CONFIG_DIR, CREDENTIALS_FILE, CONFIG_FILE, DEFAULT_API_URL, MAX_PR_CURRENT_BRANCH_CHARS, DEVICE_POLL_INTERVAL, DEVICE_FLOW_TIMEOUT;
+var CONFIG_DIR, CREDENTIALS_FILE, CONFIG_FILE, DEFAULT_API_URL, MAX_PR_CURRENT_BRANCH_CHARS, DEVICE_FLOW_TIMEOUT;
 var init_constants = __esm({
   "../shared/dist/constants.js"() {
     "use strict";
@@ -50,7 +50,6 @@ var init_constants = __esm({
     CONFIG_FILE = "config.json";
     DEFAULT_API_URL = "https://api.quikcommit.dev";
     MAX_PR_CURRENT_BRANCH_CHARS = 256;
-    DEVICE_POLL_INTERVAL = 1e3;
     DEVICE_FLOW_TIMEOUT = 6e5;
   }
 });
@@ -8065,23 +8064,25 @@ function openBrowser(url) {
   return false;
 }
 async function runLogin() {
-  const startRes = await fetch(`${API_URL}/v1/auth/device/start`, {
+  const codeRes = await fetch(`${API_URL}/api/auth/device/code`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({})
+    body: JSON.stringify({ client_id: CLIENT_ID })
   });
-  if (!startRes.ok) {
-    const err = await startRes.json().catch(() => ({ error: startRes.statusText }));
+  if (!codeRes.ok) {
+    const err = await codeRes.json().catch(() => ({ error: codeRes.statusText }));
     throw new Error(err.error ?? "Failed to start device flow");
   }
-  const startData = await startRes.json();
-  const code = startData.device_code;
-  if (!code) {
-    throw new Error("Server did not return a device_code");
+  const codeData = await codeRes.json();
+  const { device_code, user_code, verification_uri_complete, interval = 5 } = codeData;
+  if (!device_code || !user_code) {
+    throw new Error("Server did not return device codes");
   }
   console.log("Opening browser to sign in...");
   console.log("");
-  const authUrl = `${DASHBOARD_URL}/auth/cli?code=${encodeURIComponent(code)}`;
+  console.log(`  Your code: ${user_code}`);
+  console.log("");
+  const authUrl = verification_uri_complete ?? `${DASHBOARD_URL}/device?user_code=${encodeURIComponent(user_code)}`;
   const opened = openBrowser(authUrl);
   if (!opened) {
     console.log("Could not open browser. Please visit:");
@@ -8095,23 +8096,54 @@ async function runLogin() {
       `\r${SPINNER_FRAMES[frame++ % SPINNER_FRAMES.length]} Waiting for authorization... (${elapsed}s)`
     );
   }, 80);
+  let pollingInterval = interval * 1e3;
   const startTime = Date.now();
   try {
     while (Date.now() - startTime < DEVICE_FLOW_TIMEOUT) {
+      await new Promise((r) => setTimeout(r, pollingInterval));
       try {
-        const res = await fetch(
-          `${API_URL}/v1/auth/device/poll?code=${encodeURIComponent(code)}`
-        );
-        const data = await res.json();
-        if (data.status === "complete" && data.api_key) {
-          saveApiKey(data.api_key);
+        const tokenRes = await fetch(`${API_URL}/api/auth/device/token`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({
+            grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+            device_code,
+            client_id: CLIENT_ID
+          })
+        });
+        const tokenData = await tokenRes.json();
+        if (tokenData.access_token) {
+          saveApiKey(tokenData.access_token);
           process.stderr.write("\r\x1B[2K");
           console.log("Successfully logged in!");
           return;
         }
+        if (tokenData.error) {
+          switch (tokenData.error) {
+            case "authorization_pending":
+              break;
+            // continue polling
+            case "slow_down":
+              pollingInterval += 5e3;
+              break;
+            case "access_denied":
+              process.stderr.write("\r\x1B[2K");
+              console.error("Authorization was denied.");
+              process.exit(1);
+              break;
+            case "expired_token":
+              process.stderr.write("\r\x1B[2K");
+              console.error("Device code expired. Please try again.");
+              process.exit(1);
+              break;
+            default:
+              process.stderr.write("\r\x1B[2K");
+              console.error(`Error: ${tokenData.error_description ?? tokenData.error}`);
+              process.exit(1);
+          }
+        }
       } catch {
       }
-      await new Promise((r) => setTimeout(r, DEVICE_POLL_INTERVAL));
     }
     process.stderr.write("\r\x1B[2K");
     console.error("Login timed out. Please try again.");
@@ -8120,7 +8152,7 @@ async function runLogin() {
     clearInterval(spinner);
   }
 }
-var import_child_process4, import_os3, API_URL, DASHBOARD_URL, SPINNER_FRAMES;
+var import_child_process4, import_os3, API_URL, DASHBOARD_URL, CLIENT_ID, SPINNER_FRAMES;
 var init_login = __esm({
   "src/commands/login.ts"() {
     "use strict";
@@ -8130,6 +8162,7 @@ var init_login = __esm({
     init_dist();
     API_URL = process.env.QC_API_URL ?? DEFAULT_API_URL;
     DASHBOARD_URL = "https://app.quikcommit.dev";
+    CLIENT_ID = "qc-cli";
     SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quikcommit/cli",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "AI-powered conventional commit messages",
   "bin": {
     "qc": "./dist/index.js"