kimiflare 0.36.1 → 0.37.0

package/dist/index.js

@@ -559,9 +559,11 @@ function validateModelId(model) {
 function buildKimiRequestTarget(opts2) {
   validateModelId(opts2.model);
   if (opts2.cloudMode) {
+    const headers2 = opts2.cloudToken ? { Authorization: `Bearer ${opts2.cloudToken}` } : {};
+    if (opts2.cloudDeviceId) headers2["X-Device-ID"] = opts2.cloudDeviceId;
     return {
       url: "https://api.kimiflare.com/v1/chat",
-      headers: opts2.cloudToken ? { Authorization: `Bearer ${opts2.cloudToken}` } : {}
+      headers: headers2
     };
   }
   if (!opts2.gateway?.id) {
@@ -1760,7 +1762,8 @@ Use console.log() to return results. Only console.log output will be sent back t
       sessionId: opts2.sessionId,
       gateway: opts2.gateway,
       cloudMode: opts2.cloudMode,
-      cloudToken: opts2.cloudToken
+      cloudToken: opts2.cloudToken,
+      cloudDeviceId: opts2.cloudDeviceId
     });
     for await (const ev of events) {
       switch (ev.type) {
@@ -4664,24 +4667,30 @@ function generateCode() {
   }
   return out;
 }
+function generateDeviceId() {
+  const arr = new Uint8Array(16);
+  crypto.getRandomValues(arr);
+  return Array.from(arr, (b) => b.toString(16).padStart(2, "0")).join("");
+}
 function generateDeviceCodes() {
   const deviceCode = `device-${generateCode()}-${Date.now()}`;
   const userCode = `${generateCode()}-${generateCode()}`;
   const authUrl = `${CLOUD_API_URL}/auth/github?code=${encodeURIComponent(userCode)}`;
-  return { deviceCode, userCode, authUrl };
+  const deviceId = generateDeviceId();
+  return { deviceCode, userCode, authUrl, deviceId };
 }
 async function registerDevice(codes) {
   const registerRes = await fetch(`${CLOUD_API_URL}/auth/device`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ device_code: codes.deviceCode, user_code: codes.userCode })
+    body: JSON.stringify({ device_code: codes.deviceCode, user_code: codes.userCode, device_id: codes.deviceId })
   });
   if (!registerRes.ok) {
     const err = await registerRes.json().catch(() => ({}));
     throw new Error(`Failed to register device: ${err.error || registerRes.statusText}`);
   }
 }
-async function pollForToken(deviceCode) {
+async function pollForToken(deviceCode, deviceId) {
   const pollRes = await fetch(`${CLOUD_API_URL}/auth/poll`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -4692,18 +4701,19 @@ async function pollForToken(deviceCode) {
   if (pollData.status === "approved" && pollData.access_token) {
     const creds = {
       accessToken: pollData.access_token,
-      expiresAt: Math.floor(Date.now() / 1e3) + 7 * 24 * 60 * 60
+      expiresAt: Math.floor(Date.now() / 1e3) + 7 * 24 * 60 * 60,
       // 7 days
+      deviceId
     };
     await saveCloudCredentials(creds);
     return creds;
   }
   return null;
 }
-async function fetchCloudUsage(token) {
-  const res = await fetch(`${CLOUD_API_URL}/v1/usage`, {
-    headers: { Authorization: `Bearer ${token}` }
-  });
+async function fetchCloudUsage(token, deviceId) {
+  const headers = { Authorization: `Bearer ${token}` };
+  if (deviceId) headers["X-Device-ID"] = deviceId;
+  const res = await fetch(`${CLOUD_API_URL}/v1/usage`, { headers });
   if (!res.ok) return null;
   const data = await res.json();
   if (typeof data.remaining !== "number" || typeof data.input_token_limit !== "number" || typeof data.input_tokens_used !== "number" || typeof data.expires_at !== "string") {
@@ -4720,7 +4730,7 @@ async function loadCloudCredentials() {
   try {
     const raw = await readFile11(cloudCredPath(), "utf8");
     const parsed = JSON.parse(raw);
-    if (parsed.expiresAt && parsed.expiresAt > Date.now() / 1e3) {
+    if (parsed.expiresAt && parsed.expiresAt > Date.now() / 1e3 && parsed.accessToken) {
       return parsed;
     }
   } catch {
@@ -4746,7 +4756,7 @@ async function authenticateDevice(onStatus) {
   while (Date.now() - startTime < POLL_TIMEOUT_MS) {
     await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
     onStatus({ url: codes.authUrl, userCode: codes.userCode, polling: true });
-    const creds = await pollForToken(codes.deviceCode);
+    const creds = await pollForToken(codes.deviceCode, codes.deviceId);
     if (creds) return creds;
   }
   throw new Error("Authentication timed out. Please try again.");
@@ -6868,9 +6878,9 @@ function buildRightParts(usage, contextLimit, sessionUsage, gatewayMeta, cloudMo
     parts.push(`out ${sessionUsage.completionTokens}`);
     parts.push(`ctx ${pct}%`);
     if (cloudMode) {
-      parts.push(`\x1B[9m${sessionUsage.cost.toFixed(5)}\x1B[29m`);
+      parts.push(`\x1B[9m$${sessionUsage.cost.toFixed(5)}\x1B[29m`);
     } else {
-      parts.push(`${sessionUsage.cost.toFixed(5)}`);
+      parts.push(`$${sessionUsage.cost.toFixed(5)}`);
     }
   } else {
     const cached = usage.prompt_tokens_details?.cached_tokens ?? 0;
@@ -6879,9 +6889,9 @@ function buildRightParts(usage, contextLimit, sessionUsage, gatewayMeta, cloudMo
     parts.push(`out ${usage.completion_tokens}`);
     parts.push(`ctx ${pct}%`);
     if (cloudMode) {
-      parts.push(`\x1B[9m${cost.total.toFixed(5)}\x1B[29m`);
+      parts.push(`\x1B[9m$${cost.total.toFixed(5)}\x1B[29m`);
     } else {
-      parts.push(`${cost.total.toFixed(5)}`);
+      parts.push(`$${cost.total.toFixed(5)}`);
     }
   }
   if (cloudMode && cloudBudget) {
@@ -6892,6 +6902,7 @@ function buildRightParts(usage, contextLimit, sessionUsage, gatewayMeta, cloudMo
   return parts;
 }
 function formatTokens(n) {
+  if (n >= 1e9) return `${(n / 1e9).toFixed(1)}B`;
   if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
   if (n >= 1e3) return `${(n / 1e3).toFixed(1)}K`;
   return String(n);
@@ -7978,9 +7989,9 @@ function Onboarding({ onDone, onCancel }) {
           return;
         }
         try {
-          const creds = await pollForToken(cloudAuth.codes.deviceCode);
+          const creds = await pollForToken(cloudAuth.codes.deviceCode, cloudAuth.codes.deviceId);
           if (creds && !cancelled) {
-            const usage = await fetchCloudUsage(creds.accessToken);
+            const usage = await fetchCloudUsage(creds.accessToken, creds.deviceId);
             if (usage && !cancelled) {
               setCloudAuth({
                 phase: "success",
@@ -12983,13 +12994,15 @@ function App({
   initialUpdateResult,
   initialLspScope,
   initialLspProjectPath,
-  initialCloudToken
+  initialCloudToken,
+  initialCloudDeviceId
 }) {
   const { exit } = useApp();
   const [cfg, setCfg] = useState10(initialCfg);
   const [lspScope, setLspScope] = useState10(initialLspScope);
   const [lspProjectPath, setLspProjectPath] = useState10(initialLspProjectPath);
   const [cloudToken, setCloudToken] = useState10(initialCloudToken);
+  const [cloudDeviceId, setCloudDeviceId] = useState10(initialCloudDeviceId);
   const [events, setRawEvents] = useState10([]);
   const setEvents = useCallback2(
     (updater) => {
@@ -13043,7 +13056,7 @@ function App({
     let cancelled = false;
     const fetchBudget = async () => {
       const { fetchCloudUsage: fetchCloudUsage2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
-      const usage2 = await fetchCloudUsage2(initialCloudToken);
+      const usage2 = await fetchCloudUsage2(initialCloudToken, cloudDeviceId ?? initialCloudDeviceId);
       if (usage2 && !cancelled) {
         setCloudBudget({ remaining: usage2.remaining, limit: usage2.input_token_limit });
       }
@@ -13967,6 +13980,7 @@ function App({
         codeMode: effectiveCodeMode,
         cloudMode: cfg.cloudMode,
         cloudToken: cloudToken ?? initialCloudToken,
+        cloudDeviceId: cloudDeviceId ?? initialCloudDeviceId,
         onIterationEnd,
         onFileChange: (path, content) => {
           if (content) {
@@ -14034,6 +14048,17 @@ function App({
             const sid = ensureSessionId();
             void recordUsage(sid, u, gatewayUsageLookupFromConfig(cfg, meta ?? gatewayMetaRef.current));
             void getCostReport(sid).then((report) => setSessionUsage(report.session));
+            if (cfg?.cloudMode && (cloudToken ?? initialCloudToken)) {
+              const token = cloudToken ?? initialCloudToken;
+              const did = cloudDeviceId ?? initialCloudDeviceId;
+              void (async () => {
+                const { fetchCloudUsage: fetchCloudUsage2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+                const usage2 = await fetchCloudUsage2(token, did);
+                if (usage2) {
+                  setCloudBudget({ remaining: usage2.remaining, limit: usage2.input_token_limit });
+                }
+              })();
+            }
           },
           onGatewayMeta: updateGatewayMeta,
           askPermission: (req) => new Promise((resolve2) => {
@@ -15113,6 +15138,17 @@ ${lines.join("\n")}` }]);
           const sid = ensureSessionId();
           void recordUsage(sid, u, gatewayUsageLookupFromConfig(cfg, meta ?? gatewayMetaRef.current));
           void getCostReport(sid).then((report) => setSessionUsage(report.session));
+          if (cfg?.cloudMode && (cloudToken ?? initialCloudToken)) {
+            const token = cloudToken ?? initialCloudToken;
+            const did = cloudDeviceId ?? initialCloudDeviceId;
+            void (async () => {
+              const { fetchCloudUsage: fetchCloudUsage2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
+              const usage2 = await fetchCloudUsage2(token, did);
+              if (usage2) {
+                setCloudBudget({ remaining: usage2.remaining, limit: usage2.input_token_limit });
+              }
+            })();
+          }
         },
         onGatewayMeta: updateGatewayMeta,
         onTasks: (nextTasks) => {
@@ -15177,6 +15213,7 @@ ${lines.join("\n")}` }]);
           codeMode: effectiveCodeMode,
           cloudMode: cfg.cloudMode,
           cloudToken: cloudToken ?? initialCloudToken,
+          cloudDeviceId: cloudDeviceId ?? initialCloudDeviceId,
           onIterationEnd,
           intentClassification: classification,
           onFileChange: (path, content2) => {
@@ -15678,7 +15715,7 @@ ${lines.join("\n")}` }]);
     ] })
   ] }) });
 }
-async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath = null, cloudToken) {
+async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath = null, cloudToken, cloudDeviceId) {
   const instance = render(
     /* @__PURE__ */ jsx23(
       App,
@@ -15687,7 +15724,8 @@ async function renderApp(cfg, updateResult, lspScope = "global", lspProjectPath
         initialUpdateResult: updateResult,
         initialLspScope: lspScope,
         initialLspProjectPath: lspProjectPath,
-        initialCloudToken: cloudToken
+        initialCloudToken: cloudToken,
+        initialCloudDeviceId: cloudDeviceId
       }
     ),
     {
@@ -15901,7 +15939,7 @@ program.command("usage").description("Show Kimiflare Cloud token usage (requires
     process.exit(1);
   }
   const { fetchCloudUsage: fetchCloudUsage2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
-  const usage = await fetchCloudUsage2(creds.accessToken);
+  const usage = await fetchCloudUsage2(creds.accessToken, creds.deviceId);
   if (!usage) {
     console.error("Failed to fetch usage: invalid response from server");
     process.exit(1);
@@ -15944,7 +15982,7 @@ Kimiflare Cloud Authentication`);
       });
       console.log(`Authenticated! Token expires at ${new Date(creds.expiresAt * 1e3).toISOString()}`);
       const { fetchCloudUsage: fetchCloudUsage2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
-      const usage = await fetchCloudUsage2(creds.accessToken);
+      const usage = await fetchCloudUsage2(creds.accessToken, creds.deviceId);
       if (usage) {
         console.log(`
 Token budget: ${usage.remaining.toLocaleString()} / ${usage.input_token_limit.toLocaleString()} remaining`);
@@ -15979,6 +16017,7 @@ async function main() {
   }
   const cloudMode = opts.cloud ?? cfg?.cloudMode ?? false;
   let cloudToken;
+  let cloudDeviceId;
   if (cloudMode) {
     const { loadCloudCredentials: loadCloudCredentials2, authenticateDevice: authenticateDevice2 } = await Promise.resolve().then(() => (init_auth(), auth_exports));
     let cloudCreds = await loadCloudCredentials2();
@@ -15987,6 +16026,7 @@ async function main() {
       process.exit(2);
     }
     cloudToken = cloudCreds.accessToken;
+    cloudDeviceId = cloudCreds.deviceId;
     cfg = {
       ...cfg ?? { accountId: "", apiToken: "", model: DEFAULT_MODEL },
       cloudMode: true
@@ -16008,6 +16048,7 @@ async function main() {
       showReasoning: !!opts.reasoning,
       codeMode: cfg.codeMode,
       cloudToken,
+      cloudDeviceId,
       continueOnLimit: !!opts.continueOnLimit,
       maxInputTokens: opts.maxInputTokens,
       updateResult
@@ -16023,9 +16064,9 @@ async function main() {
   const { renderApp: renderApp2 } = await Promise.resolve().then(() => (init_app(), app_exports));
   if (cfg) {
     const model = opts.model ?? cfg.model ?? DEFAULT_MODEL;
-    await renderApp2({ ...cfg, model }, updateResult, lspScope, lspProjectPath, cloudToken);
+    await renderApp2({ ...cfg, model }, updateResult, lspScope, lspProjectPath, cloudToken, cloudDeviceId);
   } else {
-    await renderApp2(null, updateResult, lspScope, lspProjectPath, cloudToken);
+    await renderApp2(null, updateResult, lspScope, lspProjectPath, cloudToken, cloudDeviceId);
   }
 }
 function gatewayFromPrintOpts(opts2) {
@@ -16077,6 +16118,7 @@ async function runPrintMode(opts2) {
       maxInputTokens: opts2.maxInputTokens,
       cloudMode: opts2.cloudMode,
       cloudToken: opts2.cloudToken,
+      cloudDeviceId: opts2.cloudDeviceId,
       coauthor: opts2.coauthor !== false ? { name: opts2.coauthorName || "kimiflare", email: opts2.coauthorEmail || "kimiflare@proton.me" } : void 0,
       callbacks: {
         onReasoningDelta: opts2.showReasoning ? (delta) => {