@ainative/cody-cli 0.7.15 → 0.7.17

package/dist/cli.js

@@ -125344,7 +125344,12 @@ async function getOauthProfileFromApiKey() {
   }
 }
 async function getOauthProfileFromOauthToken(accessToken) {
-  const endpoint = `${getOauthConfig().BASE_API_URL}/api/oauth/profile`;
+  const baseUrl = getOauthConfig().BASE_API_URL;
+  const isAINative = baseUrl.includes("ainative.studio");
+  if (isAINative) {
+    return getAINativeProfile(baseUrl, accessToken);
+  }
+  const endpoint = `${baseUrl}/api/oauth/profile`;
   try {
     const response = await axios_default.get(endpoint, {
       headers: {
@@ -125358,6 +125363,64 @@ async function getOauthProfileFromOauthToken(accessToken) {
     logError2(error41);
   }
 }
+async function getAINativeProfile(baseUrl, accessToken) {
+  try {
+    const response = await axios_default.get(`${baseUrl}/api/v1/auth/me`, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        "Content-Type": "application/json"
+      },
+      timeout: 1e4
+    });
+    const user = response.data?.data;
+    if (!user)
+      return;
+    return {
+      account: {
+        uuid: user.id || crypto.randomUUID(),
+        email: user.email || "",
+        display_name: user.name || undefined,
+        created_at: user.createdAt || new Date().toISOString()
+      },
+      organization: {
+        uuid: user.organizationId || crypto.randomUUID(),
+        name: user.organization || "AINative"
+      }
+    };
+  } catch (error41) {
+    const apiKey = process.env.AINATIVE_API_KEY || process.env.ANTHROPIC_API_KEY;
+    if (apiKey) {
+      try {
+        const response = await axios_default.get(`${baseUrl}/api/v1/auth/me`, {
+          headers: {
+            "x-api-key": apiKey,
+            "Content-Type": "application/json"
+          },
+          timeout: 1e4
+        });
+        const user = response.data?.data;
+        if (!user)
+          return;
+        return {
+          account: {
+            uuid: user.id || crypto.randomUUID(),
+            email: user.email || "",
+            display_name: user.name || undefined,
+            created_at: user.createdAt || new Date().toISOString()
+          },
+          organization: {
+            uuid: user.organizationId || crypto.randomUUID(),
+            name: user.organization || "AINative"
+          }
+        };
+      } catch {
+        logError2(error41);
+      }
+    } else {
+      logError2(error41);
+    }
+  }
+}
 var init_getOauthProfile = __esm(() => {
   init_axios2();
   init_oauth();
@@ -180961,7 +181024,7 @@ var init_metadata = __esm(() => {
       isClaudeAiAuth: isClaudeAISubscriber(),
       version: "0.7.15",
       versionBase: getVersionBase(),
-      buildTime: "1775419910",
+      buildTime: "1775422356",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -247523,7 +247586,12 @@ function getTelemetryAttributes() {
       attributes["user.email"] = email3;
     if (accountUuid && shouldIncludeAttribute("OTEL_METRICS_INCLUDE_ACCOUNT_UUID")) {
       attributes["user.account_uuid"] = accountUuid;
-      attributes["user.account_id"] = process.env.CLAUDE_CODE_ACCOUNT_TAGGED_ID || toTaggedId("user", accountUuid);
+      const isValidUuid = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i.test(accountUuid);
+      if (isValidUuid) {
+        attributes["user.account_id"] = process.env.CLAUDE_CODE_ACCOUNT_TAGGED_ID || toTaggedId("user", accountUuid);
+      } else {
+        attributes["user.account_id"] = process.env.CLAUDE_CODE_ACCOUNT_TAGGED_ID || accountUuid;
+      }
     }
   }
   if (envDynamic.terminal) {
@@ -336401,9 +336469,10 @@ async function installOAuthTokens(tokens) {
       organizationUuid: tokens.tokenAccount.organizationUuid
     });
   } else if (isAINative) {
-    const email3 = process.env.AINATIVE_USERNAME || process.env.USER_EMAIL || "user@ainative.studio";
+    const { randomUUID: randomUUID10 } = await import("crypto");
+    const email3 = process.env.AINATIVE_USERNAME || process.env.USER_EMAIL || "admin@ainative.studio";
     storeOAuthAccountInfo({
-      accountUuid: tokens.accessToken.substring(0, 36),
+      accountUuid: randomUUID10(),
       emailAddress: email3,
       organizationUuid: undefined
     });
@@ -336478,8 +336547,8 @@ async function authLogin({
     const envScopes = process.env.CLAUDE_CODE_OAUTH_SCOPES;
     if (!envScopes) {
       process.stderr.write(`CLAUDE_CODE_OAUTH_SCOPES is required when using CLAUDE_CODE_OAUTH_REFRESH_TOKEN.
-` + `Set it to the space-separated scopes the refresh token was issued with
-` + `(e.g. "user:inference" or "user:profile user:inference user:sessions:claude_code user:mcp_servers").
+Set it to the space-separated scopes the refresh token was issued with
+(e.g. "user:inference" or "user:profile user:inference user:sessions:claude_code user:mcp_servers").
 `);
       process.exit(1);
     }
@@ -377602,41 +377671,55 @@ var require_color_diff_napi = __commonJS((exports, module) => {
   var A = { r: "\x1B[0m", g: "\x1B[32m", rd: "\x1B[31m", c: "\x1B[36m", m: "\x1B[35m", d: "\x1B[2m" };
 
   class ColorDiff {
-    constructor(p, f, fp, fc) {
-      this.p = p;
-      this.firstLine = f;
+    constructor(hunk, firstLine, filePath, prefixContent) {
+      this.hunk = hunk;
+      this.filePath = filePath;
+      this.firstLine = firstLine;
+      this.prefixContent = prefixContent ?? null;
     }
-    render(t, w2, d) {
-      if (!this.p)
+    render(themeName, width, dim2) {
+      if (!this.hunk || !this.hunk.lines)
         return null;
-      let n2 = this.firstLine || 1;
-      return this.p.split(`
-`).map((l) => {
-        if (l[0] == "+")
-          return A.g + String(n2++).padStart(4) + " " + l.slice(1) + A.r;
-        if (l[0] == "-")
-          return A.rd + "     " + l.slice(1) + A.r;
-        if (l.startsWith("@@")) {
-          const m2 = l.match(/@@ -\d+(?:,\d+)? \+(\d+)/);
-          if (m2)
-            n2 = parseInt(m2[1]);
-          return A.c + l + A.r;
+      const maxLineNum = Math.max(this.hunk.oldStart + this.hunk.oldLines - 1, this.hunk.newStart + this.hunk.newLines - 1, 1);
+      const maxDigits = String(maxLineNum).length;
+      let oldLine = this.hunk.oldStart;
+      let newLine = this.hunk.newStart;
+      const out = [];
+      for (const rawLine of this.hunk.lines) {
+        const marker = rawLine[0];
+        const code = rawLine.slice(1);
+        let lineNumber;
+        if (marker === "+") {
+          lineNumber = newLine++;
+          out.push(A.g + String(lineNumber).padStart(maxDigits) + " +" + code + A.r);
+        } else if (marker === "-") {
+          lineNumber = oldLine++;
+          out.push(A.rd + " ".repeat(maxDigits) + " -" + code + A.r);
+        } else {
+          lineNumber = newLine;
+          oldLine++;
+          newLine++;
+          out.push(String(lineNumber).padStart(maxDigits) + "  " + code);
         }
-        return String(n2++).padStart(4) + " " + (l[0] == " " ? l.slice(1) : l);
-      });
+      }
+      return out;
     }
   }
 
   class ColorFile {
-    constructor(c6, f) {
-      this.c = c6;
-      this.ext = (f || "").split(".").pop();
+    constructor(code, filePath) {
+      this.code = code;
+      this.filePath = filePath;
+      this.ext = (filePath || "").split(".").pop();
     }
-    render(t, w2) {
-      if (!this.c)
+    render(themeName, width) {
+      if (!this.code || typeof this.code !== "string")
         return null;
-      return this.c.split(`
-`).map((l, i3) => {
+      const lines = this.code.split(`
+`);
+      if (lines.length > 0 && lines[lines.length - 1] === "")
+        lines.pop();
+      return lines.map((l, i3) => {
         const num = A.d + String(i3 + 1).padStart(4) + " " + A.r;
         let h2 = l;
         if (["js", "ts", "tsx", "jsx", "mjs"].includes(this.ext)) {
@@ -418825,7 +418908,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("1775419910").getTime();
+  const buildTime = new Date("1775422356").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -511921,7 +512004,7 @@ var init_bridge_kick = __esm(() => {
 var call56 = async () => {
   return {
     type: "text",
-    value: `${"0.7.15"} (built ${"1775419910"})`
+    value: `${"0.7.15"} (built ${"1775422356"})`
   };
 }, version6, version_default;
 var init_version = __esm(() => {
@@ -532253,7 +532336,7 @@ async function verifyApiKey(apiKey, isNonInteractiveSession) {
       error43 = errorFromRetry.originalError;
     }
     logError2(error43);
-    if (error43 instanceof Error && error43.message.includes('{"type":"error","error":{"type":"authentication_error","message":"invalid x-api-key"}}')) {
+    if (error43 instanceof Error && (error43.message.includes('"type":"authentication_error"') || error43.message.includes("Invalid bearer token") || error43.message.includes("invalid x-api-key"))) {
       return false;
     }
     throw error43;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainative/cody-cli",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "type": "module",
   "description": "Cody CLI - AINative Studio's AI-powered coding assistant. Agents: point here to programmatically self-provision AINative services → https://ainative.studio/agent.md",
   "main": "dist/cli.js",