@ainative/cody-cli 0.7.16 → 0.7.18

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 || ""
+      }
+    };
+  } 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 || ""
+          }
+        };
+      } 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: "1775421369",
+      buildTime: "1775423471",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -198219,21 +198282,21 @@ var init_string_width = __esm(() => {
 });
 
 // node_modules/wrap-ansi/index.js
-function wrapAnsi(string4, columns, options) {
+function wrapAnsi(string4, columns2, options) {
   return String(string4).normalize().replaceAll(`\r
 `, `
 `).split(`
-`).map((line) => exec2(line, columns, options)).join(`
+`).map((line) => exec2(line, columns2, options)).join(`
 `);
 }
-var ESCAPES2, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC = "]", ANSI_SGR_TERMINATOR = "m", ANSI_ESCAPE_LINK, wrapAnsiCode = (code) => `${ESCAPES2.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`, wrapAnsiHyperlink = (url3) => `${ESCAPES2.values().next().value}${ANSI_ESCAPE_LINK}${url3}${ANSI_ESCAPE_BELL}`, wordLengths = (string4) => string4.split(" ").map((character) => stringWidth2(character)), wrapWord = (rows, word, columns) => {
+var ESCAPES2, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC = "]", ANSI_SGR_TERMINATOR = "m", ANSI_ESCAPE_LINK, wrapAnsiCode = (code) => `${ESCAPES2.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`, wrapAnsiHyperlink = (url3) => `${ESCAPES2.values().next().value}${ANSI_ESCAPE_LINK}${url3}${ANSI_ESCAPE_BELL}`, wordLengths = (string4) => string4.split(" ").map((character) => stringWidth2(character)), wrapWord = (rows, word, columns2) => {
   const characters = [...word];
   let isInsideEscape = false;
   let isInsideLinkEscape = false;
   let visible = stringWidth2(stripAnsi(rows.at(-1)));
   for (const [index, character] of characters.entries()) {
     const characterLength = stringWidth2(character);
-    if (visible + characterLength <= columns) {
+    if (visible + characterLength <= columns2) {
       rows[rows.length - 1] += character;
     } else {
       rows.push(character);
@@ -198256,7 +198319,7 @@ var ESCAPES2, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
       continue;
     }
     visible += characterLength;
-    if (visible === columns && index < characters.length - 1) {
+    if (visible === columns2 && index < characters.length - 1) {
       rows.push("");
       visible = 0;
     }
@@ -198277,7 +198340,7 @@ var ESCAPES2, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
     return string4;
   }
   return words.slice(0, last).join(" ") + words.slice(last).join("");
-}, exec2 = (string4, columns, options = {}) => {
+}, exec2 = (string4, columns2, options = {}) => {
   if (options.trim !== false && string4.trim() === "") {
     return "";
   }
@@ -198292,7 +198355,7 @@ var ESCAPES2, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
     }
     let rowLength = stringWidth2(rows.at(-1));
     if (index !== 0) {
-      if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
+      if (rowLength >= columns2 && (options.wordWrap === false || options.trim === false)) {
         rows.push("");
         rowLength = 0;
       }
@@ -198301,25 +198364,25 @@ var ESCAPES2, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
         rowLength++;
       }
     }
-    if (options.hard && lengths[index] > columns) {
-      const remainingColumns = columns - rowLength;
-      const breaksStartingThisLine = 1 + Math.floor((lengths[index] - remainingColumns - 1) / columns);
-      const breaksStartingNextLine = Math.floor((lengths[index] - 1) / columns);
+    if (options.hard && lengths[index] > columns2) {
+      const remainingColumns = columns2 - rowLength;
+      const breaksStartingThisLine = 1 + Math.floor((lengths[index] - remainingColumns - 1) / columns2);
+      const breaksStartingNextLine = Math.floor((lengths[index] - 1) / columns2);
       if (breaksStartingNextLine < breaksStartingThisLine) {
         rows.push("");
       }
-      wrapWord(rows, word, columns);
+      wrapWord(rows, word, columns2);
       continue;
     }
-    if (rowLength + lengths[index] > columns && rowLength > 0 && lengths[index] > 0) {
-      if (options.wordWrap === false && rowLength < columns) {
-        wrapWord(rows, word, columns);
+    if (rowLength + lengths[index] > columns2 && rowLength > 0 && lengths[index] > 0) {
+      if (options.wordWrap === false && rowLength < columns2) {
+        wrapWord(rows, word, columns2);
         continue;
       }
       rows.push("");
     }
-    if (rowLength + lengths[index] > columns && options.wordWrap === false) {
-      wrapWord(rows, word, columns);
+    if (rowLength + lengths[index] > columns2 && options.wordWrap === false) {
+      wrapWord(rows, word, columns2);
       continue;
     }
     rows[rows.length - 1] += word;
@@ -198388,22 +198451,22 @@ function sliceFit(text, start, end) {
   const s = sliceAnsi(text, start, end);
   return stringWidth(s) > end - start ? sliceAnsi(text, start, end - 1) : s;
 }
-function truncate2(text, columns, position) {
-  if (columns < 1)
+function truncate2(text, columns2, position) {
+  if (columns2 < 1)
     return "";
-  if (columns === 1)
+  if (columns2 === 1)
     return ELLIPSIS;
   const length = stringWidth(text);
-  if (length <= columns)
+  if (length <= columns2)
     return text;
   if (position === "start") {
-    return ELLIPSIS + sliceFit(text, length - columns + 1, length);
+    return ELLIPSIS + sliceFit(text, length - columns2 + 1, length);
   }
   if (position === "middle") {
-    const half = Math.floor(columns / 2);
-    return sliceFit(text, 0, half) + ELLIPSIS + sliceFit(text, length - (columns - half) + 1, length);
+    const half = Math.floor(columns2 / 2);
+    return sliceFit(text, 0, half) + ELLIPSIS + sliceFit(text, length - (columns2 - half) + 1, length);
   }
-  return sliceFit(text, 0, columns - 1) + ELLIPSIS;
+  return sliceFit(text, 0, columns2 - 1) + ELLIPSIS;
 }
 function wrapText2(text, maxWidth, wrapType) {
   if (wrapType === "wrap") {
@@ -202934,10 +202997,10 @@ var init_keyboard_event = __esm(() => {
 });
 
 // src/ink/frame.ts
-function emptyFrame(rows, columns, stylePool, charPool, hyperlinkPool) {
+function emptyFrame(rows, columns2, stylePool, charPool, hyperlinkPool) {
   return {
     screen: createScreen(0, 0, stylePool, charPool, hyperlinkPool),
-    viewport: { width: columns, height: rows },
+    viewport: { width: columns2, height: rows },
     cursor: { x: 0, y: 0, visible: true }
   };
 }
@@ -270110,13 +270173,13 @@ function OutputLine(t0) {
     linkifyUrls
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const expandShellOutput = useExpandShellOutput();
   const inVirtualList = React16.useContext(InVirtualListContext);
   const shouldShowFull = verbose || expandShellOutput;
   let t1;
-  if ($3[0] !== columns || $3[1] !== content || $3[2] !== inVirtualList || $3[3] !== linkifyUrls || $3[4] !== shouldShowFull) {
+  if ($3[0] !== columns2 || $3[1] !== content || $3[2] !== inVirtualList || $3[3] !== linkifyUrls || $3[4] !== shouldShowFull) {
     bb0: {
       let formatted = tryJsonFormatContent(content);
       if (linkifyUrls) {
@@ -270126,9 +270189,9 @@ function OutputLine(t0) {
         t1 = stripUnderlineAnsi(formatted);
         break bb0;
       }
-      t1 = stripUnderlineAnsi(renderTruncatedContent(formatted, columns, inVirtualList));
+      t1 = stripUnderlineAnsi(renderTruncatedContent(formatted, columns2, inVirtualList));
     }
-    $3[0] = columns;
+    $3[0] = columns2;
     $3[1] = content;
     $3[2] = inVirtualList;
     $3[3] = linkifyUrls;
@@ -336406,13 +336469,13 @@ 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");
     storeOAuthAccountInfo({
-      accountUuid: tokens.accessToken.substring(0, 36),
-      emailAddress: email3,
+      accountUuid: randomUUID10(),
+      emailAddress: "",
       organizationUuid: undefined
     });
-    logForDebugging(`[AINative] Stored fallback account info for ${email3}`);
+    logForDebugging("[AINative] Stored fallback account info (no profile available)");
   }
   const storageResult = saveOAuthTokensIfNeeded(tokens);
   clearOAuthTokenCache();
@@ -336483,8 +336546,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);
     }
@@ -337627,7 +337690,7 @@ function TaskListV2({
   const [, forceUpdate] = React22.useState(0);
   const {
     rows,
-    columns
+    columns: columns2
   } = useTerminalSize();
   const completionTimestampsRef = React22.useRef(new Map);
   const previousCompletedIdsRef = React22.useRef(null);
@@ -337760,7 +337823,7 @@ function TaskListV2({
         openBlockers: task_0.blockedBy.filter((id_3) => unresolvedTaskIds.has(id_3)),
         activity: task_0.owner ? teammateActivity[task_0.owner] : undefined,
         ownerActive: task_0.owner ? activeTeammates.has(task_0.owner) : false,
-        columns
+        columns: columns2
       }, task_0.id, false, undefined, this)),
       maxDisplay > 0 && hiddenSummary && /* @__PURE__ */ jsx_dev_runtime62.jsxDEV(ThemedText, {
         dimColor: true,
@@ -337841,7 +337904,7 @@ function TaskItem(t0) {
     openBlockers,
     activity,
     ownerActive,
-    columns
+    columns: columns2
   } = t0;
   const isCompleted = task.status === "completed";
   const isInProgress = task.status === "in_progress";
@@ -337859,7 +337922,7 @@ function TaskItem(t0) {
     color: color2
   } = t1;
   const showActivity = isInProgress && !isBlocked && activity;
-  const showOwner = columns >= 60 && task.owner && ownerActive;
+  const showOwner = columns2 >= 60 && task.owner && ownerActive;
   let t2;
   if ($3[2] !== showOwner || $3[3] !== task.owner) {
     t2 = showOwner ? stringWidth(` (@${task.owner})`) : 0;
@@ -337870,7 +337933,7 @@ function TaskItem(t0) {
     t2 = $3[4];
   }
   const ownerWidth = t2;
-  const maxSubjectWidth = Math.max(15, columns - 15 - ownerWidth);
+  const maxSubjectWidth = Math.max(15, columns2 - 15 - ownerWidth);
   let t3;
   if ($3[5] !== maxSubjectWidth || $3[6] !== task.subject) {
     t3 = truncateToWidth(task.subject, maxSubjectWidth);
@@ -337881,7 +337944,7 @@ function TaskItem(t0) {
     t3 = $3[7];
   }
   const displaySubject = t3;
-  const maxActivityWidth = Math.max(15, columns - 15);
+  const maxActivityWidth = Math.max(15, columns2 - 15);
   let t4;
   if ($3[8] !== activity || $3[9] !== maxActivityWidth) {
     t4 = activity ? truncateToWidth(activity, maxActivityWidth) : undefined;
@@ -338928,7 +338991,7 @@ function SpinnerAnimationRow({
   pauseStartTimeRef,
   spinnerSuffix,
   verbose,
-  columns,
+  columns: columns2,
   hasRunningTeammates,
   teammateTokens,
   foregroundedTeammate,
@@ -338988,7 +339051,7 @@ function SpinnerAnimationRow({
   const sep11 = SEP_WIDTH;
   const wantsThinking = thinkingStatus !== null;
   const wantsTimerAndTokens = verbose || hasRunningTeammates || effectiveElapsedMs > SHOW_TOKENS_AFTER_MS;
-  const availableSpace = columns - messageWidth - 5;
+  const availableSpace = columns2 - messageWidth - 5;
   let showThinking = wantsThinking && availableSpace > thinkingWidthValue;
   if (!showThinking && wantsThinking && thinkingStatus === "thinking" && effortSuffix) {
     if (availableSpace > THINKING_BARE_WIDTH) {
@@ -343169,7 +343232,7 @@ function TeammateSpinnerLine({
   const treeChar = isHighlighted ? isLast ? "╘═" : "╞═" : isLast ? "└─" : "├─";
   const nameColor = toInkColor(teammate.identity.color);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const idleStartRef = import_react57.useRef(null);
   const frozenDurationRef = import_react57.useRef(null);
@@ -343200,10 +343263,10 @@ function TeammateSpinnerLine({
   const viewHintText = " · enter to view";
   const viewHintWidth = stringWidth(viewHintText);
   const minActivityWidth = 25;
-  const spaceWithFullName = columns - basePrefix - fullNameWidth - 2;
-  const showName = columns >= 60 && spaceWithFullName >= minActivityWidth;
+  const spaceWithFullName = columns2 - basePrefix - fullNameWidth - 2;
+  const showName = columns2 >= 60 && spaceWithFullName >= minActivityWidth;
   const nameWidth = showName ? fullNameWidth + 2 : 0;
-  const availableForActivity = columns - basePrefix - nameWidth;
+  const availableForActivity = columns2 - basePrefix - nameWidth;
   const showViewHint = isSelected && !isForegrounded && availableForActivity > viewHintWidth + statsWidth + minActivityWidth + 5;
   const showSelectHint = isHighlighted && availableForActivity > selectHintWidth + (showViewHint ? viewHintWidth : 0) + statsWidth + minActivityWidth + 5;
   const showStats = availableForActivity > statsWidth + minActivityWidth + 5;
@@ -343763,7 +343826,7 @@ function SpinnerWithVerbInner({
     tasks
   }) : undefined;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const tasksV2 = useTasksV2();
   const [thinkingStatus, setThinkingStatus] = import_react58.useState(null);
@@ -343918,7 +343981,7 @@ function SpinnerWithVerbInner({
         pauseStartTimeRef,
         spinnerSuffix,
         verbose,
-        columns,
+        columns: columns2,
         hasRunningTeammates,
         teammateTokens,
         foregroundedTeammate,
@@ -343967,7 +344030,7 @@ function BriefIdleStatus() {
   const connStatus = useAppState(_temp73);
   const runningCount = useAppState(_temp82);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const showConnWarning = connStatus === "reconnecting" || connStatus === "disconnected";
   const connText = connStatus === "reconnecting" ? "Reconnecting…" : "Disconnected";
@@ -343985,7 +344048,7 @@ function BriefIdleStatus() {
     }
     return t02;
   }
-  const pad = Math.max(1, columns - 2 - stringWidth(leftText) - stringWidth(rightText));
+  const pad = Math.max(1, columns2 - 2 - stringWidth(leftText) - stringWidth(rightText));
   let t0;
   if ($3[1] !== leftText) {
     t0 = leftText ? /* @__PURE__ */ jsx_dev_runtime70.jsxDEV(ThemedText, {
@@ -344183,6 +344246,8 @@ function ConsoleOAuthFlow({
     };
   });
   const [pastedCode, setPastedCode] = import_react59.useState("");
+  const [apiKeyInput2, setApiKeyInput2] = import_react59.useState("");
+  const [apiKeyCursorOffset2, setApiKeyCursorOffset2] = import_react59.useState(0);
   const [cursorOffset, setCursorOffset] = import_react59.useState(0);
   const [oauthService] = import_react59.useState(() => new OAuthService);
   const [loginWithClaudeAi, setLoginWithClaudeAi] = import_react59.useState(() => {
@@ -344485,7 +344550,7 @@ function OAuthStatusMessage(t0) {
   } = t0;
   switch (oauthStatus.state) {
     case "idle": {
-      const t1 = startingMessage ? startingMessage : "Cody CLI can be used with your AINative subscription or billed based on API usage through your AINative Console account.";
+      const t1 = startingMessage ? startingMessage : "Sign in to Cody CLI with your AINative account.";
       let t2;
       if ($3[0] !== t1) {
         t2 = /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
@@ -344511,13 +344576,12 @@ function OAuthStatusMessage(t0) {
         t4 = {
           label: /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
             children: [
-              "AINative account with subscription ·",
+              "AINative OAuth login ·",
               " ",
               /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
                 dimColor: true,
-                children: "Pro, Team, or Enterprise"
+                children: "Sign in via browser"
               }, undefined, false, undefined, this),
-              false,
               `
 `
             ]
@@ -344533,17 +344597,17 @@ function OAuthStatusMessage(t0) {
         t5 = {
           label: /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
             children: [
-              "AINative Console account ·",
+              "AINative API key ·",
               " ",
               /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
                 dimColor: true,
-                children: "API usage billing"
+                children: "Paste your sk_ key"
               }, undefined, false, undefined, this),
               `
 `
             ]
           }, undefined, true, undefined, this),
-          value: "console"
+          value: "apikey"
         };
         $3[4] = t5;
       } else {
@@ -344581,17 +344645,17 @@ function OAuthStatusMessage(t0) {
                 setOAuthStatus({
                   state: "platform_setup"
                 });
+              } else if (value_0 === "apikey") {
+                logEvent("tengu_oauth_apikey_selected", {});
+                setOAuthStatus({
+                  state: "api_key_input"
+                });
               } else {
                 setOAuthStatus({
                   state: "ready_to_start"
                 });
-                if (value_0 === "claudeai") {
-                  logEvent("tengu_oauth_claudeai_selected", {});
-                  setLoginWithClaudeAi(true);
-                } else {
-                  logEvent("tengu_oauth_console_selected", {});
-                  setLoginWithClaudeAi(false);
-                }
+                logEvent("tengu_oauth_claudeai_selected", {});
+                setLoginWithClaudeAi(true);
               }
             }
           }, undefined, false, undefined, this)
@@ -344754,6 +344818,93 @@ function OAuthStatusMessage(t0) {
       }
       return t8;
     }
+    case "api_key_input": {
+      const apiKeyColumns = columns - 22;
+      return /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedBox_default, {
+        flexDirection: "column",
+        gap: 1,
+        marginTop: 1,
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
+            bold: true,
+            children: "Enter your AINative API key"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
+            dimColor: true,
+            children: "Paste your sk_ prefixed API key below."
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedBox_default, {
+            children: [
+              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
+                children: "API key: "
+              }, undefined, false, undefined, this),
+              /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(TextInput, {
+                value: apiKeyInput,
+                onChange: setApiKeyInput,
+                onSubmit: async (value) => {
+                  const key = value.trim();
+                  if (!key)
+                    return;
+                  if (!key.startsWith("sk_")) {
+                    setOAuthStatus({
+                      state: "error",
+                      message: "Invalid API key. AINative API keys start with sk_",
+                      toRetry: { state: "api_key_input" }
+                    });
+                    return;
+                  }
+                  const normalized = key.slice(-20);
+                  saveGlobalConfig((current) => {
+                    const approved = current.customApiKeyResponses?.approved ?? [];
+                    if (!approved.includes(normalized)) {
+                      approved.push(normalized);
+                    }
+                    return {
+                      ...current,
+                      customApiKeyResponses: {
+                        ...current.customApiKeyResponses,
+                        approved,
+                        rejected: (current.customApiKeyResponses?.rejected ?? []).filter((r) => r !== normalized)
+                      },
+                      ainativeSubscriptionCache: {
+                        planId: "api",
+                        planName: "API",
+                        status: "active",
+                        isActive: true,
+                        price: 0,
+                        fetchedAt: Date.now()
+                      },
+                      ainativePlanCache: "AINative API"
+                    };
+                  });
+                  process.env.ANTHROPIC_API_KEY = key;
+                  logEvent("tengu_oauth_apikey_saved", {});
+                  setOAuthStatus({ state: "success" });
+                },
+                cursorOffset: apiKeyCursorOffset,
+                onChangeCursorOffset: setApiKeyCursorOffset,
+                columns: apiKeyColumns,
+                mask: "*"
+              }, undefined, false, undefined, this)
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedBox_default, {
+            marginTop: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
+              dimColor: true,
+              children: [
+                "Press ",
+                /* @__PURE__ */ jsx_dev_runtime71.jsxDEV(ThemedText, {
+                  bold: true,
+                  children: "Esc"
+                }, undefined, false, undefined, this),
+                " to go back."
+              ]
+            }, undefined, true, undefined, this)
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this);
+    }
     case "waiting_for_login": {
       let t1;
       if ($3[20] !== forcedMethodMessage) {
@@ -344990,6 +345141,7 @@ var init_ConsoleOAuthFlow = __esm(() => {
   init_notifier();
   init_oauth2();
   init_auth2();
+  init_config2();
   init_log3();
   init_settings2();
   init_select();
@@ -352371,7 +352523,7 @@ function StopHookSummaryMessage(t0) {
     stopReason
   } = message;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
   if ($3[0] !== hookInfos || $3[1] !== message.totalDurationMs) {
@@ -352462,7 +352614,7 @@ function StopHookSummaryMessage(t0) {
   } else {
     t4 = $3[16];
   }
-  const t5 = columns - 10;
+  const t5 = columns2 - 10;
   let t6;
   if ($3[17] !== hookCount) {
     t6 = /* @__PURE__ */ jsx_dev_runtime105.jsxDEV(ThemedText, {
@@ -352635,7 +352787,7 @@ function SystemTextMessageInner(t0) {
     dimColor
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const bg = useSelectedMessageBg();
   const t1 = addMargin ? 1 : 0;
@@ -352656,7 +352808,7 @@ function SystemTextMessageInner(t0) {
   } else {
     t2 = $3[3];
   }
-  const t3 = columns - 10;
+  const t3 = columns2 - 10;
   let t4;
   if ($3[4] !== content) {
     t4 = content.trim();
@@ -353345,7 +353497,7 @@ function UserToolRejectMessage(t0) {
     isTranscriptMode
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const [theme] = useTheme();
   if (!tool || !tool.renderToolUseRejectedMessage) {
@@ -353361,7 +353513,7 @@ function UserToolRejectMessage(t0) {
   const t1 = tool.inputSchema;
   let t2;
   let t3;
-  if ($3[1] !== columns || $3[2] !== input || $3[3] !== isTranscriptMode || $3[4] !== progressMessagesForMessage || $3[5] !== style || $3[6] !== theme || $3[7] !== tool || $3[8] !== tools || $3[9] !== verbose) {
+  if ($3[1] !== columns2 || $3[2] !== input || $3[3] !== isTranscriptMode || $3[4] !== progressMessagesForMessage || $3[5] !== style || $3[6] !== theme || $3[7] !== tool || $3[8] !== tools || $3[9] !== verbose) {
     t3 = Symbol.for("react.early_return_sentinel");
     bb0: {
       const parsedInput = t1.safeParse(input);
@@ -353377,7 +353529,7 @@ function UserToolRejectMessage(t0) {
         break bb0;
       }
       t2 = tool.renderToolUseRejectedMessage(parsedInput.data, {
-        columns,
+        columns: columns2,
         messages: [],
         tools,
         verbose,
@@ -353387,7 +353539,7 @@ function UserToolRejectMessage(t0) {
         isTranscriptMode
       }) ?? /* @__PURE__ */ jsx_dev_runtime110.jsxDEV(FallbackToolUseRejectedMessage, {}, undefined, false, undefined, this);
     }
-    $3[1] = columns;
+    $3[1] = columns2;
     $3[2] = input;
     $3[3] = isTranscriptMode;
     $3[4] = progressMessagesForMessage;
@@ -354040,7 +354192,7 @@ function UserMessage(t0) {
     isTranscriptMode
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   switch (param.type) {
     case "text": {
@@ -354083,7 +354235,7 @@ function UserMessage(t0) {
       return t2;
     }
     case "tool_result": {
-      const t1 = columns - 5;
+      const t1 = columns2 - 5;
       let t2;
       if ($3[10] !== isTranscriptMode || $3[11] !== lookups || $3[12] !== message || $3[13] !== param || $3[14] !== progressMessagesForMessage || $3[15] !== style || $3[16] !== t1 || $3[17] !== tools || $3[18] !== verbose) {
         t2 = /* @__PURE__ */ jsx_dev_runtime114.jsxDEV(UserToolResultMessage, {
@@ -377607,41 +377759,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)) {
@@ -378510,7 +378676,7 @@ function FileEditToolUseRejectedMessage(t0) {
     verbose
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
   if ($3[0] !== operation) {
@@ -378597,7 +378763,7 @@ function FileEditToolUseRejectedMessage(t0) {
     }
     const truncatedContent = t52;
     const t62 = truncatedContent || "(No content)";
-    const t72 = columns - 12;
+    const t72 = columns2 - 12;
     let t8;
     if ($3[16] !== file_path || $3[17] !== t62 || $3[18] !== t72) {
       t8 = /* @__PURE__ */ jsx_dev_runtime129.jsxDEV(HighlightedCode, {
@@ -378663,7 +378829,7 @@ function FileEditToolUseRejectedMessage(t0) {
     }
     return t52;
   }
-  const t5 = columns - 12;
+  const t5 = columns2 - 12;
   let t6;
   if ($3[29] !== fileContent || $3[30] !== file_path || $3[31] !== firstLine || $3[32] !== patch || $3[33] !== t5) {
     t6 = /* @__PURE__ */ jsx_dev_runtime129.jsxDEV(StructuredDiffList, {
@@ -378727,7 +378893,7 @@ function FileEditToolUpdatedMessage(t0) {
     previewHint
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const numAdditions = structuredPatch2.reduce(_temp211, 0);
   const numRemovals = structuredPatch2.reduce(_temp46, 0);
@@ -378819,7 +378985,7 @@ function FileEditToolUpdatedMessage(t0) {
   } else {
     t5 = $3[12];
   }
-  const t6 = columns - 12;
+  const t6 = columns2 - 12;
   let t7;
   if ($3[13] !== fileContent || $3[14] !== filePath || $3[15] !== firstLine || $3[16] !== structuredPatch2 || $3[17] !== t6) {
     t7 = /* @__PURE__ */ jsx_dev_runtime130.jsxDEV(StructuredDiffList, {
@@ -380098,7 +380264,7 @@ function FileWriteToolCreatedMessage(t0) {
     verbose
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const contentWithFallback = content || "(No content)";
   const numLines = countLines(content);
@@ -380162,7 +380328,7 @@ function FileWriteToolCreatedMessage(t0) {
   } else {
     t5 = $3[12];
   }
-  const t6 = columns - 12;
+  const t6 = columns2 - 12;
   let t7;
   if ($3[13] !== filePath || $3[14] !== t5 || $3[15] !== t6) {
     t7 = /* @__PURE__ */ jsx_dev_runtime132.jsxDEV(ThemedBox_default, {
@@ -418830,7 +418996,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("1775421369").getTime();
+  const buildTime = new Date("1775423471").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -438676,8 +438842,8 @@ class Cursor {
     this.selection = selection;
     this.offset = Math.max(0, Math.min(this.text.length, offset));
   }
-  static fromText(text2, columns, offset = 0, selection = 0) {
-    return new Cursor(new MeasuredText(text2, columns - 1), offset, selection);
+  static fromText(text2, columns2, offset = 0, selection = 0) {
+    return new Cursor(new MeasuredText(text2, columns2 - 1), offset, selection);
   }
   getViewportStartLine(maxVisibleLines) {
     if (maxVisibleLines === undefined || maxVisibleLines <= 0)
@@ -439332,8 +439498,8 @@ class MeasuredText {
   text;
   navigationCache;
   graphemeBoundaries;
-  constructor(text2, columns) {
-    this.columns = columns;
+  constructor(text2, columns2) {
+    this.columns = columns2;
     this.text = text2.normalize("NFC");
     this.navigationCache = new Map;
   }
@@ -439645,7 +439811,7 @@ function useTextInput({
   multiline = false,
   cursorChar,
   invert,
-  columns,
+  columns: columns2,
   onImagePaste: _onImagePaste,
   disableCursorMovementForUpDownKeys = false,
   disableEscapeDoublePress = false,
@@ -439661,7 +439827,7 @@ function useTextInput({
   }
   const offset = externalOffset;
   const setOffset = onOffsetChange;
-  const cursor = Cursor.fromText(originalValue, columns, offset);
+  const cursor = Cursor.fromText(originalValue, columns2, offset);
   const { addNotification, removeNotification } = useNotifications();
   const handleCtrlC = useDoublePress((show) => {
     onExitMessage?.(show, "Ctrl-C");
@@ -439748,7 +439914,7 @@ function useTextInput({
     const newText = before + text2 + after;
     const newOffset = start + text2.length;
     updateYankLength(text2.length);
-    return Cursor.fromText(newText, columns, newOffset);
+    return Cursor.fromText(newText, columns2, newOffset);
   }
   const handleCtrl = mapInput([
     ["a", () => cursor.startOfLine()],
@@ -440904,7 +441070,7 @@ var init_PromptInputFooterSuggestions = __esm(() => {
       maxColumnWidth,
       isSelected
     } = t0;
-    const columns = useTerminalSize().columns;
+    const columns2 = useTerminalSize().columns;
     const isUnified = isUnifiedSuggestion(item.id);
     if (isUnified) {
       let t12;
@@ -440932,7 +441098,7 @@ var init_PromptInputFooterSuggestions = __esm(() => {
           t23 = $3[3];
         }
         const descReserve = t23;
-        const maxPathLength = columns - 2 - 4 - separatorWidth - descReserve;
+        const maxPathLength = columns2 - 2 - 4 - separatorWidth - descReserve;
         let t32;
         if ($3[4] !== item.displayText || $3[5] !== maxPathLength) {
           t32 = truncatePathMiddle(item.displayText, maxPathLength);
@@ -440958,7 +441124,7 @@ var init_PromptInputFooterSuggestions = __esm(() => {
           displayText = item.displayText;
         }
       }
-      const availableWidth = columns - 2 - stringWidth(displayText) - separatorWidth - 4;
+      const availableWidth = columns2 - 2 - stringWidth(displayText) - separatorWidth - 4;
       let lineContent;
       if (item.description) {
         const maxDescLength = Math.max(0, availableWidth);
@@ -440993,7 +441159,7 @@ var init_PromptInputFooterSuggestions = __esm(() => {
       }
       return t22;
     }
-    const maxNameWidth = Math.floor(columns * 0.4);
+    const maxNameWidth = Math.floor(columns2 * 0.4);
     const displayTextWidth = Math.min(maxColumnWidth ?? stringWidth(item.displayText) + 5, maxNameWidth);
     const textColor_0 = item.color || (isSelected ? "suggestion" : undefined);
     const shouldDim = !isSelected;
@@ -441014,7 +441180,7 @@ var init_PromptInputFooterSuggestions = __esm(() => {
     const paddedDisplayText = displayText_0 + " ".repeat(Math.max(0, displayTextWidth - stringWidth(displayText_0)));
     const tagText = item.tag ? `[${item.tag}] ` : "";
     const tagWidth = stringWidth(tagText);
-    const descriptionWidth = Math.max(0, columns - displayTextWidth - tagWidth - 4);
+    const descriptionWidth = Math.max(0, columns2 - displayTextWidth - tagWidth - 4);
     let t1;
     if ($3[19] !== descriptionWidth || $3[20] !== item.description) {
       t1 = item.description ? truncateToWidth(item.description.replace(/\s+/g, " "), descriptionWidth) : "";
@@ -446094,7 +446260,7 @@ function ThemePicker(t0) {
   const [theme] = useTheme();
   const themeSetting = useThemeSetting();
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t6;
   if ($3[0] === Symbol.for("react.memo_cache_sentinel")) {
@@ -446321,7 +446487,7 @@ function ThemePicker(t0) {
     t20 = $3[34];
   }
   let t21;
-  if ($3[35] !== columns) {
+  if ($3[35] !== columns2) {
     t21 = /* @__PURE__ */ jsx_dev_runtime171.jsxDEV(ThemedBox_default, {
       flexDirection: "column",
       borderTop: true,
@@ -446335,10 +446501,10 @@ function ThemePicker(t0) {
         dim: false,
         filePath: "demo.js",
         firstLine: null,
-        width: columns
+        width: columns2
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
-    $3[35] = columns;
+    $3[35] = columns2;
     $3[36] = t21;
   } else {
     t21 = $3[36];
@@ -447823,13 +447989,13 @@ function useSearchInput({
   onExit: onExit2,
   onCancel,
   onExitUp,
-  columns,
+  columns: columns2,
   passthroughCtrlKeys = [],
   initialQuery = "",
   backspaceExitsOnEmpty = true
 }) {
   const { columns: terminalColumns } = useTerminalSize();
-  const effectiveColumns = columns ?? terminalColumns;
+  const effectiveColumns = columns2 ?? terminalColumns;
   const [query2, setQueryState] = import_react104.useState(initialQuery);
   const [cursorOffset, setCursorOffset] = import_react104.useState(initialQuery.length);
   const setQuery = import_react104.useCallback((q2) => {
@@ -450242,9 +450408,9 @@ function Usage() {
   const [error43, setError] = import_react107.useState(null);
   const [isLoading, setIsLoading] = import_react107.useState(true);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
-  const availableWidth = columns - 2;
+  const availableWidth = columns2 - 2;
   const maxWidth = Math.min(availableWidth, 80);
   const loadUtilization = React53.useCallback(async () => {
     setIsLoading(true);
@@ -451825,12 +451991,12 @@ function extractFirstFrame(output) {
     return output;
   return output.slice(contentStart, endIndex);
 }
-function renderToAnsiString(node, columns) {
+function renderToAnsiString(node, columns2) {
   return new Promise(async (resolve37) => {
     let output = "";
     const stream4 = new PassThrough3;
-    if (columns !== undefined) {
-      stream4.columns = columns;
+    if (columns2 !== undefined) {
+      stream4.columns = columns2;
     }
     stream4.on("data", (chunk) => {
       output += chunk.toString();
@@ -451845,8 +452011,8 @@ function renderToAnsiString(node, columns) {
     await resolve37(extractFirstFrame(output));
   });
 }
-async function renderToString(node, columns) {
-  const output = await renderToAnsiString(node, columns);
+async function renderToString(node, columns2) {
+  const output = await renderToAnsiString(node, columns2);
   return stripAnsi(output);
 }
 var import_compiler_runtime148, import_react109, jsx_dev_runtime186, SYNC_START = "\x1B[?2026h", SYNC_END = "\x1B[?2026l";
@@ -452365,7 +452531,7 @@ function DiffDetailView(t0) {
     isUntracked
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
   bb0: {
@@ -452668,7 +452834,7 @@ function DiffDetailView(t0) {
     t5 = $3[38];
   }
   let t6;
-  if ($3[39] !== columns || $3[40] !== fileContent || $3[41] !== filePath || $3[42] !== firstLine || $3[43] !== hunks) {
+  if ($3[39] !== columns2 || $3[40] !== fileContent || $3[41] !== filePath || $3[42] !== firstLine || $3[43] !== hunks) {
     t6 = hunks.length === 0 ? /* @__PURE__ */ jsx_dev_runtime188.jsxDEV(ThemedText, {
       dimColor: true,
       children: "No diff content"
@@ -452678,9 +452844,9 @@ function DiffDetailView(t0) {
       firstLine,
       fileContent,
       dim: false,
-      width: columns - 2 - 2
+      width: columns2 - 2 - 2
     }, index, false, undefined, this));
-    $3[39] = columns;
+    $3[39] = columns2;
     $3[40] = fileContent;
     $3[41] = filePath;
     $3[42] = firstLine;
@@ -452753,7 +452919,7 @@ function DiffFileList(t0) {
     selectedIndex
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
   bb0: {
@@ -452815,12 +452981,12 @@ function DiffFileList(t0) {
   let t2;
   let t3;
   let t4;
-  if ($3[6] !== columns || $3[7] !== endIndex || $3[8] !== files || $3[9] !== selectedIndex || $3[10] !== startIndex) {
+  if ($3[6] !== columns2 || $3[7] !== endIndex || $3[8] !== files || $3[9] !== selectedIndex || $3[10] !== startIndex) {
     const visibleFiles = files.slice(startIndex, endIndex);
     const hasMoreAbove = startIndex > 0;
     hasMoreBelow = endIndex < files.length;
     needsPagination = files.length > MAX_VISIBLE_FILES;
-    const maxPathWidth = Math.max(20, columns - 16 - 3 - 4);
+    const maxPathWidth = Math.max(20, columns2 - 16 - 3 - 4);
     T0 = ThemedBox_default;
     t2 = "column";
     if ($3[17] !== hasMoreAbove || $3[18] !== needsPagination || $3[19] !== startIndex) {
@@ -452850,7 +453016,7 @@ function DiffFileList(t0) {
       t52 = $3[24];
     }
     t4 = visibleFiles.map(t52);
-    $3[6] = columns;
+    $3[6] = columns2;
     $3[7] = endIndex;
     $3[8] = files;
     $3[9] = selectedIndex;
@@ -456684,7 +456850,7 @@ function Commands(t0) {
   const {
     commands,
     maxHeight,
-    columns,
+    columns: columns2,
     title,
     onCancel,
     emptyMessage
@@ -456693,7 +456859,7 @@ function Commands(t0) {
     headerFocused,
     focusHeader
   } = useTabHeaderFocus();
-  const maxWidth = Math.max(1, columns - 10);
+  const maxWidth = Math.max(1, columns2 - 10);
   const visibleCount = Math.max(1, Math.floor((maxHeight - 10) / 2));
   let t1;
   if ($3[0] !== commands || $3[1] !== maxWidth) {
@@ -457382,7 +457548,7 @@ function HelpV2(t0) {
   } = t0;
   const {
     rows,
-    columns
+    columns: columns2
   } = useTerminalSize();
   const maxHeight = Math.floor(rows / 2);
   const insideModal = useIsInsideModal();
@@ -457445,23 +457611,23 @@ function HelpV2(t0) {
     t4 = $3[8];
   }
   let tabs;
-  if ($3[9] !== antOnlyCommands || $3[10] !== builtinCommands || $3[11] !== close || $3[12] !== columns || $3[13] !== customCommands || $3[14] !== maxHeight) {
+  if ($3[9] !== antOnlyCommands || $3[10] !== builtinCommands || $3[11] !== close || $3[12] !== columns2 || $3[13] !== customCommands || $3[14] !== maxHeight) {
     tabs = [t4];
     let t52;
-    if ($3[16] !== builtinCommands || $3[17] !== close || $3[18] !== columns || $3[19] !== maxHeight) {
+    if ($3[16] !== builtinCommands || $3[17] !== close || $3[18] !== columns2 || $3[19] !== maxHeight) {
       t52 = /* @__PURE__ */ jsx_dev_runtime205.jsxDEV(Tab, {
         title: "commands",
         children: /* @__PURE__ */ jsx_dev_runtime205.jsxDEV(Commands, {
           commands: builtinCommands,
           maxHeight,
-          columns,
+          columns: columns2,
           title: "Browse default commands:",
           onCancel: close
         }, undefined, false, undefined, this)
       }, "commands", false, undefined, this);
       $3[16] = builtinCommands;
       $3[17] = close;
-      $3[18] = columns;
+      $3[18] = columns2;
       $3[19] = maxHeight;
       $3[20] = t52;
     } else {
@@ -457469,20 +457635,20 @@ function HelpV2(t0) {
     }
     tabs.push(t52);
     let t62;
-    if ($3[21] !== close || $3[22] !== columns || $3[23] !== customCommands || $3[24] !== maxHeight) {
+    if ($3[21] !== close || $3[22] !== columns2 || $3[23] !== customCommands || $3[24] !== maxHeight) {
       t62 = /* @__PURE__ */ jsx_dev_runtime205.jsxDEV(Tab, {
         title: "custom-commands",
         children: /* @__PURE__ */ jsx_dev_runtime205.jsxDEV(Commands, {
           commands: customCommands,
           maxHeight,
-          columns,
+          columns: columns2,
           title: "Browse custom commands:",
           emptyMessage: "No custom commands found",
           onCancel: close
         }, undefined, false, undefined, this)
       }, "custom", false, undefined, this);
       $3[21] = close;
-      $3[22] = columns;
+      $3[22] = columns2;
       $3[23] = customCommands;
       $3[24] = maxHeight;
       $3[25] = t62;
@@ -457494,7 +457660,7 @@ function HelpV2(t0) {
     $3[9] = antOnlyCommands;
     $3[10] = builtinCommands;
     $3[11] = close;
-    $3[12] = columns;
+    $3[12] = columns2;
     $3[13] = customCommands;
     $3[14] = maxHeight;
     $3[15] = tabs;
@@ -482756,24 +482922,24 @@ var init_transcriptSearch = __esm(() => {
 });
 
 // src/utils/logoV2Utils.ts
-function getLayoutMode(columns) {
-  if (columns >= 70)
+function getLayoutMode(columns2) {
+  if (columns2 >= 70)
     return "horizontal";
   return "compact";
 }
-function calculateLayoutDimensions(columns, layoutMode, optimalLeftWidth) {
+function calculateLayoutDimensions(columns2, layoutMode, optimalLeftWidth) {
   if (layoutMode === "horizontal") {
     const leftWidth = optimalLeftWidth;
     const usedSpace = BORDER_PADDING + CONTENT_PADDING + DIVIDER_WIDTH + leftWidth;
-    const availableForRight = columns - usedSpace;
+    const availableForRight = columns2 - usedSpace;
     let rightWidth = Math.max(30, availableForRight);
-    const totalWidth2 = Math.min(leftWidth + rightWidth + DIVIDER_WIDTH + CONTENT_PADDING, columns - BORDER_PADDING);
+    const totalWidth2 = Math.min(leftWidth + rightWidth + DIVIDER_WIDTH + CONTENT_PADDING, columns2 - BORDER_PADDING);
     if (totalWidth2 < leftWidth + rightWidth + DIVIDER_WIDTH + CONTENT_PADDING) {
       rightWidth = totalWidth2 - leftWidth - DIVIDER_WIDTH - CONTENT_PADDING;
     }
     return { leftWidth, rightWidth, totalWidth: totalWidth2 };
   }
-  const totalWidth = Math.min(columns - BORDER_PADDING, MAX_LEFT_WIDTH + 20);
+  const totalWidth = Math.min(columns2 - BORDER_PADDING, MAX_LEFT_WIDTH + 20);
   return {
     leftWidth: totalWidth,
     rightWidth: totalWidth,
@@ -483922,7 +484088,7 @@ var init_GuestPassesUpsell = __esm(() => {
 function CondensedLogo() {
   const $3 = import_compiler_runtime200.c(29);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const agent = useAppState(_temp114);
   const effortValue = useAppState(_temp243);
@@ -483972,7 +484138,7 @@ function CondensedLogo() {
     t3 = $3[6];
   }
   import_react145.useEffect(t2, t3);
-  const textWidth = Math.max(columns - 15, 20);
+  const textWidth = Math.max(columns2 - 15, 20);
   const truncatedVersion = truncate(version6, Math.max(textWidth - 13, 6));
   const effortSuffix = getEffortSuffix(model, effortValue);
   const {
@@ -484336,7 +484502,7 @@ function LogoV2() {
   const activities = getRecentActivitySync();
   const username = getGlobalConfig().oauthAccount?.displayName ?? "";
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t0;
   if ($3[0] === Symbol.for("react.memo_cache_sentinel")) {
@@ -484596,13 +484762,13 @@ function LogoV2() {
     }
     return t232;
   }
-  const layoutMode = getLayoutMode(columns);
+  const layoutMode = getLayoutMode(columns2);
   const userTheme = resolveThemeSetting(getGlobalConfig().theme);
   const borderTitle = ` ${color("claude", userTheme)("Cody CLI")} ${color("inactive", userTheme)(`v${version6}`)} `;
   const compactBorderTitle = color("claude", userTheme)(" Cody CLI ");
   if (layoutMode === "compact") {
     let welcomeMessage = formatWelcomeMessage(username);
-    if (stringWidth(welcomeMessage) > columns - 4) {
+    if (stringWidth(welcomeMessage) > columns2 - 4) {
       let t113;
       if ($3[31] === Symbol.for("react.memo_cache_sentinel")) {
         t113 = formatWelcomeMessage(null);
@@ -484612,7 +484778,7 @@ function LogoV2() {
       }
       welcomeMessage = t113;
     }
-    const cwdAvailableWidth = agentName ? columns - 4 - 1 - stringWidth(agentName) - 3 : columns - 4;
+    const cwdAvailableWidth = agentName ? columns2 - 4 - 1 - stringWidth(agentName) - 3 : columns2 - 4;
     const truncatedCwd = truncatePath(cwd2, Math.max(cwdAvailableWidth, 10));
     let t112;
     if ($3[32] !== compactBorderTitle) {
@@ -484700,7 +484866,7 @@ function LogoV2() {
             paddingX: 1,
             paddingY: 1,
             alignItems: "center",
-            width: columns,
+            width: columns2,
             children: [
               /* @__PURE__ */ jsx_dev_runtime257.jsxDEV(ThemedText, {
                 bold: true,
@@ -484737,7 +484903,7 @@ function LogoV2() {
   const {
     leftWidth,
     rightWidth
-  } = calculateLayoutDimensions(columns, layoutMode, optimalLeftWidth);
+  } = calculateLayoutDimensions(columns2, layoutMode, optimalLeftWidth);
   const T0 = OffscreenFreeze;
   const T1 = ThemedBox_default;
   const t11 = "column";
@@ -485275,7 +485441,7 @@ function MessageRowImpl(t0) {
     onOpenRateLimitOptions,
     lastThinkingBlockId,
     latestBashOutputUUID,
-    columns,
+    columns: columns2,
     isLoading,
     lookups
   } = t0;
@@ -485396,7 +485562,7 @@ function MessageRowImpl(t0) {
   }
   const hasMetadata = t5;
   const t6 = !hasMetadata;
-  const t7 = hasMetadata ? undefined : columns;
+  const t7 = hasMetadata ? undefined : columns2;
   let t8;
   if ($3[37] !== commands || $3[38] !== inProgressToolUseIDs || $3[39] !== isActiveCollapsedGroup || $3[40] !== isStatic || $3[41] !== isTranscriptMode || $3[42] !== isUserContinuation || $3[43] !== lastThinkingBlockId || $3[44] !== latestBashOutputUUID || $3[45] !== lookups || $3[46] !== msg || $3[47] !== onOpenRateLimitOptions || $3[48] !== progressMessagesForMessage || $3[49] !== shouldAnimate || $3[50] !== t6 || $3[51] !== t7 || $3[52] !== tools || $3[53] !== verbose) {
     t8 = /* @__PURE__ */ jsx_dev_runtime260.jsxDEV(Message, {
@@ -485479,10 +485645,10 @@ function MessageRowImpl(t0) {
     t9 = $3[59];
   }
   let t10;
-  if ($3[60] !== columns || $3[61] !== messageEl || $3[62] !== t9) {
+  if ($3[60] !== columns2 || $3[61] !== messageEl || $3[62] !== t9) {
     t10 = /* @__PURE__ */ jsx_dev_runtime260.jsxDEV(OffscreenFreeze, {
       children: /* @__PURE__ */ jsx_dev_runtime260.jsxDEV(ThemedBox_default, {
-        width: columns,
+        width: columns2,
         flexDirection: "column",
         children: [
           t9,
@@ -485490,7 +485656,7 @@ function MessageRowImpl(t0) {
         ]
       }, undefined, true, undefined, this)
     }, undefined, false, undefined, this);
-    $3[60] = columns;
+    $3[60] = columns2;
     $3[61] = messageEl;
     $3[62] = t9;
     $3[63] = t10;
@@ -485964,7 +486130,7 @@ var init_StatusNotices = __esm(() => {
 });
 
 // src/hooks/useVirtualScroll.ts
-function useVirtualScroll(scrollRef, itemKeys, columns) {
+function useVirtualScroll(scrollRef, itemKeys, columns2) {
   const heightCache = import_react152.useRef(new Map);
   const offsetVersionRef = import_react152.useRef(0);
   const lastScrollTopRef = import_react152.useRef(0);
@@ -485975,13 +486141,13 @@ function useVirtualScroll(scrollRef, itemKeys, columns) {
   });
   const itemRefs = import_react152.useRef(new Map);
   const refCache = import_react152.useRef(new Map);
-  const prevColumns = import_react152.useRef(columns);
+  const prevColumns = import_react152.useRef(columns2);
   const skipMeasurementRef = import_react152.useRef(false);
   const prevRangeRef = import_react152.useRef(null);
   const freezeRendersRef = import_react152.useRef(0);
-  if (prevColumns.current !== columns) {
-    const ratio = prevColumns.current / columns;
-    prevColumns.current = columns;
+  if (prevColumns.current !== columns2) {
+    const ratio = prevColumns.current / columns2;
+    prevColumns.current = columns2;
     for (const [k2, h2] of heightCache.current) {
       heightCache.current.set(k2, Math.max(1, Math.round(h2 * ratio)));
     }
@@ -486450,7 +486616,7 @@ function FullscreenLayout(t0) {
   const newMessageCount = t3 === undefined ? 0 : t3;
   const {
     rows: terminalRows,
-    columns
+    columns: columns2
   } = useTerminalSize();
   const [stickyPrompt, setStickyPrompt] = import_react154.useState(null);
   let t4;
@@ -486631,11 +486797,11 @@ function FullscreenLayout(t0) {
       t17 = $3[32];
     }
     let t18;
-    if ($3[33] !== columns || $3[34] !== modal || $3[35] !== modalScrollRef || $3[36] !== terminalRows) {
+    if ($3[33] !== columns2 || $3[34] !== modal || $3[35] !== modalScrollRef || $3[36] !== terminalRows) {
       t18 = modal != null && /* @__PURE__ */ jsx_dev_runtime264.jsxDEV(ModalContext, {
         value: {
           rows: terminalRows - MODAL_TRANSCRIPT_PEEK - 1,
-          columns: columns - 4,
+          columns: columns2 - 4,
           scrollRef: modalScrollRef ?? null
         },
         children: /* @__PURE__ */ jsx_dev_runtime264.jsxDEV(ThemedBox_default, {
@@ -486652,7 +486818,7 @@ function FullscreenLayout(t0) {
               flexShrink: 0,
               children: /* @__PURE__ */ jsx_dev_runtime264.jsxDEV(ThemedText, {
                 color: "permission",
-                children: "▔".repeat(columns)
+                children: "▔".repeat(columns2)
               }, undefined, false, undefined, this)
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime264.jsxDEV(ThemedBox_default, {
@@ -486665,7 +486831,7 @@ function FullscreenLayout(t0) {
           ]
         }, undefined, true, undefined, this)
       }, undefined, false, undefined, this);
-      $3[33] = columns;
+      $3[33] = columns2;
       $3[34] = modal;
       $3[35] = modalScrollRef;
       $3[36] = terminalRows;
@@ -487083,7 +487249,7 @@ function VirtualItem(t0) {
 function VirtualMessageList({
   messages,
   scrollRef,
-  columns,
+  columns: columns2,
   itemKey,
   renderItem,
   onItemClick,
@@ -487123,7 +487289,7 @@ function VirtualMessageList({
     getItemElement,
     getItemHeight,
     scrollToIndex
-  } = useVirtualScroll(scrollRef, keys2, columns);
+  } = useVirtualScroll(scrollRef, keys2, columns2);
   const [start, end] = range;
   const isVisible = import_react155.useCallback((i3) => {
     const h2 = getItemHeight(i3);
@@ -487852,7 +488018,7 @@ var import_compiler_runtime210, React83, import_react156, jsx_dev_runtime266, Lo
   renderRange
 }) => {
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const toggleShowAllShortcut = useShortcutDisplay("transcript:toggleShowAll", "Transcript", "Ctrl+E");
   const normalizedMessages = import_react156.useMemo(() => normalizeMessages(messages).filter(isNotEmptyMessage), [messages]);
@@ -488033,7 +488199,7 @@ var import_compiler_runtime210, React83, import_react156, jsx_dev_runtime266, Lo
       onOpenRateLimitOptions,
       lastThinkingBlockId,
       latestBashOutputUUID,
-      columns,
+      columns: columns2,
       isLoading,
       lookups: lookups_0
     }, k_0, false, undefined, this);
@@ -488046,7 +488212,7 @@ var import_compiler_runtime210, React83, import_react156, jsx_dev_runtime266, Lo
         marginTop: 1,
         children: /* @__PURE__ */ jsx_dev_runtime266.jsxDEV(Divider, {
           title: `${unseenDivider.count} new ${plural(unseenDivider.count, "message")}`,
-          width: columns,
+          width: columns2,
           color: "inactive"
         }, undefined, false, undefined, this)
       }, "unseen-divider", false, undefined, this), wrapped];
@@ -488080,18 +488246,18 @@ var import_compiler_runtime210, React83, import_react156, jsx_dev_runtime266, Lo
       }, undefined, false, undefined, this),
       hasTruncatedMessages_0 && /* @__PURE__ */ jsx_dev_runtime266.jsxDEV(Divider, {
         title: `${toggleShowAllShortcut} to show ${source_default.bold(hiddenMessageCount_0)} previous messages`,
-        width: columns
+        width: columns2
       }, undefined, false, undefined, this),
       isTranscriptMode && showAllInTranscript && hiddenMessageCount_0 > 0 && !disableRenderCap && /* @__PURE__ */ jsx_dev_runtime266.jsxDEV(Divider, {
         title: `${toggleShowAllShortcut} to hide ${source_default.bold(hiddenMessageCount_0)} previous messages`,
-        width: columns
+        width: columns2
       }, undefined, false, undefined, this),
       virtualScrollRuntimeGate ? /* @__PURE__ */ jsx_dev_runtime266.jsxDEV(InVirtualListContext.Provider, {
         value: true,
         children: /* @__PURE__ */ jsx_dev_runtime266.jsxDEV(VirtualMessageList, {
           messages: renderableMessages,
           scrollRef,
-          columns,
+          columns: columns2,
           itemKey: messageKey,
           renderItem: renderMessageRow,
           onItemClick,
@@ -489028,7 +489194,7 @@ function LogSelector(t0) {
   const maxHeight = t1 === undefined ? Infinity : t1;
   const showAllProjects = t2 === undefined ? false : t2;
   const terminalSize = useTerminalSize();
-  const columns = forceWidth === undefined ? terminalSize.columns : forceWidth;
+  const columns2 = forceWidth === undefined ? terminalSize.columns : forceWidth;
   const exitState = useExitOnCtrlCDWithKeybindings(onCancel);
   const isTerminalFocused = useTerminalFocus();
   let t3;
@@ -489428,7 +489594,7 @@ function LogSelector(t0) {
     t28 = filteredLogs;
   }
   const displayedLogs = t28;
-  const maxLabelWidth = Math.max(30, columns - 4);
+  const maxLabelWidth = Math.max(30, columns2 - 4);
   let t29;
   bb2: {
     if (!isResumeWithRenameEnabled) {
@@ -490145,11 +490311,11 @@ function LogSelector(t0) {
     t59 = $3[165];
   }
   let t60;
-  if ($3[166] !== columns || $3[167] !== displayedLogs.length || $3[168] !== effectiveTagIndex || $3[169] !== focusedIndex || $3[170] !== hasTags || $3[171] !== showAllProjects || $3[172] !== tagTabs || $3[173] !== viewMode || $3[174] !== visibleCount) {
+  if ($3[166] !== columns2 || $3[167] !== displayedLogs.length || $3[168] !== effectiveTagIndex || $3[169] !== focusedIndex || $3[170] !== hasTags || $3[171] !== showAllProjects || $3[172] !== tagTabs || $3[173] !== viewMode || $3[174] !== visibleCount) {
     t60 = hasTags ? /* @__PURE__ */ jsx_dev_runtime270.jsxDEV(TagTabs, {
       tabs: tagTabs,
       selectedIndex: effectiveTagIndex,
-      availableWidth: columns,
+      availableWidth: columns2,
       showAllProjects
     }, undefined, false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime270.jsxDEV(ThemedBox_default, {
       flexShrink: 0,
@@ -490172,7 +490338,7 @@ function LogSelector(t0) {
         ]
       }, undefined, true, undefined, this)
     }, undefined, false, undefined, this);
-    $3[166] = columns;
+    $3[166] = columns2;
     $3[167] = displayedLogs.length;
     $3[168] = effectiveTagIndex;
     $3[169] = focusedIndex;
@@ -490316,7 +490482,7 @@ function LogSelector(t0) {
     t69 = $3[201];
   }
   let t70;
-  if ($3[202] !== agenticSearchState.status || $3[203] !== branchFilterEnabled || $3[204] !== columns || $3[205] !== displayedLogs || $3[206] !== expandedGroupSessionIds || $3[207] !== flatOptions || $3[208] !== focusedLog || $3[209] !== focusedNode?.id || $3[210] !== handleFlatOptionsSelectFocus || $3[211] !== handleRenameSubmit || $3[212] !== handleTreeSelectFocus || $3[213] !== isAgenticSearchOptionFocused || $3[214] !== onCancel || $3[215] !== onSelect || $3[216] !== renameCursorOffset || $3[217] !== renameValue || $3[218] !== treeNodes || $3[219] !== viewMode || $3[220] !== visibleCount) {
+  if ($3[202] !== agenticSearchState.status || $3[203] !== branchFilterEnabled || $3[204] !== columns2 || $3[205] !== displayedLogs || $3[206] !== expandedGroupSessionIds || $3[207] !== flatOptions || $3[208] !== focusedLog || $3[209] !== focusedNode?.id || $3[210] !== handleFlatOptionsSelectFocus || $3[211] !== handleRenameSubmit || $3[212] !== handleTreeSelectFocus || $3[213] !== isAgenticSearchOptionFocused || $3[214] !== onCancel || $3[215] !== onSelect || $3[216] !== renameCursorOffset || $3[217] !== renameValue || $3[218] !== treeNodes || $3[219] !== viewMode || $3[220] !== visibleCount) {
     t70 = agenticSearchState.status === "searching" ? null : viewMode === "rename" && focusedLog ? /* @__PURE__ */ jsx_dev_runtime270.jsxDEV(ThemedBox_default, {
       paddingLeft: 2,
       flexDirection: "column",
@@ -490332,7 +490498,7 @@ function LogSelector(t0) {
             onChange: setRenameValue,
             onSubmit: handleRenameSubmit,
             placeholder: getLogDisplayTitle(focusedLog, "Enter new session name"),
-            columns,
+            columns: columns2,
             cursorOffset: renameCursorOffset,
             onChangeCursorOffset: setRenameCursorOffset,
             showCursor: true
@@ -490395,7 +490561,7 @@ function LogSelector(t0) {
     }, undefined, false, undefined, this);
     $3[202] = agenticSearchState.status;
     $3[203] = branchFilterEnabled;
-    $3[204] = columns;
+    $3[204] = columns2;
     $3[205] = displayedLogs;
     $3[206] = expandedGroupSessionIds;
     $3[207] = flatOptions;
@@ -496452,7 +496618,7 @@ function ShellDetailDialog(t0) {
     onBack
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
   if ($3[0] !== shell) {
@@ -496740,7 +496906,7 @@ function ShellDetailDialog(t0) {
     t23 = $3[44];
   }
   let t24;
-  if ($3[45] !== columns || $3[46] !== deferredOutputPromise) {
+  if ($3[45] !== columns2 || $3[46] !== deferredOutputPromise) {
     t24 = /* @__PURE__ */ jsx_dev_runtime286.jsxDEV(ThemedBox_default, {
       flexDirection: "column",
       children: [
@@ -496749,12 +496915,12 @@ function ShellDetailDialog(t0) {
           fallback: t23,
           children: /* @__PURE__ */ jsx_dev_runtime286.jsxDEV(ShellOutputContent, {
             outputPromise: deferredOutputPromise,
-            columns
+            columns: columns2
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this)
       ]
     }, undefined, true, undefined, this);
-    $3[45] = columns;
+    $3[45] = columns2;
     $3[46] = deferredOutputPromise;
     $3[47] = t24;
   } else {
@@ -496805,7 +496971,7 @@ function ShellOutputContent(t0) {
   const $3 = import_compiler_runtime225.c(19);
   const {
     outputPromise,
-    columns
+    columns: columns2
   } = t0;
   const {
     content,
@@ -496854,7 +497020,7 @@ function ShellOutputContent(t0) {
     isIncomplete = $3[3];
     rendered = $3[4];
   }
-  const t1 = columns - 6;
+  const t1 = columns2 - 6;
   let t2;
   if ($3[5] !== rendered) {
     t2 = rendered.map(_temp253);
@@ -497552,9 +497718,9 @@ function Item(t0) {
     isSelected
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
-  const maxActivityWidth = Math.max(30, columns - 26);
+  const maxActivityWidth = Math.max(30, columns2 - 26);
   let t1;
   if ($3[0] === Symbol.for("react.memo_cache_sentinel")) {
     t1 = isCoordinatorMode();
@@ -499152,9 +499318,9 @@ function PermissionRuleInput(t0) {
   }
   useKeybinding("confirm:no", onCancel, t1);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
-  const textInputColumns = columns - 6;
+  const textInputColumns = columns2 - 6;
   let t2;
   if ($3[1] !== onSubmit || $3[2] !== ruleBehavior) {
     t2 = (value) => {
@@ -511926,7 +512092,7 @@ var init_bridge_kick = __esm(() => {
 var call56 = async () => {
   return {
     type: "text",
-    value: `${"0.7.15"} (built ${"1775421369"})`
+    value: `${"0.7.15"} (built ${"1775423471"})`
   };
 }, version6, version_default;
 var init_version = __esm(() => {
@@ -514481,7 +514647,7 @@ function ExportDialog({
   const [cursorOffset, setCursorOffset] = import_react189.useState(defaultFilename.length);
   const [showFilenameInput, setShowFilenameInput] = import_react189.useState(false);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const handleGoBack = import_react189.useCallback(() => {
     setShowFilenameInput(false);
@@ -514607,7 +514773,7 @@ function ExportDialog({
               onSubmit: handleFilenameSubmit,
               focus: true,
               showCursor: true,
-              columns,
+              columns: columns2,
               cursorOffset,
               onChangeCursorOffset: setCursorOffset
             }, undefined, false, undefined, this)
@@ -514664,7 +514830,7 @@ function normalizedUpperBound(m2) {
   return Array.isArray(c6) ? c6.length : 1;
 }
 async function streamRenderedMessages(messages, tools, sink2, {
-  columns,
+  columns: columns2,
   verbose = false,
   chunkSize = 40,
   onProgress
@@ -514688,7 +514854,7 @@ async function streamRenderedMessages(messages, tools, sink2, {
         renderRange: range
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this)
-  }, undefined, false, undefined, this), columns);
+  }, undefined, false, undefined, this), columns2);
   let ceiling = chunkSize;
   for (const m2 of messages)
     ceiling += normalizedUpperBound(m2);
@@ -514700,10 +514866,10 @@ async function streamRenderedMessages(messages, tools, sink2, {
     onProgress?.(offset + chunkSize);
   }
 }
-async function renderMessagesToPlainText(messages, tools = [], columns) {
+async function renderMessagesToPlainText(messages, tools = [], columns2) {
   const parts = [];
   await streamRenderedMessages(messages, tools, (chunk) => void parts.push(stripAnsi(chunk)), {
-    columns
+    columns: columns2
   });
   return parts.join("");
 }
@@ -539228,7 +539394,7 @@ function UserMessageOption(t0) {
     paddingRight
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   if (isCurrent) {
     let t12;
@@ -539260,7 +539426,7 @@ function UserMessageOption(t0) {
   let t4;
   let t5;
   let t6;
-  if ($3[3] !== color3 || $3[4] !== columns || $3[5] !== content || $3[6] !== dimColor || $3[7] !== lastBlock || $3[8] !== paddingRight) {
+  if ($3[3] !== color3 || $3[4] !== columns2 || $3[5] !== content || $3[6] !== dimColor || $3[7] !== lastBlock || $3[8] !== paddingRight) {
     t6 = Symbol.for("react.early_return_sentinel");
     bb0: {
       const rawMessageText = typeof content === "string" ? content.trim() : lastBlock && isTextBlock2(lastBlock) ? lastBlock.text.trim() : "(no prompt)";
@@ -539363,12 +539529,12 @@ function UserMessageOption(t0) {
       T0 = ThemedText;
       t1 = color3;
       t2 = dimColor;
-      t3 = paddingRight ? truncate(messageText, columns - paddingRight, true) : messageText.slice(0, 500).split(`
+      t3 = paddingRight ? truncate(messageText, columns2 - paddingRight, true) : messageText.slice(0, 500).split(`
 `).slice(0, 4).join(`
 `);
     }
     $3[3] = color3;
-    $3[4] = columns;
+    $3[4] = columns2;
     $3[5] = content;
     $3[6] = dimColor;
     $3[7] = lastBlock;
@@ -539895,14 +540061,14 @@ function QuestionNavigationBar(t0) {
   } = t0;
   const hideSubmitTab = t1 === undefined ? false : t1;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t2;
-  if ($3[0] !== columns || $3[1] !== currentQuestionIndex || $3[2] !== hideSubmitTab || $3[3] !== questions) {
+  if ($3[0] !== columns2 || $3[1] !== currentQuestionIndex || $3[2] !== hideSubmitTab || $3[3] !== questions) {
     bb0: {
       const submitText = hideSubmitTab ? "" : ` ${figures_default.tick} Submit `;
       const fixedWidth = stringWidth("← ") + stringWidth(" →") + stringWidth(submitText);
-      const availableForTabs = columns - fixedWidth;
+      const availableForTabs = columns2 - fixedWidth;
       if (availableForTabs <= 0) {
         let t33;
         if ($3[5] !== currentQuestionIndex || $3[6] !== questions) {
@@ -539960,7 +540126,7 @@ function QuestionNavigationBar(t0) {
       }
       t2 = tabHeaders.map(t32);
     }
-    $3[0] = columns;
+    $3[0] = columns2;
     $3[1] = currentQuestionIndex;
     $3[2] = hideSubmitTab;
     $3[3] = questions;
@@ -540288,9 +540454,9 @@ function PreviewQuestionView({
   const LEFT_PANEL_WIDTH = 30;
   const GAP = 4;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
-  const previewMaxWidth = columns - LEFT_PANEL_WIDTH - GAP;
+  const previewMaxWidth = columns2 - LEFT_PANEL_WIDTH - GAP;
   const PREVIEW_OVERHEAD = 11;
   const previewMaxLines = import_react203.useMemo(() => {
     return minContentHeight ? Math.max(1, minContentHeight - PREVIEW_OVERHEAD) : undefined;
@@ -544178,21 +544344,21 @@ function DiffBody(t0) {
     fileContent
   } = import_react209.use(promise3);
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
-  if ($3[0] !== columns || $3[1] !== fileContent || $3[2] !== file_path || $3[3] !== firstLine || $3[4] !== patch) {
+  if ($3[0] !== columns2 || $3[1] !== fileContent || $3[2] !== file_path || $3[3] !== firstLine || $3[4] !== patch) {
     t1 = /* @__PURE__ */ jsx_dev_runtime379.jsxDEV(DiffFrame, {
       children: /* @__PURE__ */ jsx_dev_runtime379.jsxDEV(StructuredDiffList, {
         hunks: patch,
         dim: false,
-        width: columns,
+        width: columns2,
         filePath: file_path,
         firstLine,
         fileContent
       }, undefined, false, undefined, this)
     }, undefined, false, undefined, this);
-    $3[0] = columns;
+    $3[0] = columns2;
     $3[1] = fileContent;
     $3[2] = file_path;
     $3[3] = firstLine;
@@ -548454,7 +548620,7 @@ function FileWriteToolDiff(t0) {
     oldContent
   } = t0;
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   let t1;
   bb0: {
@@ -548494,19 +548660,19 @@ function FileWriteToolDiff(t0) {
   }
   const firstLine = t2;
   let t3;
-  if ($3[6] !== columns || $3[7] !== content || $3[8] !== file_path || $3[9] !== firstLine || $3[10] !== hunks || $3[11] !== oldContent) {
+  if ($3[6] !== columns2 || $3[7] !== content || $3[8] !== file_path || $3[9] !== firstLine || $3[10] !== hunks || $3[11] !== oldContent) {
     t3 = hunks ? intersperse(hunks.map((_2) => /* @__PURE__ */ jsx_dev_runtime392.jsxDEV(StructuredDiff, {
       patch: _2,
       dim: false,
       filePath: file_path,
       firstLine,
       fileContent: oldContent,
-      width: columns - 2
+      width: columns2 - 2
     }, _2.newStart, false, undefined, this)), _temp180) : /* @__PURE__ */ jsx_dev_runtime392.jsxDEV(HighlightedCode, {
       code: content || "(No content)",
       filePath: file_path
     }, undefined, false, undefined, this);
-    $3[6] = columns;
+    $3[6] = columns2;
     $3[7] = content;
     $3[8] = file_path;
     $3[9] = firstLine;
@@ -551117,7 +551283,7 @@ function ElicitationFormDialog({
     resolveAbortRef.current.clear();
   }, []);
   const {
-    columns,
+    columns: columns2,
     rows
   } = useTerminalSize();
   const currentField = currentFieldIndex !== undefined ? schemaFields[currentFieldIndex] : undefined;
@@ -551790,7 +551956,7 @@ function ElicitationFormDialog({
                 onChange: handleTextInputChange,
                 onSubmit: handleTextInputSubmit,
                 placeholder: `Type something…`,
-                columns: Math.min(columns - 20, 60),
+                columns: Math.min(columns2 - 20, 60),
                 cursorOffset: textInputCursorOffset,
                 onChangeCursorOffset: setTextInputCursorOffset,
                 focus: true,
@@ -561843,7 +562009,7 @@ function BackgroundTaskStatus(t0) {
   const isLeaderIdle = t2 === undefined ? false : t2;
   const setAppState = useSetAppState();
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const tasks2 = useAppState(_temp195);
   const viewingAgentTaskId = useAppState(_temp281);
@@ -561919,7 +562085,7 @@ function BackgroundTaskStatus(t0) {
       t82 = $3[14];
     }
     const viewedIdx = t82;
-    const availableWidth = Math.max(20, columns - 20 - 4);
+    const availableWidth = Math.max(20, columns2 - 20 - 4);
     const t92 = selectedIdx >= 0 ? selectedIdx : 0;
     let t102;
     if ($3[15] !== availableWidth || $3[16] !== pillWidths || $3[17] !== t92) {
@@ -562816,7 +562982,7 @@ function ModeIndicator({
   onOpenTasksDialog
 }) {
   const {
-    columns
+    columns: columns2
   } = useTerminalSize();
   const modeCycleShortcut = useShortcutDisplay("chat:cycleMode", "Chat", "shift+tab");
   const tasks2 = useAppState((s) => s.tasks);
@@ -562864,7 +563030,7 @@ function ModeIndicator({
   const isViewingCompletedTeammate = isViewingTeammate && viewedTask != null && viewedTask.status !== "running";
   const hasBackgroundTasks = runningTaskCount > 0 || isViewingTeammate;
   const primaryItemCount = (isCoordinator || hasActiveMode ? 1 : 0) + (hasBackgroundTasks ? 1 : 0) + (hasTeams ? 1 : 0);
-  const shouldShowPrStatus = isPrStatusEnabled() && prStatus.number !== null && prStatus.reviewState !== null && prStatus.url !== null && primaryItemCount < 2 && (primaryItemCount === 0 || columns >= 80);
+  const shouldShowPrStatus = isPrStatusEnabled() && prStatus.number !== null && prStatus.reviewState !== null && prStatus.url !== null && primaryItemCount < 2 && (primaryItemCount === 0 || columns2 >= 80);
   const shouldShowModeHint = primaryItemCount < 2;
   const hasInProcessTeammates = !showSpinnerTree && hasBackgroundTasks && Object.values(tasks2).some((t_1) => t_1.type === "in_process_teammate");
   const hasTeammatePills = hasInProcessTeammates || !showSpinnerTree && isViewingTeammate;
@@ -563148,13 +563314,13 @@ function PromptInputFooter({
 }) {
   const settings = useSettings();
   const {
-    columns,
+    columns: columns2,
     rows
   } = useTerminalSize();
   const messagesRef = import_react255.useRef(messages);
   messagesRef.current = messages;
   const lastAssistantMessageId = import_react255.useMemo(() => getLastAssistantMessageId(messages), [messages]);
-  const isNarrow = columns < 80;
+  const isNarrow = columns2 < 80;
   const isFullscreen = isFullscreenEnvEnabled();
   const isShort = isFullscreen && rows < 24;
   const coordinatorTaskCount = useCoordinatorTaskCount();
@@ -565215,10 +565381,10 @@ function PromptInput({
   useBuddyNotification();
   const companionSpeaking = false;
   const {
-    columns,
+    columns: columns2,
     rows
   } = useTerminalSize();
-  const textInputColumns = columns - 3 - companionReservedColumns(columns, companionSpeaking);
+  const textInputColumns = columns2 - 3 - companionReservedColumns(columns2, companionSpeaking);
   const maxVisibleLines = isFullscreenEnvEnabled() ? Math.max(MIN_INPUT_VIEWPORT_LINES, Math.floor(rows / 2) - PROMPT_FOOTER_LINES) : undefined;
   const handleInputClick = import_react260.useCallback((e) => {
     if (!input || isSearchingHistory)
@@ -565490,7 +565656,7 @@ function PromptInput({
             color: swarmBanner.bgColor,
             children: swarmBanner.text ? /* @__PURE__ */ jsx_dev_runtime436.jsxDEV(jsx_dev_runtime436.Fragment, {
               children: [
-                "─".repeat(Math.max(0, columns - stringWidth(swarmBanner.text) - 4)),
+                "─".repeat(Math.max(0, columns2 - stringWidth(swarmBanner.text) - 4)),
                 /* @__PURE__ */ jsx_dev_runtime436.jsxDEV(ThemedText, {
                   backgroundColor: swarmBanner.bgColor,
                   color: "inverseText",
@@ -565502,7 +565668,7 @@ function PromptInput({
                 }, undefined, true, undefined, this),
                 "──"
               ]
-            }, undefined, true, undefined, this) : "─".repeat(columns)
+            }, undefined, true, undefined, this) : "─".repeat(columns2)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime436.jsxDEV(ThemedBox_default, {
             flexDirection: "row",
@@ -565524,7 +565690,7 @@ function PromptInput({
           }, undefined, true, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime436.jsxDEV(ThemedText, {
             color: swarmBanner.bgColor,
-            children: "─".repeat(columns)
+            children: "─".repeat(columns2)
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this) : /* @__PURE__ */ jsx_dev_runtime436.jsxDEV(ThemedBox_default, {