qwenproxy-cli 1.0.30 → 1.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwenproxy-cli",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "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": {

package/src/routes/chat/account.ts

@@ -35,7 +35,11 @@ import {
 	type AccountLease,
 } from "../../core/account-concurrency.ts";
 import { isAuthMockEnabled } from "../../services/auth-playwright.ts";
-import { isPlaywrightInitialized, refreshHeaders } from "../../services/playwright.ts";
+import {
+	isPlaywrightInitialized,
+	isAccountRecentlyActive,
+	refreshHeaders,
+} from "../../services/playwright.ts";
 import { enqueueOrphanChatDeletion } from "../../services/chat-cleanup.ts";
 import {
 	clearAllSessionsForAccount,
@@ -78,14 +82,19 @@ 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.
  */
-export const PERSONALIZATION_SYNC_DEADLINE_MS = 30_000;
+export const PERSONALIZATION_SYNC_DEADLINE_MS = 45_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)) {
+	if (
+		accountId &&
+		accountId !== "global" &&
+		isPlaywrightInitialized(accountId) &&
+		isAccountRecentlyActive(accountId, 5 * 60 * 1000)
+	) {
 		return PERSONALIZATION_SYNC_DEADLINE_MS;
 	}
 	return Math.max(COLD_ACCOUNT_PERSONALIZATION_SYNC_DEADLINE_MS, navigationTimeoutMs);

package/src/services/playwright.ts

@@ -3342,6 +3342,14 @@ export function isPlaywrightInitialized(accountId: string): boolean {
   return accountPages.has(accountId);
 }
 
+export function isAccountRecentlyActive(
+  accountId: string,
+  maxIdleMs = 300_000,
+): boolean {
+  const last = lastAccountActivity.get(accountId) ?? 0;
+  return last > 0 && Date.now() - last < maxIdleMs;
+}
+
 /**
  * Register an account as if it had been initialized, with a chosen last
  * activity timestamp. Lets the idle/keep-alive selection be exercised without

package/src/services/qwen.ts

@@ -2993,19 +2993,6 @@ async function createQwenStreamInternal(
         const preview = await readResponsePreview(response);
         const htmlBody = isHtmlResponseBody(preview);
         const antiBotChallenge = isWafChallengeResponse(preview);
-        logger.warn(
-          htmlBody || isHtmlResponseContentType(responseContentType)
-            ? "[Qwen] Completion returned HTML instead of SSE"
-            : "[Qwen] Completion returned a non-SSE body",
-          {
-            accountId: accountId ?? "global",
-            chatId: chatSessionId ?? "new",
-            status: response.status,
-            contentType: responseContentType,
-            antiBotChallenge,
-            previewBytes: Buffer.byteLength(preview, "utf8"),
-          },
-        );
 
         if (
           antiBotChallenge &&
@@ -3026,6 +3013,19 @@ async function createQwenStreamInternal(
           continue;
         }
 
+        logger.warn(
+          htmlBody || isHtmlResponseContentType(responseContentType)
+            ? "[Qwen] Completion returned HTML instead of SSE"
+            : "[Qwen] Completion returned a non-SSE body",
+          {
+            accountId: accountId ?? "global",
+            chatId: chatSessionId ?? "new",
+            status: response.status,
+            contentType: responseContentType,
+            antiBotChallenge,
+            previewBytes: Buffer.byteLength(preview, "utf8"),
+          },
+        );
         throw withCreatedChatMetadata(
           new QwenUpstreamError(
             antiBotChallenge
@@ -3070,16 +3070,6 @@ async function createQwenStreamInternal(
         const htmlResponse = isHtmlResponseBody(errText);
         const antiBotChallenge = isWafChallengeResponse(errText);
         if (antiBotChallenge || htmlResponse) {
-          logger.warn(
-            "[Qwen] Completion returned an HTML or anti-bot challenge body instead of SSE.",
-            {
-              accountId: accountId ?? "global",
-              chatId: chatSessionId ?? "new",
-              antiBotChallenge,
-              previewBytes: Buffer.byteLength(errText, "utf8"),
-            },
-          );
-
           if (
             antiBotChallenge &&
             (await retryAfterCaptchaRecovery(
@@ -3099,6 +3089,15 @@ async function createQwenStreamInternal(
             continue;
           }
 
+          logger.warn(
+            "[Qwen] Completion returned an HTML or anti-bot challenge body instead of SSE.",
+            {
+              accountId: accountId ?? "global",
+              chatId: chatSessionId ?? "new",
+              antiBotChallenge,
+              previewBytes: Buffer.byteLength(errText, "utf8"),
+            },
+          );
           throw withCreatedChatMetadata(
             new QwenUpstreamError(
               antiBotChallenge

package/src/sync/cline.ts

@@ -84,7 +84,7 @@ export function syncCline(options: SyncOptions): ClientSyncResult {
       backupPath,
       success: true,
       action: backupPath ? "updated" : "created",
-      message: `Configured Cline & Zoo Code in state.vscdb with model ${model} and reasoning effort ${reasoningEffort}`,
+      message: `Configured Cline in state.vscdb with model ${model} and reasoning effort ${reasoningEffort}`,
     };
   } catch (err: any) {
     return {

package/src/sync/index.ts

@@ -151,6 +151,98 @@ export interface ClientDetectionStatus {
   url?: string;
 }
 
+export function isExecutableInPath(name: string): boolean {
+  const envPath = process.env.PATH || "";
+  const dirs = envPath.split(path.delimiter).filter(Boolean);
+  const extensions = process.platform === "win32"
+    ? (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD").split(";").map((e) => e.toLowerCase())
+    : [""];
+
+  for (const dir of dirs) {
+    for (const ext of extensions) {
+      const fullPath = path.join(dir, name + ext);
+      try {
+        if (fs.existsSync(fullPath) && !fs.statSync(fullPath).isDirectory()) {
+          return true;
+        }
+      } catch {}
+    }
+  }
+  return false;
+}
+
+export function isVscodeExtensionInstalled(pattern: RegExp): boolean {
+  const home = os.homedir();
+  const candidateDirs = [
+    path.join(home, ".vscode", "extensions"),
+    path.join(home, ".vscode-insiders", "extensions"),
+    path.join(home, ".cursor", "extensions"),
+    path.join(home, ".windsurf", "extensions"),
+  ];
+  for (const d of candidateDirs) {
+    if (fs.existsSync(d)) {
+      try {
+        const entries = fs.readdirSync(d);
+        if (entries.some((e) => pattern.test(e))) return true;
+      } catch {}
+    }
+  }
+  return false;
+}
+
+export function isZedInstalled(): boolean {
+  if (isExecutableInPath("zed")) return true;
+  if (process.platform === "win32") {
+    const local = process.env.LOCALAPPDATA || "";
+    if (fs.existsSync(path.join(local, "Programs", "Zed"))) return true;
+  } else if (process.platform === "darwin") {
+    if (fs.existsSync("/Applications/Zed.app")) return true;
+  }
+  return false;
+}
+
+export function isMatchingLocalHost(text: string, port = 7936): boolean {
+  if (!text) return false;
+  const configuredPort = config.server?.port || 7936;
+  const ports = new Set([String(port), String(configuredPort), "7936", "3000"]);
+  const isLocal = text.includes("127.0.0.1") || text.includes("localhost") || text.includes("0.0.0.0");
+  return isLocal && Array.from(ports).some((p) => text.includes(`:${p}`));
+}
+
+export function isClientToolInstalled(
+  id: SyncClientName,
+  targetPath: string,
+  isCustomTestPath = false,
+): boolean {
+  if (isCustomTestPath) {
+    return fs.existsSync(targetPath);
+  }
+  switch (id) {
+    case "hermes":
+      return isExecutableInPath("hermes");
+    case "openclaw":
+      return isExecutableInPath("openclaw") || isExecutableInPath("clawdbot") || isExecutableInPath("moltbot");
+    case "aider":
+      return isExecutableInPath("aider");
+    case "kilo":
+      return isExecutableInPath("kilo") || isVscodeExtensionInstalled(/kilo/i);
+    case "cline":
+      return isExecutableInPath("cline") || isVscodeExtensionInstalled(/cline|zoo-code|roo-cline/i);
+    case "zed":
+      return isZedInstalled();
+    case "claude-code":
+      return isExecutableInPath("claude") || fs.existsSync(targetPath);
+    case "codex":
+      return isExecutableInPath("codex") || fs.existsSync(targetPath);
+    case "opencode":
+      return isExecutableInPath("opencode") || fs.existsSync(targetPath);
+    case "omp":
+      return isExecutableInPath("omp") || fs.existsSync(targetPath);
+    default:
+      return fs.existsSync(targetPath);
+  }
+}
+
 /**
  * Inspects a client configuration file to determine whether the client is installed
  * and whether it is actively configured to route to QwenProxy.
@@ -161,37 +253,26 @@ export function inspectClientSyncStatus(
   port = 7936,
 ): ClientDetectionStatus {
   const defaultPaths = getDefaultPaths();
-  const targetPath =
-    filePath ||
-    (id === "claude-code"
-      ? defaultPaths.claudeCode
-      : id === "codex"
-        ? defaultPaths.codex
-        : id === "opencode"
-          ? defaultPaths.openCode
-          : id === "omp"
-            ? defaultPaths.omp
-            : id === "hermes"
-              ? defaultPaths.hermes
-              : id === "openclaw"
-                ? defaultPaths.openClaw
-                : id === "kilo"
-                  ? defaultPaths.kilo
-                  : id === "cline"
-                    ? defaultPaths.cline
-                    : id === "zed"
-                      ? defaultPaths.zed
-                      : defaultPaths.aider);
+  const defaultTarget = (defaultPaths as Record<string, string>)[id] || "";
+  const isCustomTestPath = Boolean(
+    filePath && defaultTarget && path.resolve(filePath) !== path.resolve(defaultTarget),
+  );
+  const targetPath = filePath || defaultTarget;
 
   if (!fs.existsSync(targetPath)) {
     return { id, installed: false, synced: false };
   }
 
+  const toolInstalled = isClientToolInstalled(id, targetPath, isCustomTestPath);
+  if (!toolInstalled) {
+    return { id, installed: false, synced: false };
+  }
+
   try {
     if (id === "cline") {
-      // Inspect SQLite DB
       let isSynced = false;
       let model: string | undefined;
+      let rowExists = false;
       try {
         const db = new Database(targetPath, { readonly: true });
         const row = db
@@ -201,18 +282,19 @@ export function inspectClientSyncStatus(
           .get() as { value: string } | undefined;
         db.close();
         if (row && row.value) {
+          rowExists = true;
           const parsed = JSON.parse(row.value);
           const url = parsed.openAiBaseUrl || "";
           model = parsed.openAiModelId;
-          isSynced = Boolean(
-            url &&
-              (url.includes(String(port)) ||
-                url.includes(`127.0.0.1:${port}`) ||
-                url.includes(`localhost:${port}`)),
-          );
+          isSynced = isMatchingLocalHost(url, port);
         }
       } catch {}
-      return { id, installed: true, synced: isSynced, model };
+
+      const isInstalled = isCustomTestPath
+        ? true
+        : rowExists || isExecutableInPath("cline") || isVscodeExtensionInstalled(/cline|zoo-code|roo-cline/i);
+
+      return { id, installed: isInstalled, synced: isInstalled && isSynced, model };
     }
 
     const raw = fs.readFileSync(targetPath, "utf-8");
@@ -221,12 +303,8 @@ export function inspectClientSyncStatus(
       const data = JSON.parse(raw);
       const url = data?.env?.ANTHROPIC_BASE_URL || "";
       const model = data?.env?.ANTHROPIC_MODEL || data?.model || "";
-      const isLocalHost =
-        url.includes(String(port)) ||
-        url.includes(`127.0.0.1:${port}`) ||
-        url.includes(`localhost:${port}`);
       const isSynced =
-        isLocalHost &&
+        isMatchingLocalHost(url, port) &&
         (model.toLowerCase().includes("qwen") || Boolean(data?.env?.ANTHROPIC_AUTH_TOKEN));
       return {
         id,
@@ -244,13 +322,11 @@ export function inspectClientSyncStatus(
       const model = modelMatch ? modelMatch[1] : undefined;
       const urlMatch = raw.match(/\[model_providers\.qwenproxy\][\s\S]*?base_url\s*=\s*["']([^"']+)["']/);
       const url = urlMatch ? urlMatch[1] : "";
-      const isLocalHost = Boolean(
-        url && (url.includes(String(port)) || url.includes(`127.0.0.1:${port}`) || url.includes(`localhost:${port}`)),
-      );
+      const isSynced = hasProvider && isProviderActive && isMatchingLocalHost(url, port);
       return {
         id,
         installed: true,
-        synced: hasProvider && isProviderActive && isLocalHost,
+        synced: isSynced,
         model,
       };
     }
@@ -261,20 +337,13 @@ export function inspectClientSyncStatus(
         const data = JSON.parse(raw);
         const provider = data?.provider?.qwenproxy;
         const url = provider?.options?.baseURL || "";
-        const isLocalHost =
-          url.includes(String(port)) ||
-          url.includes(`127.0.0.1:${port}`) ||
-          url.includes(`localhost:${port}`);
-        isSynced = Boolean(provider && isLocalHost);
+        const isSynced = Boolean(provider && isMatchingLocalHost(url, port));
+        return { id, installed: true, synced: isSynced };
       } catch {
         const qwenBlockMatch = raw.match(/"qwenproxy"\s*:\s*\{[\s\S]*?"baseURL"\s*:\s*"([^"]+)"/);
         const url = qwenBlockMatch ? qwenBlockMatch[1] : "";
-        isSynced = Boolean(
-          url &&
-            (url.includes(String(port)) ||
-              url.includes(`127.0.0.1:${port}`) ||
-              url.includes(`localhost:${port}`)),
-        );
+        const isSynced = Boolean(url && isMatchingLocalHost(url, port));
+        return { id, installed: true, synced: isSynced };
       }
       return {
         id,
@@ -290,12 +359,7 @@ export function inspectClientSyncStatus(
       if (ompMatch) {
         const urlMatch = ompMatch[1].match(/baseUrl:\s*(\S+)/);
         url = urlMatch ? urlMatch[1].replace(/['"]/g, "") : undefined;
-        isSynced = Boolean(
-          url &&
-            (url.includes(String(port)) ||
-              url.includes(`127.0.0.1:${port}`) ||
-              url.includes(`localhost:${port}`)),
-        );
+        isSynced = Boolean(url && isMatchingLocalHost(url, port));
       }
       return {
         id,
@@ -306,47 +370,27 @@ export function inspectClientSyncStatus(
     }
 
     if (id === "hermes") {
-      const isLocalHost =
-        raw.includes(String(port)) ||
-        raw.includes(`127.0.0.1:${port}`) ||
-        raw.includes(`localhost:${port}`);
-      const isSynced = isLocalHost && (raw.includes("qwenproxy") || raw.includes("qwen"));
+      const isSynced = isMatchingLocalHost(raw, port) && (raw.includes("qwenproxy") || raw.includes("qwen"));
       return { id, installed: true, synced: isSynced };
     }
 
     if (id === "openclaw") {
-      const isLocalHost =
-        raw.includes(String(port)) ||
-        raw.includes(`127.0.0.1:${port}`) ||
-        raw.includes(`localhost:${port}`);
-      const isSynced = isLocalHost && raw.includes("qwenproxy");
+      const isSynced = isMatchingLocalHost(raw, port) && raw.includes("qwenproxy");
       return { id, installed: true, synced: isSynced };
     }
 
     if (id === "kilo") {
-      const isLocalHost =
-        raw.includes(String(port)) ||
-        raw.includes(`127.0.0.1:${port}`) ||
-        raw.includes(`localhost:${port}`);
-      const isSynced = isLocalHost && raw.includes("qwenproxy");
+      const isSynced = isMatchingLocalHost(raw, port) && raw.includes("qwenproxy");
       return { id, installed: true, synced: isSynced };
     }
 
     if (id === "zed") {
-      const isLocalHost =
-        raw.includes(String(port)) ||
-        raw.includes(`127.0.0.1:${port}`) ||
-        raw.includes(`localhost:${port}`);
-      const isSynced = isLocalHost && raw.includes("QwenProxy");
+      const isSynced = isMatchingLocalHost(raw, port) && raw.includes("QwenProxy");
       return { id, installed: true, synced: isSynced };
     }
 
     if (id === "aider") {
-      const isLocalHost =
-        raw.includes(String(port)) ||
-        raw.includes(`127.0.0.1:${port}`) ||
-        raw.includes(`localhost:${port}`);
-      const isSynced = isLocalHost && raw.includes("qwen");
+      const isSynced = isMatchingLocalHost(raw, port) && raw.includes("qwen");
       return { id, installed: true, synced: isSynced };
     }
   } catch {
@@ -544,7 +588,7 @@ export function syncAllClients(options: SyncAllOptions = {}): SyncAllResult {
     }
   }
 
-  // 8. Cline & Zoo Code
+  // 8. Cline
   if (shouldSync("cline")) {
     const clineExisted = fs.existsSync(paths.cline);
     const clineRes = syncCline({

package/src/sync-clients.ts

@@ -67,7 +67,7 @@ Exemplos:
   npm run sync claude         # Sincroniza apenas o Claude Code
   npm run sync openclaw       # Sincroniza apenas o OpenClaw
   npm run sync kilo           # Sincroniza apenas o Kilo Code
-  npm run sync cline          # Sincroniza Cline & Zoo Code
+  npm run sync cline          # Sincroniza apenas o Cline
   npm run sync omp            # Sincroniza apenas o OMP (Oh My Pi)
   npm run sync codex          # Sincroniza apenas o Codex CLI
   npm run sync zed            # Sincroniza apenas o Zed Editor
@@ -108,7 +108,7 @@ async function main() {
       { id: "claude-code", name: "3. Claude Code", path: defaultPaths.claudeCode },
       { id: "openclaw", name: "4. OpenClaw", path: defaultPaths.openClaw },
       { id: "kilo", name: "5. Kilo Code", path: defaultPaths.kilo },
-      { id: "cline", name: "6. Cline & Zoo", path: defaultPaths.cline },
+      { id: "cline", name: "6. Cline", path: defaultPaths.cline },
       { id: "omp", name: "7. OMP (Oh My Pi)", path: defaultPaths.omp },
       { id: "codex", name: "8. Codex CLI", path: defaultPaths.codex },
       { id: "zed", name: "9. Zed Editor", path: defaultPaths.zed },

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

@@ -11,10 +11,11 @@ import {
   getDefaultPaths,
   inspectClientSyncStatus,
 } from "../../sync/index.ts";
+import type { SyncClientName } from "../../sync/types.ts";
 import { fetchLiveModels } from "../proxy-client.ts";
 
 interface ClientOption {
-  id: "claude-code" | "codex" | "opencode" | "omp";
+  id: SyncClientName;
   name: string;
   path: string;
   selected: boolean;
@@ -27,7 +28,7 @@ export class SyncView implements TuiView {
   public readonly title = "Sync";
   public readonly tabNumber = 3;
   private clients: ClientOption[] = [];
-  private selectedRowIndex = 0; // 0..3 for clients, 4 for model, 5 for scope, 6 for sync, 7 for restore
+  private selectedRowIndex = 0; // 0..9 for clients, 10 for model, 11 for scope, 12 for sync, 13 for restore
   private hoveredActionRow: number | null = null;
   private availableModels = [
     "qwen3.8-max",
@@ -60,11 +61,17 @@ export class SyncView implements TuiView {
 
   private detectClients(): void {
     const paths = getDefaultPaths();
-    const defs: Array<{ id: "claude-code" | "codex" | "opencode" | "omp"; name: string; path: string }> = [
-      { id: "claude-code", name: "Claude Code", path: paths.claudeCode },
-      { id: "codex", name: "OpenAI Codex", path: paths.codex },
+    const defs: Array<{ id: SyncClientName; name: string; path: string }> = [
+      { id: "hermes", name: "Hermes Agent", path: paths.hermes },
       { id: "opencode", name: "OpenCode", path: paths.openCode },
+      { id: "claude-code", name: "Claude Code", path: paths.claudeCode },
+      { id: "openclaw", name: "OpenClaw", path: paths.openClaw },
+      { id: "kilo", name: "Kilo Code", path: paths.kilo },
+      { id: "cline", name: "Cline", path: paths.cline },
       { id: "omp", name: "OMP (Oh My Pi)", path: paths.omp },
+      { id: "codex", name: "Codex CLI", path: paths.codex },
+      { id: "zed", name: "Zed Editor", path: paths.zed },
+      { id: "aider", name: "Aider", path: paths.aider },
     ];
 
     this.clients = defs.map((d) => {
@@ -96,23 +103,23 @@ export class SyncView implements TuiView {
       const { row, col } = key.mouse;
       const leftW = this.lastLeftW || 46;
       if (col >= 2 && col <= leftW - 1) {
-        if (row >= 8 && row <= 11) {
+        if (row >= 8 && row <= 17) {
           const targetRow = row - 8;
           if (this.selectedRowIndex !== targetRow) {
             this.selectedRowIndex = targetRow;
             return true;
           }
-        } else if (row === 14) {
-          if (this.selectedRowIndex !== 4) {
-            this.selectedRowIndex = 4;
+        } else if (row === 20 || row === 14) {
+          if (this.selectedRowIndex !== 10) {
+            this.selectedRowIndex = 10;
             return true;
           }
-        } else if (row === 15) {
-          if (this.selectedRowIndex !== 5) {
-            this.selectedRowIndex = 5;
+        } else if (row === 21 || row === 15) {
+          if (this.selectedRowIndex !== 11) {
+            this.selectedRowIndex = 11;
             return true;
           }
-        } else if (row === 18 || row === 19) {
+        } else if (row === 24 || row === 18 || row === 25 || row === 19) {
           if (this.hoveredActionRow !== row) {
             this.hoveredActionRow = row;
             return true;
@@ -132,8 +139,8 @@ export class SyncView implements TuiView {
       const { row, col } = key.mouse;
       const leftW = this.lastLeftW || 46;
       if (col >= 2 && col <= leftW - 1) {
-        // Rows 8, 9, 10, 11: Toggle client
-        if (row >= 8 && row <= 11) {
+        // Rows 8..17: Toggle client
+        if (row >= 8 && row <= 17) {
           const client = this.clients[row - 8];
           if (client) {
             client.selected = !client.selected;
@@ -141,27 +148,27 @@ export class SyncView implements TuiView {
             return true;
           }
         }
-        // Row 14: Model selector
-        if (row === 14) {
+        // Model selector
+        if (row === 20 || row === 14) {
           this.modelIndex = (this.modelIndex + 1) % this.availableModels.length;
-          this.selectedRowIndex = 4;
+          this.selectedRowIndex = 10;
           return true;
         }
-        // Row 15: Scope selector
-        if (row === 15) {
+        // Scope selector
+        if (row === 21 || row === 15) {
           this.syncAllModels = !this.syncAllModels;
-          this.selectedRowIndex = 5;
+          this.selectedRowIndex = 11;
           return true;
         }
-        // Row 18: Sincronizar button
-        if (row === 18) {
-          this.selectedRowIndex = 6;
+        // Sincronizar button
+        if (row === 24 || row === 18) {
+          this.selectedRowIndex = 12;
           this.executeSync();
           return true;
         }
-        // Row 19: Restaurar button
-        if (row === 19) {
-          this.selectedRowIndex = 7;
+        // Restaurar button
+        if (row === 25 || row === 19) {
+          this.selectedRowIndex = 13;
           this.executeRollback();
           return true;
         }
@@ -174,28 +181,28 @@ export class SyncView implements TuiView {
       return true;
     }
     if (key.name === "down" || key.name === "wheeldown" || (key.name === "j" && !key.ctrl)) {
-      this.selectedRowIndex = Math.min(7, this.selectedRowIndex + 1);
+      this.selectedRowIndex = Math.min(13, this.selectedRowIndex + 1);
       return true;
     }
 
     // Toggle client selection with Space
     if (key.name === "space") {
-      if (this.selectedRowIndex < 4) {
+      if (this.selectedRowIndex < this.clients.length) {
         const client = this.clients[this.selectedRowIndex];
         if (client) {
           client.selected = !client.selected;
         }
-      } else if (this.selectedRowIndex === 4) {
+      } else if (this.selectedRowIndex === 10) {
         // Cycle model with space
         this.modelIndex = (this.modelIndex + 1) % this.availableModels.length;
-      } else if (this.selectedRowIndex === 5) {
+      } else if (this.selectedRowIndex === 11) {
         this.syncAllModels = !this.syncAllModels;
       }
       return true;
     }
 
-    // Cycle model left/right on row 4
-    if (this.selectedRowIndex === 4 && (key.name === "left" || key.name === "right")) {
+    // Cycle model left/right on row 10
+    if (this.selectedRowIndex === 10 && (key.name === "left" || key.name === "right")) {
       if (key.name === "left") {
         this.modelIndex =
           (this.modelIndex - 1 + this.availableModels.length) %
@@ -205,7 +212,6 @@ export class SyncView implements TuiView {
       }
       return true;
     }
-
     // Toggle all with 'a'
     if (key.name === "a" && !key.ctrl) {
       const allSelected = this.clients.every((c) => c.selected);
@@ -226,7 +232,7 @@ export class SyncView implements TuiView {
 
     // Confirm action on Enter
     if (key.name === "return") {
-      if (this.selectedRowIndex === 7) {
+      if (this.selectedRowIndex === 13) {
         this.executeRollback();
       } else {
         this.executeSync();
@@ -289,8 +295,8 @@ export class SyncView implements TuiView {
   }
 
   public render(width: number, height: number): string[] {
-    const contentH = Math.max(12, height);
-    const leftW = Math.max(46, Math.floor(width * 0.52));
+    const contentH = Math.max(22, height);
+    const leftW = Math.max(48, Math.floor(width * 0.52));
     this.lastLeftW = leftW;
     const rightW = Math.max(30, width - leftW - 1);
 
@@ -323,8 +329,8 @@ export class SyncView implements TuiView {
     leftContent.push("");
     leftContent.push(`  ${theme.bold("Modelo:")}`);
 
-    // Row index 4: Model Selector
-    const isModelFocused = this.selectedRowIndex === 4;
+    // Row index 10: Model Selector
+    const isModelFocused = this.selectedRowIndex === 10;
     const modelPointer = isModelFocused ? theme.cyan(`${glyphs.pointer} `) : "  ";
     const currentModel = this.availableModels[this.modelIndex] || "qwen3.8-max";
     const modelText = `${currentModel} (${this.modelIndex + 1}/${this.availableModels.length})`;
@@ -335,23 +341,23 @@ export class SyncView implements TuiView {
 
     leftContent.push(isModelFocused ? theme.bgSelected(modelLine) : modelLine);
 
-    // Row index 5: Scope Selector
-    const isScopeFocused = this.selectedRowIndex === 5;
+    // Row index 11: Scope Selector
+    const isScopeFocused = this.selectedRowIndex === 11;
     const scopePointer = isScopeFocused ? theme.cyan(`${glyphs.pointer} `) : "  ";
     const scopeCheck = this.syncAllModels ? theme.green(glyphs.radioOn) : theme.muted(glyphs.radioOff);
     const scopeLine = `${scopePointer}${scopeCheck} Registrar todos os modelos`;
     leftContent.push(isScopeFocused ? theme.bgSelected(scopeLine) : scopeLine);
     leftContent.push("");
     leftContent.push(`  ${theme.bold("Ações:")}`);
-    // Row 18: Sincronizar
-    const isSyncFocused = this.selectedRowIndex === 6;
-    const isSyncHovered = this.hoveredActionRow === 18;
+    // Row index 12: Sincronizar
+    const isSyncFocused = this.selectedRowIndex === 12;
+    const isSyncHovered = this.hoveredActionRow === 24 || this.hoveredActionRow === 18;
     const syncLine = `    ${isSyncHovered || isSyncFocused ? theme.bgHover(` ${theme.cyan("[ Enter ] Sincronizar")} `) : `${theme.cyan("[ Enter ]")} Sincronizar`}`;
     leftContent.push(syncLine);
 
-    // Row 19: Restaurar
-    const isRestoreFocused = this.selectedRowIndex === 7;
-    const isRestoreHovered = this.hoveredActionRow === 19;
+    // Row index 13: Restaurar
+    const isRestoreFocused = this.selectedRowIndex === 13;
+    const isRestoreHovered = this.hoveredActionRow === 25 || this.hoveredActionRow === 19;
     const restoreLine = `    ${isRestoreHovered || isRestoreFocused ? theme.bgHover(` ${theme.yellow("[ R ] Restaurar")} `) : `${theme.yellow("[ R ]")} Restaurar`}`;
     leftContent.push(restoreLine);