diff --git a/open-sse/services/accountSemaphore.ts b/open-sse/services/accountSemaphore.ts
index ddb629e12e..ec0f06f090 100644
--- a/open-sse/services/accountSemaphore.ts
+++ b/open-sse/services/accountSemaphore.ts
@@ -200,7 +200,9 @@ export function acquire(
     return Promise.reject(makeAbortError(signal));
   }
 
-  const gate = ensureGate(semaphoreKey, maxConcurrency);
+  // isBypassed() above already excluded null/<=0 — ensureGate requires a plain
+  // number, but a boolean-returning helper isn't a type predicate TS can narrow on.
+  const gate = ensureGate(semaphoreKey, maxConcurrency as number);
   clearCleanupTimer(gate);
 
   if (gate.running < gate.maxConcurrency && !isBlocked(gate)) {
diff --git a/open-sse/services/antigravityProjectPersistence.ts b/open-sse/services/antigravityProjectPersistence.ts
new file mode 100644
index 0000000000..066179a890
--- /dev/null
+++ b/open-sse/services/antigravityProjectPersistence.ts
@@ -0,0 +1,35 @@
+/**
+ * Prefer Antigravity connections with a discovered/stored `projectId` for
+ * reset-aware quota routing (#7719 follow-up).
+ *
+ * Antigravity's Code Assist API is scoped per-project — a connection whose
+ * `projectId` was never discovered (no `loadCodeAssist` round-trip has
+ * completed yet, see antigravityProjectPersist.ts) cannot serve a request
+ * reliably. Preferring connections that already have one avoids routing
+ * reset-aware traffic to an account that will just re-trigger discovery.
+ *
+ * This is a preference, not a hard requirement: if none of the candidate
+ * connections have a stored projectId yet (e.g. a freshly added account),
+ * excluding all of them would empty the reset-aware pool entirely, which is
+ * worse than routing to an undiscovered connection. Fail open to the full
+ * list in that case.
+ */
+
+function hasStoredProjectId(connection: Record<string, unknown>): boolean {
+  if (typeof connection.projectId === "string" && connection.projectId.trim().length > 0) {
+    return true;
+  }
+  const providerSpecificData = connection.providerSpecificData;
+  if (providerSpecificData && typeof providerSpecificData === "object") {
+    const nested = (providerSpecificData as Record<string, unknown>).projectId;
+    if (typeof nested === "string" && nested.trim().length > 0) return true;
+  }
+  return false;
+}
+
+export function preferAntigravityConnectionsWithStoredProject<
+  T extends Record<string, unknown>,
+>(connections: T[]): T[] {
+  const withStoredProject = connections.filter(hasStoredProjectId);
+  return withStoredProject.length > 0 ? withStoredProject : connections;
+}
diff --git a/open-sse/services/combo/comboStructure.ts b/open-sse/services/combo/comboStructure.ts
index 58a8b99538..5bb4bbaaf3 100644
--- a/open-sse/services/combo/comboStructure.ts
+++ b/open-sse/services/combo/comboStructure.ts
@@ -137,7 +137,7 @@ function normalizeRuntimeStep(
       : {}),
     weight,
     label,
-    prompt: step.prompt || null,
+    prompt: step.kind === "model" ? step.prompt || null : null,
   } satisfies ResolvedComboTarget;
 }
 
@@ -533,8 +533,6 @@ function hasKnownCompatibleContextLimit(
   return evaluateContextLimit(capabilities, requirements, target.modelStr) === true;
 }
 
-const HARD_COMPAT_REASONS = new Set(["tools", "vision", "structured_output", "output_tokens"]);
-
 /**
  * #8332: vision is a hard requirement, not a soft preference — a target whose vision
  * support is not confirmed can never succeed on an image_url request. Callers
diff --git a/open-sse/services/combo/fusionPanel.ts b/open-sse/services/combo/fusionPanel.ts
index 6397c5120c..20540d5850 100644
--- a/open-sse/services/combo/fusionPanel.ts
+++ b/open-sse/services/combo/fusionPanel.ts
@@ -10,7 +10,7 @@
  * literal `auto/*` string panel member already behaves via the single-
  * dispatch safety net in src/sse/handlers/chat.ts.
  */
-import { normalizeComboStep } from "../../../src/lib/combos/steps.ts";
+import { getComboModelString, normalizeComboStep } from "../../../src/lib/combos/steps.ts";
 import { executeComboRefUnit } from "./runtimeUnits.ts";
 import type {
   ComboCollectionLike,
@@ -51,7 +51,11 @@ export function extractFusionPanelSpec(
       panel.push(step.comboName);
       return;
     }
-    panel.push(step.model);
+    // Provider-wildcard steps have no concrete model to dispatch — fusion is a
+    // fixed-size panel of literal models/combo-refs, not a wildcard-expanding
+    // strategy (see file header). Skip rather than push an undefined model.
+    const modelStr = getComboModelString(step);
+    if (modelStr) panel.push(modelStr);
   });
   return { panel, comboRefUnits };
 }
diff --git a/open-sse/services/combo/quotaStrategies.ts b/open-sse/services/combo/quotaStrategies.ts
index 2e117f74fe..822ee57409 100644
--- a/open-sse/services/combo/quotaStrategies.ts
+++ b/open-sse/services/combo/quotaStrategies.ts
@@ -89,9 +89,7 @@ async function getQuotaAwareConnectionsForTarget(
               ? (connections as Array<Record<string, unknown>>)
               : [];
             if (provider === "antigravity" || provider === "agy") {
-              activeConnections = preferAntigravityConnectionsWithStoredProject(
-                activeConnections
-              ) as Array<Record<string, unknown>>;
+              activeConnections = preferAntigravityConnectionsWithStoredProject(activeConnections);
             }
             if (
               !resetAwareConnectionCache.has(provider) &&
diff --git a/open-sse/services/compression/engines/ccr/index.ts b/open-sse/services/compression/engines/ccr/index.ts
index e854666182..6d8d1e2f03 100644
--- a/open-sse/services/compression/engines/ccr/index.ts
+++ b/open-sse/services/compression/engines/ccr/index.ts
@@ -292,7 +292,10 @@ function rehydrateEntry(hash: string, principalId: string, now: number): CcrEntr
 
   // Re-admit through the same budgets a fresh store would face. If the block no longer
   // fits, it stays on disk and is served straight from the row instead of being cached.
-  if (enforcePrincipalBudget(entry.principalId, entry.bytes) && enforceGlobalBudget(entry.bytes)) {
+  if (
+    enforcePrincipalBudget(entry.principalId, entry.bytes) &&
+    enforceGlobalBudget(entry.principalId, entry.bytes)
+  ) {
     const key = buildStoreKey(hash, principalId === ANON ? undefined : principalId);
     ccrStore.set(key, entry);
     ccrTotalBytes += entry.bytes;
diff --git a/open-sse/services/firecrawlQuotaFetcher.ts b/open-sse/services/firecrawlQuotaFetcher.ts
index 9f0784fa06..92a8bb0a87 100644
--- a/open-sse/services/firecrawlQuotaFetcher.ts
+++ b/open-sse/services/firecrawlQuotaFetcher.ts
@@ -120,7 +120,7 @@ export function getFirecrawlBaseUrl(connection?: Record<string, unknown>): strin
 export async function fetchFirecrawlQuota(
   connectionId: string,
   connection?: Record<string, unknown>
-): Promise<QuotaInfo | null> {
+): Promise<FirecrawlQuota | null> {
   const cached = quotaCache.get(connectionId);
   if (cached && Date.now() - cached.fetchedAt < CACHE_TTL_MS) {
     return cached.quota;