qwenproxy-cli 1.0.13 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwenproxy-cli",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "High-performance OpenAI & Anthropic compatible API gateway for Qwen with multi-account rotation, interactive TUI, and resilient tool calling.",
   "main": "src/index.ts",
   "bin": {
@@ -24,8 +24,8 @@
     "reset": "npx tsx src/reset-cooldowns.ts",
     "purge": "npx tsx src/delete-chats.ts",
     "test": "npm run test:mock && npm run test:live",
-    "test:mock": "tsx --test --test-concurrency=1 --env-file=.env.test src/tests/account-concurrency.test.ts src/tests/concurrency-latest-wins.test.ts src/tests/mutex.test.ts src/tests/context-truncation.test.ts src/tests/streaming-thinking-summary.test.ts src/tests/tool-call-guard.test.ts src/tests/utils-logger-full.test.ts src/tests/logger-toolcall-errors.test.ts src/tests/logger-toolcall-disabled.test.ts src/tests/utils-json-full.test.ts src/tests/utils-session-guard-full.test.ts src/tests/core-logic-full.test.ts src/tests/core-logic-accounts.test.ts src/tests/chat-validation-full.test.ts src/tests/chat-logic-full.test.ts src/tests/account-stickiness.test.ts src/tests/accounts-security.test.ts src/tests/advanced.test.ts src/tests/auth-playwright.test.ts src/tests/captcha-solver.test.ts src/tests/cache-scan-regex.test.ts src/tests/chat-cleanup.test.ts src/tests/chromium-args.test.ts src/tests/config-current.test.ts src/tests/context-meter.test.ts src/tests/concurrency.test.ts src/tests/delta.test.ts src/tests/fingerprint.test.ts src/tests/human-behavior.test.ts src/tests/index.test.ts src/tests/json-recovery.test.ts src/tests/jsonFix.test.ts src/tests/memory-cache.test.ts src/tests/model-alias.test.ts src/tests/model-registry-thinking.test.ts src/tests/models-endpoint.test.ts src/tests/multimodal.test.ts src/tests/oss-upload.test.ts src/tests/parser.test.ts src/tests/personalization-flow.test.ts src/tests/personalization-required.test.ts src/tests/retry-policy.test.ts src/tests/rotation.test.ts src/tests/server-lifecycle.test.ts src/tests/session-keeper.test.ts src/tests/session-state.test.ts src/tests/single-account-mode.test.ts src/tests/stream-retry.test.ts src/tests/tool-calls-endpoint.test.ts src/tests/tool-instructions-cache.test.ts src/tests/session-id.test.ts src/tests/watchdog-ram.test.ts src/tests/tool-recovery-t1t2.test.ts src/tests/abort-silent-t4.test.ts src/tests/t3-close-tag-escape.test.ts src/tests/t5-tool-cap.test.ts src/tests/logger-redaction.test.ts src/tests/stall-timeout-retryable.test.ts src/tests/t6-missing-quote-array-close.test.ts src/tests/watchdog-rss.test.ts src/tests/logical-thread-batch.test.ts src/tests/chat-pool-style.test.ts src/tests/queue-wait-cap.test.ts src/tests/context-eviction-order.test.ts src/tests/chat-in-progress-settle.test.ts src/tests/stream-lock-leak.test.ts src/tests/stream-semaphore.test.ts src/tests/waf-isolation.test.ts src/tests/legacy-completions.test.ts src/tests/response-format.test.ts src/tests/cors-headers.test.ts src/tests/stream-lock-terminal-cancel.test.ts src/tests/parser-truncated-tool-call.test.ts src/tests/metrics-prometheus.test.ts src/tests/context-death-cleanup.test.ts src/tests/personalization-direct-fetch.test.ts src/tests/completion-headers-parity.test.ts src/tests/parallel-escape-repro.test.ts src/tests/chat-in-progress-scale-cost.test.ts src/tests/temp-chat-mode.test.ts src/tests/profile-reset.test.ts src/tests/error-classification.test.ts src/tests/quota-cooldown.test.ts src/tests/account-ready-gate.test.ts src/tests/tool-cap-notice.test.ts src/tests/interaction-flows.test.ts src/tests/headers-gate-cooldown-fallback.test.ts src/tests/unwrapped-tool-calls.test.ts src/tests/anthropic.test.ts src/tests/sync-clients.test.ts src/tests/cli.test.ts src/tests/paths.test.ts src/tests/tool-manifest.test.ts src/tests/tui.test.ts",
-    "test:mock:fast": "tsx --test --test-concurrency=2 --env-file=.env.test src/tests/account-concurrency.test.ts src/tests/concurrency-latest-wins.test.ts src/tests/mutex.test.ts src/tests/context-truncation.test.ts src/tests/streaming-thinking-summary.test.ts src/tests/tool-call-guard.test.ts src/tests/utils-logger-full.test.ts src/tests/logger-toolcall-errors.test.ts src/tests/logger-toolcall-disabled.test.ts src/tests/utils-json-full.test.ts src/tests/utils-session-guard-full.test.ts src/tests/core-logic-full.test.ts src/tests/core-logic-accounts.test.ts src/tests/chat-validation-full.test.ts src/tests/chat-logic-full.test.ts src/tests/account-stickiness.test.ts src/tests/accounts-security.test.ts src/tests/advanced.test.ts src/tests/auth-playwright.test.ts src/tests/captcha-solver.test.ts src/tests/cache-scan-regex.test.ts src/tests/chat-cleanup.test.ts src/tests/chromium-args.test.ts src/tests/config-current.test.ts src/tests/context-meter.test.ts src/tests/concurrency.test.ts src/tests/delta.test.ts src/tests/fingerprint.test.ts src/tests/human-behavior.test.ts src/tests/index.test.ts src/tests/json-recovery.test.ts src/tests/jsonFix.test.ts src/tests/memory-cache.test.ts src/tests/model-alias.test.ts src/tests/model-registry-thinking.test.ts src/tests/models-endpoint.test.ts src/tests/multimodal.test.ts src/tests/oss-upload.test.ts src/tests/parser.test.ts src/tests/personalization-flow.test.ts src/tests/personalization-required.test.ts src/tests/retry-policy.test.ts src/tests/rotation.test.ts src/tests/server-lifecycle.test.ts src/tests/session-keeper.test.ts src/tests/session-state.test.ts src/tests/single-account-mode.test.ts src/tests/stream-retry.test.ts src/tests/tool-calls-endpoint.test.ts src/tests/tool-instructions-cache.test.ts src/tests/session-id.test.ts src/tests/watchdog-ram.test.ts src/tests/tool-recovery-t1t2.test.ts src/tests/abort-silent-t4.test.ts src/tests/t3-close-tag-escape.test.ts src/tests/t5-tool-cap.test.ts src/tests/logger-redaction.test.ts src/tests/stall-timeout-retryable.test.ts src/tests/t6-missing-quote-array-close.test.ts src/tests/watchdog-rss.test.ts src/tests/logical-thread-batch.test.ts src/tests/chat-pool-style.test.ts src/tests/queue-wait-cap.test.ts src/tests/context-eviction-order.test.ts src/tests/chat-in-progress-settle.test.ts src/tests/stream-lock-leak.test.ts src/tests/stream-semaphore.test.ts src/tests/waf-isolation.test.ts src/tests/legacy-completions.test.ts src/tests/response-format.test.ts src/tests/cors-headers.test.ts src/tests/stream-lock-terminal-cancel.test.ts src/tests/parser-truncated-tool-call.test.ts src/tests/metrics-prometheus.test.ts src/tests/context-death-cleanup.test.ts src/tests/personalization-direct-fetch.test.ts src/tests/completion-headers-parity.test.ts src/tests/parallel-escape-repro.test.ts src/tests/chat-in-progress-scale-cost.test.ts src/tests/temp-chat-mode.test.ts src/tests/profile-reset.test.ts src/tests/error-classification.test.ts src/tests/quota-cooldown.test.ts src/tests/account-ready-gate.test.ts src/tests/tool-cap-notice.test.ts src/tests/interaction-flows.test.ts src/tests/headers-gate-cooldown-fallback.test.ts src/tests/unwrapped-tool-calls.test.ts src/tests/anthropic.test.ts src/tests/sync-clients.test.ts src/tests/cli.test.ts src/tests/paths.test.ts src/tests/tool-manifest.test.ts src/tests/tui.test.ts",
+    "test:mock": "tsx --test --test-concurrency=1 --env-file=.env.test src/tests/account-concurrency.test.ts src/tests/concurrency-latest-wins.test.ts src/tests/mutex.test.ts src/tests/context-truncation.test.ts src/tests/streaming-thinking-summary.test.ts src/tests/tool-call-guard.test.ts src/tests/utils-logger-full.test.ts src/tests/logger-toolcall-errors.test.ts src/tests/logger-toolcall-disabled.test.ts src/tests/utils-json-full.test.ts src/tests/utils-session-guard-full.test.ts src/tests/core-logic-full.test.ts src/tests/core-logic-accounts.test.ts src/tests/chat-validation-full.test.ts src/tests/chat-logic-full.test.ts src/tests/account-stickiness.test.ts src/tests/accounts-security.test.ts src/tests/advanced.test.ts src/tests/auth-playwright.test.ts src/tests/captcha-solver.test.ts src/tests/cache-scan-regex.test.ts src/tests/chat-cleanup.test.ts src/tests/chromium-args.test.ts src/tests/config-current.test.ts src/tests/context-meter.test.ts src/tests/concurrency.test.ts src/tests/delta.test.ts src/tests/fingerprint.test.ts src/tests/human-behavior.test.ts src/tests/index.test.ts src/tests/json-recovery.test.ts src/tests/jsonFix.test.ts src/tests/memory-cache.test.ts src/tests/model-alias.test.ts src/tests/model-registry-thinking.test.ts src/tests/models-endpoint.test.ts src/tests/multimodal.test.ts src/tests/oss-upload.test.ts src/tests/parser.test.ts src/tests/personalization-flow.test.ts src/tests/personalization-required.test.ts src/tests/retry-policy.test.ts src/tests/rotation.test.ts src/tests/server-lifecycle.test.ts src/tests/session-keeper.test.ts src/tests/session-state.test.ts src/tests/single-account-mode.test.ts src/tests/stream-retry.test.ts src/tests/tool-calls-endpoint.test.ts src/tests/tool-instructions-cache.test.ts src/tests/session-id.test.ts src/tests/watchdog-ram.test.ts src/tests/tool-recovery-t1t2.test.ts src/tests/abort-silent-t4.test.ts src/tests/t3-close-tag-escape.test.ts src/tests/t5-tool-cap.test.ts src/tests/logger-redaction.test.ts src/tests/stall-timeout-retryable.test.ts src/tests/t6-missing-quote-array-close.test.ts src/tests/watchdog-rss.test.ts src/tests/logical-thread-batch.test.ts src/tests/chat-pool-style.test.ts src/tests/queue-wait-cap.test.ts src/tests/context-eviction-order.test.ts src/tests/chat-in-progress-settle.test.ts src/tests/stream-lock-leak.test.ts src/tests/stream-semaphore.test.ts src/tests/waf-isolation.test.ts src/tests/legacy-completions.test.ts src/tests/response-format.test.ts src/tests/cors-headers.test.ts src/tests/stream-lock-terminal-cancel.test.ts src/tests/parser-truncated-tool-call.test.ts src/tests/metrics-prometheus.test.ts src/tests/context-death-cleanup.test.ts src/tests/personalization-direct-fetch.test.ts src/tests/completion-headers-parity.test.ts src/tests/parallel-escape-repro.test.ts src/tests/chat-in-progress-scale-cost.test.ts src/tests/temp-chat-mode.test.ts src/tests/profile-reset.test.ts src/tests/error-classification.test.ts src/tests/quota-cooldown.test.ts src/tests/account-ready-gate.test.ts src/tests/tool-cap-notice.test.ts src/tests/interaction-flows.test.ts src/tests/headers-gate-cooldown-fallback.test.ts src/tests/unwrapped-tool-calls.test.ts src/tests/anthropic.test.ts src/tests/sync-clients.test.ts src/tests/cli.test.ts src/tests/paths.test.ts src/tests/tool-manifest.test.ts src/tests/tui.test.ts src/tests/personalization-deadline.test.ts",
+    "test:mock:fast": "tsx --test --test-concurrency=2 --env-file=.env.test src/tests/account-concurrency.test.ts src/tests/concurrency-latest-wins.test.ts src/tests/mutex.test.ts src/tests/context-truncation.test.ts src/tests/streaming-thinking-summary.test.ts src/tests/tool-call-guard.test.ts src/tests/utils-logger-full.test.ts src/tests/logger-toolcall-errors.test.ts src/tests/logger-toolcall-disabled.test.ts src/tests/utils-json-full.test.ts src/tests/utils-session-guard-full.test.ts src/tests/core-logic-full.test.ts src/tests/core-logic-accounts.test.ts src/tests/chat-validation-full.test.ts src/tests/chat-logic-full.test.ts src/tests/account-stickiness.test.ts src/tests/accounts-security.test.ts src/tests/advanced.test.ts src/tests/auth-playwright.test.ts src/tests/captcha-solver.test.ts src/tests/cache-scan-regex.test.ts src/tests/chat-cleanup.test.ts src/tests/chromium-args.test.ts src/tests/config-current.test.ts src/tests/context-meter.test.ts src/tests/concurrency.test.ts src/tests/delta.test.ts src/tests/fingerprint.test.ts src/tests/human-behavior.test.ts src/tests/index.test.ts src/tests/json-recovery.test.ts src/tests/jsonFix.test.ts src/tests/memory-cache.test.ts src/tests/model-alias.test.ts src/tests/model-registry-thinking.test.ts src/tests/models-endpoint.test.ts src/tests/multimodal.test.ts src/tests/oss-upload.test.ts src/tests/parser.test.ts src/tests/personalization-flow.test.ts src/tests/personalization-required.test.ts src/tests/retry-policy.test.ts src/tests/rotation.test.ts src/tests/server-lifecycle.test.ts src/tests/session-keeper.test.ts src/tests/session-state.test.ts src/tests/single-account-mode.test.ts src/tests/stream-retry.test.ts src/tests/tool-calls-endpoint.test.ts src/tests/tool-instructions-cache.test.ts src/tests/session-id.test.ts src/tests/watchdog-ram.test.ts src/tests/tool-recovery-t1t2.test.ts src/tests/abort-silent-t4.test.ts src/tests/t3-close-tag-escape.test.ts src/tests/t5-tool-cap.test.ts src/tests/logger-redaction.test.ts src/tests/stall-timeout-retryable.test.ts src/tests/t6-missing-quote-array-close.test.ts src/tests/watchdog-rss.test.ts src/tests/logical-thread-batch.test.ts src/tests/chat-pool-style.test.ts src/tests/queue-wait-cap.test.ts src/tests/context-eviction-order.test.ts src/tests/chat-in-progress-settle.test.ts src/tests/stream-lock-leak.test.ts src/tests/stream-semaphore.test.ts src/tests/waf-isolation.test.ts src/tests/legacy-completions.test.ts src/tests/response-format.test.ts src/tests/cors-headers.test.ts src/tests/stream-lock-terminal-cancel.test.ts src/tests/parser-truncated-tool-call.test.ts src/tests/metrics-prometheus.test.ts src/tests/context-death-cleanup.test.ts src/tests/personalization-direct-fetch.test.ts src/tests/completion-headers-parity.test.ts src/tests/parallel-escape-repro.test.ts src/tests/chat-in-progress-scale-cost.test.ts src/tests/temp-chat-mode.test.ts src/tests/profile-reset.test.ts src/tests/error-classification.test.ts src/tests/quota-cooldown.test.ts src/tests/account-ready-gate.test.ts src/tests/tool-cap-notice.test.ts src/tests/interaction-flows.test.ts src/tests/headers-gate-cooldown-fallback.test.ts src/tests/unwrapped-tool-calls.test.ts src/tests/anthropic.test.ts src/tests/sync-clients.test.ts src/tests/cli.test.ts src/tests/paths.test.ts src/tests/tool-manifest.test.ts src/tests/tui.test.ts src/tests/personalization-deadline.test.ts",
     "test:live": "tsx --test src/tests/concurrentChat.test.ts src/tests/agenticStress.test.ts",
     "benchmark:proxy": "npx tsx src/benchmarks/proxy-baseline.ts",
     "typecheck": "tsc --noEmit"

package/src/api/server.ts

@@ -650,15 +650,20 @@ export async function startServer(options?: {
     const BATCH_SIZE = config.playwright.initBatchSize;
 
     if (accounts.length > 0) {
-      let readyAccountId: string | null = null;
       const totalAccounts = accounts.length;
 
       // Warm accounts in priority order (recently successful accounts first),
-      // skipping accounts still on cooldown, so the startup account matches
-      // the one request routing will pick first.
+      // skipping accounts still on cooldown. Warm up to maxActiveContexts
+      // accounts (default 2: main + reserve) so an immediate failover has a
+      // live browser ready instead of incurring a cold start.
       const warmOrder = getAccountsByPriority(accounts).filter(
         (account) => !getAccountCooldownInfo(account.id),
       );
+      const targetWarmCount = Math.min(
+        warmOrder.length,
+        Math.max(1, config.playwright.maxActiveContexts),
+      );
+      const readyAccountIds = new Set<string>();
 
       for (let i = 0; i < warmOrder.length; i++) {
         const ok = await prepareAccountRuntime(
@@ -669,24 +674,26 @@ export async function startServer(options?: {
           warmQwenChatPool,
         );
         if (ok) {
+          readyAccountIds.add(warmOrder[i].id);
           console.log(
-            `✅ [Server] Account ready (${i + 1}/${totalAccounts}): ${maskEmail(warmOrder[i].email)}`,
+            `✅ [Server] Account ready (${readyAccountIds.size}/${totalAccounts}): ${maskEmail(warmOrder[i].email)}`,
           );
-          readyAccountId = warmOrder[i].id;
-          break;
+          if (readyAccountIds.size >= targetWarmCount) {
+            break;
+          }
         }
       }
 
       const remainingAccounts = accounts.filter(
-        (account) => account.id !== readyAccountId,
+        (account) => !readyAccountIds.has(account.id),
       );
-      if (readyAccountId === null) {
+      if (readyAccountIds.size === 0) {
         console.warn(
           `⚠️  [Server] No account ready during startup; continuing in background`,
         );
       }
 
-      if (config.playwright.prepareAllOnStartup || readyAccountId === null) {
+      if (config.playwright.prepareAllOnStartup || readyAccountIds.size === 0) {
         if (config.playwright.prepareAllOnStartup && remainingAccounts.length > 0) {
           console.log(
             `🪶 [Server] Preparing ${remainingAccounts.length} standby account(s) in background`,

package/src/routes/chat/account.ts

@@ -35,7 +35,7 @@ import {
 	type AccountLease,
 } from "../../core/account-concurrency.ts";
 import { isAuthMockEnabled } from "../../services/auth-playwright.ts";
-import { refreshHeaders } from "../../services/playwright.ts";
+import { isPlaywrightInitialized, refreshHeaders } from "../../services/playwright.ts";
 import {
 	clearAllSessionsForAccount,
 	createQwenStream,
@@ -77,7 +77,18 @@ const MAX_ANTI_BOT_ROTATIONS = 1;
  * a stuck account page (closed context / WAF) can otherwise hold each browser
  * op for 60s and keep the personalization mutex blocked for minutes.
  */
-const PERSONALIZATION_SYNC_DEADLINE_MS = 30_000;
+export const PERSONALIZATION_SYNC_DEADLINE_MS = 30_000;
+export const COLD_ACCOUNT_PERSONALIZATION_SYNC_DEADLINE_MS = 60_000;
+
+export function computePersonalizationDeadlineMs(
+	accountId: string | undefined,
+	navigationTimeoutMs = config.timeouts.navigation,
+): number {
+	if (accountId && accountId !== "global" && isPlaywrightInitialized(accountId)) {
+		return PERSONALIZATION_SYNC_DEADLINE_MS;
+	}
+	return Math.max(COLD_ACCOUNT_PERSONALIZATION_SYNC_DEADLINE_MS, navigationTimeoutMs);
+}
 
 /**
  * Hard deadline for a single stream-acquire attempt (models sync + truncation
@@ -1183,15 +1194,16 @@ async function tryCreateStreamWithRetry(
 								return false;
 							},
 						);
+						const syncDeadlineMs = computePersonalizationDeadlineMs(currentAccountId);
 						personalizationApplied = await Promise.race([
 							syncPromise,
 							new Promise<boolean>((resolve) => {
 								personalizationDeadlineTimer = setTimeout(() => {
 									if (!syncSettled) {
-										syncFailure = `sync timed out after ${PERSONALIZATION_SYNC_DEADLINE_MS}ms`;
+										syncFailure = `sync timed out after ${syncDeadlineMs}ms`;
 									}
 									resolve(false);
-								}, PERSONALIZATION_SYNC_DEADLINE_MS);
+								}, syncDeadlineMs);
 							}),
 						]);
 						// The sync won the race: stop the deadline so it cannot keep the

package/src/services/playwright.ts

@@ -3157,6 +3157,12 @@ export function registerPlaywrightAccountForTests(
   lastAccountActivity.set(accountId, lastActivityAt);
 }
 
+export function unregisterPlaywrightAccountForTests(accountId: string): void {
+  accountPages.delete(accountId);
+  accountContexts.delete(accountId);
+  lastAccountActivity.delete(accountId);
+}
+
 // ─── Token TTL Diagnostics ───────────────────────────────────────────────────
 
 export interface CookieDiagnostic {

package/src/tui/views/accounts-view.ts

@@ -145,7 +145,7 @@ export class AccountsView implements TuiView {
   public async handleKey(key: KeyEvent): Promise<boolean | void> {
     // 0. Confirm Dialog Active
     if (this.confirmDialog) {
-      if (key.name === "s" || key.name === "S" || key.name === "enter" || key.name === "return") {
+      if (key.name === "s" || key.name === "S") {
         const dialog = this.confirmDialog;
         this.confirmDialog = null;
         this.confirmDialogHovered = null;
@@ -158,17 +158,40 @@ export class AccountsView implements TuiView {
         this.setStatusMessage(theme.muted("Ação cancelada"));
         return true;
       }
+      if (key.name === "enter" || key.name === "return") {
+        if (this.confirmDialogHovered === "cancel") {
+          this.confirmDialog = null;
+          this.confirmDialogHovered = null;
+          this.setStatusMessage(theme.muted("Ação cancelada"));
+          return true;
+        }
+        const dialog = this.confirmDialog;
+        this.confirmDialog = null;
+        this.confirmDialogHovered = null;
+        await dialog.onConfirm();
+        return true;
+      }
+      if (key.name === "left" || key.name === "right" || key.name === "tab") {
+        this.confirmDialogHovered = this.confirmDialogHovered === "cancel" ? "confirm" : "cancel";
+        return true;
+      }
       if (key.name === "hover" && key.mouse) {
         const { row, col } = key.mouse;
-        const btnRow = this.lastConfirmModalStartRow + 4;
-        if (row === btnRow) {
-          const startCol = this.lastConfirmModalLeftPad + 2;
-          if (col >= startCol && col <= startCol + 25) {
-            this.confirmDialogHovered = "confirm";
+        const btnRow = (this.lastConfirmModalStartRow || 4) + 5;
+        if (row === btnRow || row === btnRow - 1) {
+          const relCol = col - (this.lastConfirmModalLeftPad || 0);
+          if (relCol >= 2 && relCol <= 34) {
+            if (this.confirmDialogHovered !== "confirm") {
+              this.confirmDialogHovered = "confirm";
+              return true;
+            }
             return true;
           }
-          if (col >= startCol + 26 && col <= startCol + 50) {
-            this.confirmDialogHovered = "cancel";
+          if (relCol >= 35 && relCol <= 60) {
+            if (this.confirmDialogHovered !== "cancel") {
+              this.confirmDialogHovered = "cancel";
+              return true;
+            }
             return true;
           }
         }
@@ -179,17 +202,17 @@ export class AccountsView implements TuiView {
       }
       if (key.name === "click" && key.mouse) {
         const { row, col } = key.mouse;
-        const btnRow = this.lastConfirmModalStartRow + 4;
-        if (row === btnRow) {
-          const startCol = this.lastConfirmModalLeftPad + 2;
-          if (col >= startCol && col <= startCol + 25) {
+        const btnRow = (this.lastConfirmModalStartRow || 4) + 5;
+        if (row === btnRow || row === btnRow - 1) {
+          const relCol = col - (this.lastConfirmModalLeftPad || 0);
+          if (relCol >= 2 && relCol <= 34) {
             const dialog = this.confirmDialog;
             this.confirmDialog = null;
             this.confirmDialogHovered = null;
             await dialog.onConfirm();
             return true;
           }
-          if (col >= startCol + 26 && col <= startCol + 50) {
+          if (relCol >= 35 && relCol <= 60) {
             this.confirmDialog = null;
             this.confirmDialogHovered = null;
             this.setStatusMessage(theme.muted("Ação cancelada"));
@@ -804,14 +827,15 @@ export class AccountsView implements TuiView {
     if (this.confirmDialog) {
       const modalW = Math.min(width - 4, 66);
       this.lastConfirmModalLeftPad = Math.max(0, Math.floor((width - modalW) / 2));
+      this.lastConfirmModalStartRow = 4;
       const confirmBtn =
         this.confirmDialogHovered === "confirm"
           ? theme.bgHover(theme.red(" [ S / Enter ] Sim, Confirmar "))
-          : theme.red("[ S / Enter ] Sim, Confirmar");
+          : ` ${theme.red("[ S / Enter ] Sim, Confirmar")} `;
       const cancelBtn =
         this.confirmDialogHovered === "cancel"
           ? theme.bgHover(theme.green(" [ N / Esc ] Cancelar "))
-          : theme.green("[ N / Esc ] Cancelar");
+          : ` ${theme.green("[ N / Esc ] Cancelar")} `;
 
       const modalContent = [
         "",

package/src/tui/views/storage-view.ts

@@ -126,7 +126,7 @@ export class StorageView implements TuiView {
   public async handleKey(key: KeyEvent): Promise<boolean | void> {
     // 0. Confirm Dialog Active
     if (this.confirmDialog) {
-      if (key.name === "s" || key.name === "S" || key.name === "enter" || key.name === "return") {
+      if (key.name === "s" || key.name === "S") {
         const dialog = this.confirmDialog;
         this.confirmDialog = null;
         this.confirmDialogHovered = null;
@@ -139,17 +139,40 @@ export class StorageView implements TuiView {
         this.addLog(theme.muted("Ação cancelada"));
         return true;
       }
+      if (key.name === "enter" || key.name === "return") {
+        if (this.confirmDialogHovered === "cancel") {
+          this.confirmDialog = null;
+          this.confirmDialogHovered = null;
+          this.addLog(theme.muted("Ação cancelada"));
+          return true;
+        }
+        const dialog = this.confirmDialog;
+        this.confirmDialog = null;
+        this.confirmDialogHovered = null;
+        await dialog.onConfirm();
+        return true;
+      }
+      if (key.name === "left" || key.name === "right" || key.name === "tab") {
+        this.confirmDialogHovered = this.confirmDialogHovered === "cancel" ? "confirm" : "cancel";
+        return true;
+      }
       if (key.name === "hover" && key.mouse) {
         const { row, col } = key.mouse;
-        const btnRow = this.lastConfirmModalStartRow + 4;
-        if (row === btnRow) {
-          const startCol = this.lastConfirmModalLeftPad + 2;
-          if (col >= startCol && col <= startCol + 25) {
-            this.confirmDialogHovered = "confirm";
+        const btnRow = (this.lastConfirmModalStartRow || 4) + 5;
+        if (row === btnRow || row === btnRow - 1) {
+          const relCol = col - (this.lastConfirmModalLeftPad || 0);
+          if (relCol >= 2 && relCol <= 34) {
+            if (this.confirmDialogHovered !== "confirm") {
+              this.confirmDialogHovered = "confirm";
+              return true;
+            }
             return true;
           }
-          if (col >= startCol + 26 && col <= startCol + 50) {
-            this.confirmDialogHovered = "cancel";
+          if (relCol >= 35 && relCol <= 60) {
+            if (this.confirmDialogHovered !== "cancel") {
+              this.confirmDialogHovered = "cancel";
+              return true;
+            }
             return true;
           }
         }
@@ -160,17 +183,17 @@ export class StorageView implements TuiView {
       }
       if (key.name === "click" && key.mouse) {
         const { row, col } = key.mouse;
-        const btnRow = this.lastConfirmModalStartRow + 4;
-        if (row === btnRow) {
-          const startCol = this.lastConfirmModalLeftPad + 2;
-          if (col >= startCol && col <= startCol + 25) {
+        const btnRow = (this.lastConfirmModalStartRow || 4) + 5;
+        if (row === btnRow || row === btnRow - 1) {
+          const relCol = col - (this.lastConfirmModalLeftPad || 0);
+          if (relCol >= 2 && relCol <= 34) {
             const dialog = this.confirmDialog;
             this.confirmDialog = null;
             this.confirmDialogHovered = null;
             await dialog.onConfirm();
             return true;
           }
-          if (col >= startCol + 26 && col <= startCol + 50) {
+          if (relCol >= 35 && relCol <= 60) {
             this.confirmDialog = null;
             this.confirmDialogHovered = null;
             this.addLog(theme.muted("Ação cancelada"));
@@ -409,14 +432,15 @@ export class StorageView implements TuiView {
     if (this.confirmDialog) {
       const modalW = Math.min(width - 4, 66);
       this.lastConfirmModalLeftPad = Math.max(0, Math.floor((width - modalW) / 2));
+      this.lastConfirmModalStartRow = 4;
       const confirmBtn =
         this.confirmDialogHovered === "confirm"
           ? theme.bgHover(theme.red(" [ S / Enter ] Sim, Confirmar "))
-          : theme.red("[ S / Enter ] Sim, Confirmar");
+          : ` ${theme.red("[ S / Enter ] Sim, Confirmar")} `;
       const cancelBtn =
         this.confirmDialogHovered === "cancel"
           ? theme.bgHover(theme.green(" [ N / Esc ] Cancelar "))
-          : theme.green("[ N / Esc ] Cancelar");
+          : ` ${theme.green("[ N / Esc ] Cancelar")} `;
 
       const modalContent = [
         "",