fix: address mobile connection review feedback

Author: arul28

apps/ade-cli/src/headlessLinearServices.ts

@@ -396,7 +396,7 @@ function createHeadlessAgentChatService(projectRoot: string): HeadlessLinearServ
   const identitySessionIds = new Map<string, string>();
   const transcripts = new Map<string, HeadlessTranscriptEntry[]>();
 
-  const HEADLESS_MODEL_ID = "openai/gpt-5.5-codex";
+  const HEADLESS_MODEL_ID = "openai/gpt-5.5";
 
   const clipText = (value: string, maxChars: number): string => {
     const trimmed = value.trim();

apps/desktop/src/main/services/chat/agentChatService.ts

@@ -1277,6 +1277,17 @@ function validateReasoningEffort(provider: "codex" | "claude", effort: string |
   return known.has(aliased) ? aliased : fallback;
 }
 
+function resolveCodexReasoningEffortForRuntime(
+  primary: string | null | undefined,
+  fallback?: string | null,
+): string {
+  return (
+    validateReasoningEffort("codex", normalizeReasoningEffort(primary))
+    ?? validateReasoningEffort("codex", normalizeReasoningEffort(fallback))
+    ?? DEFAULT_REASONING_EFFORT
+  );
+}
+
 function buildClaudeV2ExecutableArgs(args: {
   supportsReasoning: boolean;
   effort?: string | null;
@@ -2290,11 +2301,7 @@ function applyCodexEffectiveThreadState(
     ),
   );
   if (reasoningEffort) {
-    const requestedReasoningEffort = validateReasoningEffort(
-      "codex",
-      normalizeReasoningEffort(managed.session.reasoningEffort),
-    );
-    managed.session.reasoningEffort = requestedReasoningEffort ?? reasoningEffort;
+    managed.session.reasoningEffort = reasoningEffort;
   }
 
   managed.session.permissionMode = syncLegacyPermissionMode(managed.session) ?? managed.session.permissionMode;
@@ -13741,11 +13748,16 @@ export function createAgentChatService(args: {
 
         if (threadIdToResume) {
           try {
+            const resumeReasoningEffort = resolveCodexReasoningEffortForRuntime(
+              managed.session.reasoningEffort,
+              readPersistedState(sessionId)?.reasoningEffort,
+            );
+            managed.session.reasoningEffort = resumeReasoningEffort;
             const resumeResponse = await runtime.request<CodexThreadLifecycleResponse>("thread/resume", {
               threadId: threadIdToResume,
               model: managed.session.model,
               cwd: managed.laneWorktreePath,
-              reasoningEffort: managed.session.reasoningEffort ?? readPersistedState(sessionId)?.reasoningEffort ?? DEFAULT_REASONING_EFFORT,
+              reasoningEffort: resumeReasoningEffort,
               ...codexPolicyArgs(codexPolicy),
               persistExtendedHistory: true
             });
@@ -14527,9 +14539,10 @@ export function createAgentChatService(args: {
 
     if (managed.session.provider === "codex") {
       const runtime = await ensureCodexSessionRuntime(managed);
-      if (!managed.session.reasoningEffort) {
-        managed.session.reasoningEffort = persisted?.reasoningEffort ?? DEFAULT_REASONING_EFFORT;
-      }
+      managed.session.reasoningEffort = resolveCodexReasoningEffortForRuntime(
+        managed.session.reasoningEffort,
+        persisted?.reasoningEffort,
+      );
       const threadId = persisted?.threadId ?? managed.session.threadId;
       if (threadId) {
         const { codexPolicy } = resolveCodexThreadParams(managed);
@@ -14538,7 +14551,7 @@ export function createAgentChatService(args: {
             threadId,
             model: managed.session.model,
             cwd: managed.laneWorktreePath,
-            reasoningEffort: managed.session.reasoningEffort ?? DEFAULT_REASONING_EFFORT,
+            reasoningEffort: managed.session.reasoningEffort,
             ...codexPolicyArgs(codexPolicy),
             persistExtendedHistory: true
           });

apps/desktop/src/main/services/sync/syncHostService.test.ts

@@ -1073,7 +1073,7 @@ describe.skipIf(!isCrsqliteAvailable())("syncHostService", () => {
 
     const rebroadcast = await clientB.queue.next("changeset_batch");
     const payload = rebroadcast.payload as {
-      batchId?: string;
+      batchId: string;
       fromDbVersion: number;
       toDbVersion: number;
       changes: unknown[];
@@ -1084,9 +1084,9 @@ describe.skipIf(!isCrsqliteAvailable())("syncHostService", () => {
     expect(host.getPeerStates().find((peer) => peer.deviceId === "peer-b")?.syncLag).toBeGreaterThan(0);
     clientB.ws.send(encodeSyncEnvelope({
       type: "changeset_ack",
-      requestId: payload.batchId ?? "rebroadcast-ack",
+      requestId: payload.batchId,
       payload: {
-        batchId: payload.batchId ?? null,
+        batchId: payload.batchId,
         fromDbVersion: payload.fromDbVersion,
         toDbVersion: payload.toDbVersion,
         appliedDbVersion: dbB.sync.getDbVersion(),

apps/desktop/src/main/services/sync/syncHostService.ts

@@ -106,6 +106,7 @@ const PEER_BACKPRESSURE_BYTES = 4 * 1024 * 1024;
 const MOBILE_COMMAND_RESULT_CACHE_TTL_MS = 30 * 60 * 1000;
 const MOBILE_COMMAND_RESULT_CACHE_MAX_ENTRIES = 512;
 const CHANGESET_ACK_TIMEOUT_MS = 10_000;
+const MAX_CHANGESET_ACK_RETRIES = 6;
 const LANE_PRESENCE_TTL_MS = 60_000;
 const SYNC_MDNS_SERVICE_TYPE = "ade-sync";
 export const SYNC_TAILNET_DISCOVERY_SERVICE_NAME = "svc:ade-sync";
@@ -185,8 +186,6 @@ type PersistedMobileCommand = {
   completedAtMs: number;
 };
 
-const mobileCommandResultCache = new Map<string, CachedMobileCommand>();
-
 function stableJsonValue(value: unknown): unknown {
   if (value == null) return value;
   if (Array.isArray(value)) return value.map(stableJsonValue);
@@ -214,31 +213,6 @@ function addMobileCommandWaiter(record: CachedMobileCommand, peer: PeerState, re
   record.waiters.push({ peer, requestId });
 }
 
-function pruneMobileCommandResultCache(nowMs = Date.now()): void {
-  for (const [key, record] of mobileCommandResultCache) {
-    const referenceMs = record.completedAtMs ?? record.acceptedAtMs;
-    if (nowMs - referenceMs > MOBILE_COMMAND_RESULT_CACHE_TTL_MS) {
-      mobileCommandResultCache.delete(key);
-    }
-  }
-  if (mobileCommandResultCache.size <= MOBILE_COMMAND_RESULT_CACHE_MAX_ENTRIES) return;
-
-  const completed = [...mobileCommandResultCache.entries()]
-    .filter(([, record]) => record.completedAtMs != null)
-    .sort(([, left], [, right]) => (left.completedAtMs ?? left.acceptedAtMs) - (right.completedAtMs ?? right.acceptedAtMs));
-  for (const [key] of completed) {
-    if (mobileCommandResultCache.size <= MOBILE_COMMAND_RESULT_CACHE_MAX_ENTRIES) break;
-    mobileCommandResultCache.delete(key);
-  }
-  const inFlight = [...mobileCommandResultCache.entries()]
-    .filter(([, record]) => record.completedAtMs == null)
-    .sort(([, left], [, right]) => left.acceptedAtMs - right.acceptedAtMs);
-  for (const [key] of inFlight) {
-    if (mobileCommandResultCache.size <= MOBILE_COMMAND_RESULT_CACHE_MAX_ENTRIES) break;
-    mobileCommandResultCache.delete(key);
-  }
-}
-
 type SyncHostServiceArgs = {
   db: AdeDb;
   logger: Logger;
@@ -523,11 +497,30 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
   };
 
   const peers = new Set<PeerState>();
+  const mobileCommandResultCache = new Map<string, CachedMobileCommand>();
   let commandReplayCount = 0;
   let commandConflictCount = 0;
   let lastCommandResultLatencyMs: number | null = null;
   let lastChangesetAckLatencyMs: number | null = null;
 
+  const pruneMobileCommandResultCache = (nowMs = Date.now()): void => {
+    for (const [key, record] of mobileCommandResultCache) {
+      if (record.completedAtMs == null) continue;
+      if (nowMs - record.completedAtMs > MOBILE_COMMAND_RESULT_CACHE_TTL_MS) {
+        mobileCommandResultCache.delete(key);
+      }
+    }
+    if (mobileCommandResultCache.size <= MOBILE_COMMAND_RESULT_CACHE_MAX_ENTRIES) return;
+
+    const completed = [...mobileCommandResultCache.entries()]
+      .filter(([, record]) => record.completedAtMs != null)
+      .sort(([, left], [, right]) => (left.completedAtMs ?? left.acceptedAtMs) - (right.completedAtMs ?? right.acceptedAtMs));
+    for (const [key] of completed) {
+      if (mobileCommandResultCache.size <= MOBILE_COMMAND_RESULT_CACHE_MAX_ENTRIES) break;
+      mobileCommandResultCache.delete(key);
+    }
+  };
+
   const readPersistedCommandLedger = (): PersistedMobileCommand[] => {
     try {
       if (!fs.existsSync(commandLedgerPath)) return [];
@@ -1698,6 +1691,21 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       if (peer.pendingChangesetBatch) {
         if (nowMs - peer.pendingChangesetBatch.sentAtMs >= CHANGESET_ACK_TIMEOUT_MS) {
           const pending = peer.pendingChangesetBatch;
+          if (pending.retryCount >= MAX_CHANGESET_ACK_RETRIES) {
+            args.logger.warn("sync_host.changeset_ack_timeout", {
+              peerDeviceId: peer.metadata.deviceId,
+              batchId: pending.batchId,
+              fromDbVersion: pending.fromDbVersion,
+              toDbVersion: pending.toDbVersion,
+              retryCount: pending.retryCount,
+            });
+            try {
+              peer.ws.close(4000, "Changeset acknowledgement timed out");
+            } catch {
+              // ignore close failures
+            }
+            continue;
+          }
           const resent = resendPendingChangesetBatch(peer);
           args.logger.debug("sync_host.changeset_ack_retry", {
             peerDeviceId: peer.metadata.deviceId,
@@ -1736,19 +1744,28 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       args.logger.debug("sync_host.changeset_ack_ignored", {
         peerDeviceId: peer.metadata?.deviceId ?? null,
         expectedBatchId: pending.batchId,
-        receivedBatchId: payload.batchId ?? null,
+        receivedBatchId: payload.batchId,
       });
       return;
     }
     if (!payload.ok) {
+      pending.retryCount += 1;
       pending.sentAtMs = Date.now();
       args.logger.warn("sync_host.changeset_ack_failed", {
         peerDeviceId: peer.metadata?.deviceId ?? null,
         batchId: pending.batchId,
         fromDbVersion: pending.fromDbVersion,
         toDbVersion: pending.toDbVersion,
+        retryCount: pending.retryCount,
         error: payload.error?.message ?? "Changeset apply failed.",
       });
+      if (pending.retryCount >= MAX_CHANGESET_ACK_RETRIES) {
+        try {
+          peer.ws.close(4000, "Changeset apply failed repeatedly");
+        } catch {
+          // ignore close failures
+        }
+      }
       return;
     }
     if (payload.toDbVersion < pending.toDbVersion) return;
@@ -2306,6 +2323,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       }
       case "changeset_batch": {
         const payload = (envelope.payload ?? {}) as SyncChangesetBatchPayload;
+        const batchId = payload.batchId || envelope.requestId || "";
         const changes = Array.isArray(payload.changes) ? payload.changes as CrsqlChangeRow[] : [];
         try {
           let appliedCount = 0;
@@ -2318,7 +2336,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
             broadcastBrainStatus();
           }
           sendRequired(peer, "changeset_ack", {
-            batchId: payload.batchId ?? null,
+            batchId,
             fromDbVersion: Number(payload.fromDbVersion ?? 0),
             toDbVersion: Number(payload.toDbVersion ?? 0),
             appliedDbVersion: args.db.sync.getDbVersion(),
@@ -2327,7 +2345,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
           } satisfies SyncChangesetAckPayload, envelope.requestId);
         } catch (error) {
           sendRequired(peer, "changeset_ack", {
-            batchId: payload.batchId ?? null,
+            batchId,
             fromDbVersion: Number(payload.fromDbVersion ?? 0),
             toDbVersion: Number(payload.toDbVersion ?? 0),
             appliedDbVersion: args.db.sync.getDbVersion(),

apps/desktop/src/main/services/sync/syncPeerService.ts

@@ -139,7 +139,7 @@ export function createSyncPeerService(args: SyncPeerServiceArgs) {
   ) => {
     if (!ws || ws.readyState !== WebSocket.OPEN) return;
     const payload: SyncChangesetAckPayload = {
-      batchId: batch.batchId ?? null,
+      batchId: batch.batchId,
       fromDbVersion: Number(batch.fromDbVersion ?? 0),
       toDbVersion: Number(batch.toDbVersion ?? 0),
       appliedDbVersion,
@@ -152,7 +152,7 @@ export function createSyncPeerService(args: SyncPeerServiceArgs) {
     ws.send(
       encodeSyncEnvelope({
         type: "changeset_ack",
-        requestId: batch.batchId ?? null,
+        requestId: batch.batchId,
         payload,
         compressionThresholdBytes: DEFAULT_SYNC_COMPRESSION_THRESHOLD_BYTES,
       }),
@@ -250,6 +250,7 @@ export function createSyncPeerService(args: SyncPeerServiceArgs) {
       }
     }
     ws = null;
+    pendingOutboundChangeset = null;
     latestBrainStatus = null;
     status.state = state;
     status.connectedAt = null;
@@ -329,8 +330,18 @@ export function createSyncPeerService(args: SyncPeerServiceArgs) {
           break;
         }
         if (payload.toDbVersion < pendingOutboundChangeset.payload.toDbVersion) break;
+        const acknowledgedRemoteVersion = Math.max(
+          latestRemoteDbVersion,
+          pendingOutboundChangeset.payload.toDbVersion,
+          Math.floor(payload.toDbVersion ?? 0),
+        );
+        latestRemoteDbVersion = acknowledgedRemoteVersion;
+        if (connectionDraft) {
+          connectionDraft.lastRemoteDbVersion = acknowledgedRemoteVersion;
+        }
         outboundLocalDbVersion = Math.max(outboundLocalDbVersion, pendingOutboundChangeset.payload.toDbVersion);
         pendingOutboundChangeset = null;
+        emitStatus();
         break;
       }
       case "brain_status": {

apps/desktop/src/main/services/usage/usageTrackingService.test.ts

@@ -319,6 +319,13 @@ describe("resolveTokenPrice", () => {
   it("returns mini pricing for mini OpenAI models", () => {
     const price = resolveTokenPrice("gpt-5.4-mini");
     expect(price.input).toBe(0.3 / 1_000_000);
+    expect(price.output).toBe(1.2 / 1_000_000);
+  });
+
+  it("does not treat Gemini as a mini OpenAI model", () => {
+    const price = resolveTokenPrice("gemini-2.5-pro");
+    expect(price.input).toBe(3 / 1_000_000);
+    expect(price.output).toBe(15 / 1_000_000);
   });
 
   it("returns default pricing for unknown models", () => {

apps/desktop/src/main/services/usage/usageTrackingService.ts

@@ -512,10 +512,11 @@ interface TokenEntry {
 
 function resolveTokenPrice(model: string): { input: number; output: number } {
   const lower = (model ?? "").toLowerCase();
+  const isMiniModel = /(?:^|[\/._-])mini(?:$|[\/._-])/.test(lower);
   if (lower.includes("opus")) return TOKEN_PRICES["claude-opus"]!;
   if (lower.includes("sonnet")) return TOKEN_PRICES["claude-sonnet"]!;
   if (lower.includes("haiku")) return TOKEN_PRICES["claude-haiku"]!;
-  if (lower.includes("mini")) return TOKEN_PRICES["openai-mini"]!;
+  if (isMiniModel) return TOKEN_PRICES["openai-mini"]!;
   if (lower.includes("codex") || lower.includes("gpt") || lower.includes("o3") || lower.includes("o4"))
     return TOKEN_PRICES["codex"]!;
   return TOKEN_PRICES["default"]!;

apps/desktop/src/renderer/components/chat/AgentChatPane.submit.test.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { MemoryRouter, Route, Routes, useLocation } from "react-router-dom";
 import type {
   AgentChatEventEnvelope,
@@ -1202,28 +1202,35 @@ describe("AgentChatPane submit recovery", () => {
   });
 
   it("does not hydrate hidden inactive chat tiles", async () => {
+    vi.useFakeTimers();
     const session = buildSession("hidden-inactive-chat", {
       title: "Hidden inactive chat",
     });
     installAdeMocks({ sessions: [session] });
     const readTranscriptTail = vi.fn().mockResolvedValue("");
     window.ade.sessions.readTranscriptTail = readTranscriptTail as any;
 
-    render(
-      <MemoryRouter>
-        <AgentChatPane
-          laneId={session.laneId}
-          lockSessionId={session.sessionId}
-          hideSessionTabs
-          initialSessionSummary={session}
-          layoutVariant="grid-tile"
-          isTileActive={false}
-        />
-      </MemoryRouter>,
-    );
-
-    await new Promise((resolve) => window.setTimeout(resolve, 550));
-    expect(readTranscriptTail).not.toHaveBeenCalled();
+    try {
+      render(
+        <MemoryRouter>
+          <AgentChatPane
+            laneId={session.laneId}
+            lockSessionId={session.sessionId}
+            hideSessionTabs
+            initialSessionSummary={session}
+            layoutVariant="grid-tile"
+            isTileActive={false}
+          />
+        </MemoryRouter>,
+      );
+
+      await act(async () => {
+        vi.advanceTimersByTime(550);
+      });
+      expect(readTranscriptTail).not.toHaveBeenCalled();
+    } finally {
+      vi.useRealTimers();
+    }
   });
 
   it("shows 'New chat' in the header when no session is selected", async () => {