diff --git a/.github/pr-assets/macos-menu-header-update.png b/.github/pr-assets/macos-menu-header-update.png
new file mode 100644
index 00000000000..df8b6bf63d1
Binary files /dev/null and b/.github/pr-assets/macos-menu-header-update.png differ
diff --git a/app/Sources/MenuBarCore/PollingCoordinator.swift b/app/Sources/MenuBarCore/PollingCoordinator.swift
index 0960ad0a55d..f6b3a973309 100644
--- a/app/Sources/MenuBarCore/PollingCoordinator.swift
+++ b/app/Sources/MenuBarCore/PollingCoordinator.swift
@@ -40,6 +40,7 @@ public actor PollingCoordinator {
     /// Attempt time, distinct from success time: a persistently failing quota endpoint
     /// must still respect the slower cadence.
     private var lastQuotaAttempt: Date?
+    private var lastUsageAttempt: Date?
 
     public init(client: ProxyClient, endpoint: ProxyEndpoint) {
         self.client = client
@@ -174,6 +175,9 @@ public actor PollingCoordinator {
         }
 
         if popoverOpen {
+            let previousOpenCodeGoActivity = Set(snapshot.activity?.activities.compactMap { activity in
+                activity.provider?.lowercased() == "opencode-go" ? activity.id : nil
+            } ?? [])
             await refreshActivity(cycle: cycle)
             guard isCurrent(cycle) else {
                 refreshInFlight = false
@@ -184,6 +188,12 @@ public actor PollingCoordinator {
             // tick would turn a rarely changing endpoint into a two-second poller.
             if includeHeavy { await refreshOnOpen(cycle: cycle) }
 
+            let currentOpenCodeGoActivity = Set(snapshot.activity?.activities.compactMap { activity in
+                activity.provider?.lowercased() == "opencode-go" ? activity.id : nil
+            } ?? [])
+            let completedOpenCodeGoRequest = snapshot.activityLoaded
+                && !previousOpenCodeGoActivity.isSubset(of: currentOpenCodeGoActivity)
+
             // Rate-limit on ATTEMPT, not success, so a persistently failing endpoint is
             // not retried on every two-second activity cycle.
             let quotaDue = forceQuotaRefresh || (lastQuotaAttempt.map {
@@ -193,6 +203,12 @@ public actor PollingCoordinator {
                 lastQuotaAttempt = Date()
                 await refreshQuotas(cycle: cycle, forceRefresh: forceQuotaRefresh)
             }
+            let usageDue = includeHeavy || forceQuotaRefresh || completedOpenCodeGoRequest || (lastUsageAttempt.map {
+                Date().timeIntervalSince($0) >= Self.heavyInterval
+            } ?? true)
+            if usageDue, isCurrent(cycle) {
+                await refreshOpenCodeGoUsage(cycle: cycle)
+            }
         }
 
         if cycle == generation { publish() }
@@ -292,6 +308,29 @@ public actor PollingCoordinator {
         }
     }
 
+    /// Usage is a completed-request ledger. Fetch on open, on a finished Go
+    /// request, and at the heavy cadence; never poll it every two seconds.
+    private func refreshOpenCodeGoUsage(cycle: Int) async {
+        guard isCurrent(cycle) else { return }
+        guard snapshot.providersLoaded else { return }
+        guard snapshot.providers.contains(where: { $0.name.lowercased() == "opencode-go" && $0.isEnabled }) else {
+            snapshot.openCodeGoModelUsage = []
+            snapshot.openCodeGoUsageLoaded = false
+            snapshot.openCodeGoUsageUpdatedAt = nil
+            return
+        }
+        lastUsageAttempt = Date()
+        guard let usage = try? await client.usageLast30Days(), isCurrent(cycle) else { return }
+        snapshot.openCodeGoModelUsage = usage.models.filter {
+            $0.provider.lowercased() == "opencode-go"
+                && !$0.model.isEmpty
+                && $0.requests >= 0
+                && $0.totalTokens >= 0
+        }
+        snapshot.openCodeGoUsageLoaded = true
+        snapshot.openCodeGoUsageUpdatedAt = Date()
+    }
+
     /// Readiness is an orthogonal observation. Once authenticated startup health has
     /// succeeded, a public-probe transport or contract failure means "unavailable"—it
     /// must not be allowed to rewrite the live process as stopped or degraded.
diff --git a/app/Sources/MenuBarCore/ProxyClient.swift b/app/Sources/MenuBarCore/ProxyClient.swift
index f1d7db37a8c..b37bc6fbf66 100644
--- a/app/Sources/MenuBarCore/ProxyClient.swift
+++ b/app/Sources/MenuBarCore/ProxyClient.swift
@@ -299,6 +299,28 @@ public actor ProxyClient {
         try await authenticatedGet("api/codex-routing")
     }
 
+    public func codexCatalogStatus() async throws -> CodexCatalogStatus {
+        try await authenticatedGet("api/codex-catalog/status")
+    }
+
+    /// Explicit panel refresh uses the same non-disruptive sync as `ccx sync`.
+    /// Catalog gathering can exceed ordinary management mutation timeouts.
+    public func syncCodexCatalog() async throws -> CodexCatalogSyncOutcome {
+        let data = try await authenticatedSend(
+            method: "POST",
+            path: "api/sync",
+            body: nil as EmptyBody?,
+            timeout: 90
+        )
+        let response: CodexCatalogSyncResponse
+        do {
+            response = try JSONDecoder().decode(CodexCatalogSyncResponse.self, from: data)
+        } catch {
+            throw ProxyError.decoding
+        }
+        return response.outcome
+    }
+
     /// Public post-startup readiness. This request intentionally carries no management
     /// credential, and accepts the endpoint's contractually meaningful 503 response for
     /// `pending` and `failed` observations.
@@ -356,6 +378,13 @@ public actor ProxyClient {
         )
     }
 
+    public func usageLast30Days() async throws -> ProviderUsageEnvelope {
+        try await authenticatedGet(
+            "api/usage",
+            query: [URLQueryItem(name: "range", value: "30d")]
+        )
+    }
+
     public func restart() async throws -> RestartAccepted {
         let data = try await authenticatedSend(
             method: "POST",
@@ -494,7 +523,8 @@ public actor ProxyClient {
         method: String,
         path: String,
         query: [URLQueryItem] = [],
-        body: Body?
+        body: Body?,
+        timeout: TimeInterval? = nil
     ) async throws -> Data {
         // First attempt: fresh descriptors + identity check immediately before the
         // credential-bearing request.
@@ -505,7 +535,8 @@ public actor ProxyClient {
                 method: method,
                 path: path,
                 query: query,
-                body: body
+                body: body,
+                timeout: timeout
             )
         } catch ProxyError.unauthorized {
             // Exactly one retry. Rediscovery may pick up a rotated token or replacement
@@ -516,7 +547,8 @@ public actor ProxyClient {
                 method: method,
                 path: path,
                 query: query,
-                body: body
+                body: body,
+                timeout: timeout
             )
         }
     }
@@ -526,7 +558,8 @@ public actor ProxyClient {
         method: String,
         path: String,
         query: [URLQueryItem],
-        body: Body?
+        body: Body?,
+        timeout: TimeInterval?
     ) async throws -> Data {
         guard installation.credential?.isEmpty == false else {
             throw ProxyError.authenticationUnavailable
@@ -558,7 +591,7 @@ public actor ProxyClient {
             query: query,
             body: body,
             credential: credential,
-            timeout: method == "GET" ? 4 : 8
+            timeout: timeout ?? (method == "GET" ? 4 : 8)
         )
     }
 
diff --git a/app/Sources/MenuBarCore/ProxyModels.swift b/app/Sources/MenuBarCore/ProxyModels.swift
index bf5e4427959..e93803086ca 100644
--- a/app/Sources/MenuBarCore/ProxyModels.swift
+++ b/app/Sources/MenuBarCore/ProxyModels.swift
@@ -148,6 +148,89 @@ public struct CodexRouteStatus: Decodable, Equatable, Sendable {
     }
 }
 
+/// Read-only activation observation from `GET /api/codex-catalog/status`.
+/// A restart prompt requires both a published catalog and confirmed stale workers;
+/// an unknown or pending status must not tell the user a restart will fix it.
+public enum CatalogReloadStatus: Equatable, Sendable {
+    case unknown
+    case current
+    case restartRequired(staleWorkerCount: Int)
+}
+
+/// Closed result contract from authenticated `POST /api/sync`.
+public enum CodexCatalogSyncStatus: String, Decodable, Equatable, Sendable {
+    case applied
+    case skipped
+    case refused
+}
+
+public enum CodexCatalogSyncSkipReason: String, Decodable, Equatable, Sendable {
+    case desiredDisabled = "desired_disabled"
+    case externalProvider = "external_provider"
+}
+
+public struct CodexCatalogSyncResponse: Decodable, Equatable, Sendable {
+    public let status: CodexCatalogSyncStatus
+    public let ok: Bool
+    public let skippedReason: CodexCatalogSyncSkipReason?
+    public let warning: String?
+
+    public var outcome: CodexCatalogSyncOutcome {
+        guard ok else { return .failed }
+        switch status {
+        case .applied:
+            return .applied(warning: warning)
+        case .skipped:
+            guard let skippedReason else { return .failed }
+            return .skipped(skippedReason)
+        case .refused:
+            return .failed
+        }
+    }
+}
+
+public enum CodexCatalogSyncOutcome: Equatable, Sendable {
+    case applied(warning: String?)
+    case skipped(CodexCatalogSyncSkipReason)
+    case failed
+}
+
+public struct CodexCatalogStatus: Decodable, Sendable {
+    public struct Activation: Decodable, Sendable {
+        public struct State: Decodable, Sendable {
+            public let status: String
+        }
+
+        public struct Workers: Decodable, Sendable {
+            public let status: String
+            public let staleCount: Int
+        }
+
+        public let schemaVersion: Int
+        public let catalog: State
+        public let routing: State
+        public let workers: Workers
+    }
+
+    public let activation: Activation
+
+    public var reloadStatus: CatalogReloadStatus {
+        guard activation.schemaVersion == 1,
+              activation.catalog.status == "current",
+              activation.routing.status == "current"
+        else { return .unknown }
+
+        switch activation.workers.status {
+        case "reload_required" where activation.workers.staleCount > 0:
+            return .restartRequired(staleWorkerCount: activation.workers.staleCount)
+        case "current", "not_running":
+            return .current
+        default:
+            return .unknown
+        }
+    }
+}
+
 /// `GET /api/startup-health`
 public struct StartupHealth: Decodable, Equatable, Sendable {
     public let status: String
@@ -265,13 +348,13 @@ public struct QuotaWindow: Decodable, Equatable, Sendable {
     public let resetAt: Double?
 }
 
-/// A published provider cap paired with observations from this local CodexCommander usage
-/// log. This is reference data, not a provider-reported balance or remaining percent.
+/// Observations from this local CodexCommander usage log. Older proxy versions may
+/// include a published cap, but it is not a provider-reported balance or current limit.
 public struct QuotaReferenceWindow: Decodable, Equatable, Sendable {
     public let id: String
     public let label: String
     public let windowSeconds: Double
-    public let publishedLimitUsd: Double
+    public let publishedLimitUsd: Double?
     public let observedSpendUsd: Double?
     public let observedTokens: Int64
     public let observedRequests: Int
@@ -381,6 +464,24 @@ public struct ProviderQuotaEnvelope: Decodable, Equatable, Sendable {
     public let availability: [ProviderQuotaAvailability]
 }
 
+/// Completed local requests in the management usage log. These are observations,
+/// not an OpenCode Go account balance or a live token counter.
+public struct ProviderModelUsage: Decodable, Equatable, Sendable {
+    public let provider: String
+    public let model: String
+    public let requests: Int
+    public let measuredRequests: Int
+    public let totalTokens: Int64
+    public let inputTokens: Int64
+    public let outputTokens: Int64
+    public let estimatedCostUsd: Double?
+}
+
+public struct ProviderUsageEnvelope: Decodable, Equatable, Sendable {
+    public let generatedAt: Double
+    public let models: [ProviderModelUsage]
+}
+
 public enum AgentActivityRole: String, Decodable, Equatable, Sendable {
     case primary
     case subagent
diff --git a/app/Sources/MenuBarCore/ProxySnapshot.swift b/app/Sources/MenuBarCore/ProxySnapshot.swift
index a9d03af3bf8..dc6e8e0a14d 100644
--- a/app/Sources/MenuBarCore/ProxySnapshot.swift
+++ b/app/Sources/MenuBarCore/ProxySnapshot.swift
@@ -125,6 +125,10 @@ public struct ProxySnapshot: Equatable, Sendable {
     public var quotaAvailability: [ProviderQuotaAvailability]
     public var activity: AgentActivitySnapshot?
     public var providers: [ProviderSummary]
+    /// Completed OpenCode Go requests over the last 30 days, from /api/usage.
+    public var openCodeGoModelUsage: [ProviderModelUsage]
+    public var openCodeGoUsageLoaded: Bool
+    public var openCodeGoUsageUpdatedAt: Date?
     public var lastUpdated: Date?
     public var consecutiveFailures: Int
     /// Remembered from the last successful health read, so a stopped proxy can still
@@ -149,6 +153,9 @@ public struct ProxySnapshot: Equatable, Sendable {
         quotaAvailability: [ProviderQuotaAvailability] = [],
         activity: AgentActivitySnapshot? = nil,
         providers: [ProviderSummary] = [],
+        openCodeGoModelUsage: [ProviderModelUsage] = [],
+        openCodeGoUsageLoaded: Bool = false,
+        openCodeGoUsageUpdatedAt: Date? = nil,
         lastUpdated: Date? = nil,
         consecutiveFailures: Int = 0,
         lastKnownStartCommand: String? = nil,
@@ -166,6 +173,9 @@ public struct ProxySnapshot: Equatable, Sendable {
         self.quotaAvailability = quotaAvailability
         self.activity = activity
         self.providers = providers
+        self.openCodeGoModelUsage = openCodeGoModelUsage
+        self.openCodeGoUsageLoaded = openCodeGoUsageLoaded
+        self.openCodeGoUsageUpdatedAt = openCodeGoUsageUpdatedAt
         self.lastUpdated = lastUpdated
         self.consecutiveFailures = consecutiveFailures
         self.lastKnownStartCommand = lastKnownStartCommand
diff --git a/app/Sources/MenuBarCoreTests/ModelDecodingSuite.swift b/app/Sources/MenuBarCoreTests/ModelDecodingSuite.swift
index c9e325992c0..a81a664b7f6 100644
--- a/app/Sources/MenuBarCoreTests/ModelDecodingSuite.swift
+++ b/app/Sources/MenuBarCoreTests/ModelDecodingSuite.swift
@@ -123,6 +123,53 @@ enum ModelDecodingSuite {
             )
         }
 
+        t.test("catalog sync: classifies applied and intentional skip results") {
+            let applied = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"applied","ok":true,"catalogWritten":true}"#
+            )
+            t.equal(applied.outcome, .applied(warning: nil))
+            let degraded = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"applied","ok":true,"warning":"Catalog data may be incomplete."}"#
+            )
+            t.equal(degraded.outcome, .applied(warning: "Catalog data may be incomplete."))
+
+            let disabled = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"skipped","ok":true,"skippedReason":"desired_disabled"}"#
+            )
+            t.equal(disabled.outcome, .skipped(.desiredDisabled))
+
+            let external = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"skipped","ok":true,"skippedReason":"external_provider"}"#
+            )
+            t.equal(external.outcome, .skipped(.externalProvider))
+        }
+
+        t.test("catalog sync: rejects failures and unknown or incomplete statuses") {
+            let refused = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"refused","ok":false}"#
+            )
+            t.equal(refused.outcome, .failed, "refused response must not report success")
+            let failedApplied = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"applied","ok":false}"#
+            )
+            t.equal(failedApplied.outcome, .failed, "ok:false must not report success")
+            t.expect(
+                rejects(CodexCatalogSyncResponse.self, #"{"status":"future","ok":true}"#),
+                "unknown statuses must fail closed"
+            )
+            let missingReason = try decode(
+                CodexCatalogSyncResponse.self,
+                #"{"status":"skipped","ok":true}"#
+            )
+            t.equal(missingReason.outcome, .failed, "skip without a recognized reason must fail closed")
+        }
+
         t.test("route status: requires the exact v1 contract and consistent ownership") {
             let native = try decode(
                 CodexRouteStatus.self,
@@ -149,6 +196,26 @@ enum ModelDecodingSuite {
             }
         }
 
+        t.test("catalog status: restart requires a published catalog and stale workers") {
+            let stale = try decode(
+                CodexCatalogStatus.self,
+                #"{"activation":{"schemaVersion":1,"catalog":{"status":"current"},"routing":{"status":"current"},"workers":{"status":"reload_required","staleCount":2}}}"#
+            )
+            t.equal(stale.reloadStatus, .restartRequired(staleWorkerCount: 2))
+
+            let pending = try decode(
+                CodexCatalogStatus.self,
+                #"{"activation":{"schemaVersion":1,"catalog":{"status":"pending"},"routing":{"status":"current"},"workers":{"status":"reload_required","staleCount":2}}}"#
+            )
+            t.equal(pending.reloadStatus, .unknown)
+
+            let current = try decode(
+                CodexCatalogStatus.self,
+                #"{"activation":{"schemaVersion":1,"catalog":{"status":"current"},"routing":{"status":"current"},"workers":{"status":"current","staleCount":0}}}"#
+            )
+            t.equal(current.reloadStatus, .current)
+        }
+
         t.test("restart: rejects a partial accepted response") {
             t.expect(
                 rejects(RestartAccepted.self, #"{"success":true,"activeTurnCount":0,"drainTimeoutMs":1000,"alreadyDraining":false}"#),
@@ -280,6 +347,15 @@ enum ModelDecodingSuite {
             t.equal(report.normalized().percent, 61)
         }
 
+        t.test("quotas: OpenCode Go live usage exposes rolling, weekly, and monthly windows") {
+            let json = report(provider: "opencode-go", label: "OpenCode Go", quota: #"{"updatedAt":1,"fiveHourPercent":12.5,"fiveHourResetAt":1784928599718,"weeklyPercent":40,"weeklyResetAt":1785265199718,"monthlyPercent":65,"monthlyResetAt":1785542400000}"#)
+            let quota = try decode(QuotaReport.self, json)
+            let windows = quota.normalizedWindows()
+            t.equal(windows.map(\.windowLabel), ["5h", "week", "month"])
+            t.equal(windows.map(\.percent), [12.5, 40, 65])
+            t.equal(quota.normalized().windowLabel, "month")
+        }
+
         t.test("quotas: multiple custom windows are all retained") {
             let json = report(provider: "cursor", label: "Cursor", quota: #"{"updatedAt":1,"monthlyPercent":10,"monthlyResetAt":1785256304000,"customWindows":[{"label":"First-party models","percent":4,"resetAt":1785256304000},{"label":"API usage","percent":1,"resetAt":1785256304000}]}"#)
             let report = try decode(QuotaReport.self, json)
@@ -327,22 +403,22 @@ enum ModelDecodingSuite {
             t.isNil(normalized.resetAt, "resetAt")
         }
 
-        t.test("quotas: OpenCode Go reference caps decode without inventing a percentage") {
+        t.test("quotas: OpenCode Go local observations decode without inventing a percentage") {
             let json = """
             {"provider":"opencode-go","label":"OpenCode Go","updatedAt":1784915090763,
-             "source":"opencode-go:published-caps+local-estimate","quota":{
+             "source":"opencode-go:local-observation","quota":{
                "updatedAt":1784915090763,
                "referenceWindows":[
                  {"id":"five_hour","label":"5-hour","windowSeconds":18000,
-                  "publishedLimitUsd":12,"observedSpendUsd":0.3,
+                  "observedSpendUsd":0.3,
                   "observedTokens":1000120,"observedRequests":3,"pricedRequests":3,
                   "unpricedRequests":0,"unmeasuredRequests":0,"coverage":"complete"},
                  {"id":"weekly","label":"7-day","windowSeconds":604800,
-                  "publishedLimitUsd":30,"observedSpendUsd":1.1,
+                  "observedSpendUsd":1.1,
                   "observedTokens":2400000,"observedRequests":4,"pricedRequests":2,
                   "unpricedRequests":1,"unmeasuredRequests":1,"coverage":"partial"},
                  {"id":"monthly","label":"30-day","windowSeconds":2592000,
-                  "publishedLimitUsd":60,"observedTokens":0,"observedRequests":0,
+                  "observedTokens":0,"observedRequests":0,
                   "pricedRequests":0,"unpricedRequests":0,"unmeasuredRequests":0,
                   "coverage":"none"}],
                "observedLimitEvent":{"limitName":"weekly","observedAt":1784915090763,
@@ -350,7 +426,7 @@ enum ModelDecodingSuite {
             """
             let report = try decode(QuotaReport.self, json)
             t.equal(report.referenceWindows.count, 3)
-            t.equal(report.referenceWindows.map(\.publishedLimitUsd), [12, 30, 60])
+            t.expect(report.referenceWindows.allSatisfy { $0.publishedLimitUsd == nil }, "new observations omit obsolete caps")
             t.equal(report.referenceWindows.map(\.observationQuality), [.estimate, .partial, .none])
             t.equal(report.observedLimitEvent?.limitName, "weekly")
 
@@ -359,6 +435,20 @@ enum ModelDecodingSuite {
             t.isNil(report.normalized().percent, "reference percent")
         }
 
+        t.test("quotas: older OpenCode Go payloads with caps still decode") {
+            let json = """
+            {"provider":"opencode-go","label":"OpenCode Go","source":"test","updatedAt":1,
+             "quota":{"updatedAt":1,"referenceWindows":[{
+               "id":"five_hour","label":"5-hour","windowSeconds":18000,
+               "publishedLimitUsd":12,"observedSpendUsd":0.3,"observedTokens":100,
+               "observedRequests":1,"pricedRequests":1,"unpricedRequests":0,
+               "unmeasuredRequests":0,"coverage":"complete"}]}}
+            """
+            let report = try decode(QuotaReport.self, json)
+            t.equal(report.referenceWindows.first?.publishedLimitUsd, 12)
+            t.equal(report.referenceWindows.first?.observationQuality, .estimate)
+        }
+
         t.test("quotas: inconsistent complete coverage degrades to Partial") {
             let json = """
             {"provider":"opencode-go","label":"OpenCode Go","source":"test","updatedAt":1,"quota":{"updatedAt":1,"referenceWindows":[{
diff --git a/app/Sources/MenuBarCoreTests/PollingSuite.swift b/app/Sources/MenuBarCoreTests/PollingSuite.swift
index 6caf3bf5340..04514acaf92 100644
--- a/app/Sources/MenuBarCoreTests/PollingSuite.swift
+++ b/app/Sources/MenuBarCoreTests/PollingSuite.swift
@@ -51,6 +51,55 @@ enum PollingSuite {
             t.equal(sync { await coordinator.current }.activityLoaded, false)
         }
 
+        t.test("polling: OpenCode Go loads completed model usage only while open") {
+            let activity = """
+            {"schemaVersion":1,"generatedAt":1,"proxyState":"active","activeTurnCount":1,
+             "displayedActivityCount":1,"unattributedActiveCount":0,"truncated":false,
+             "activities":[{"id":"go","role":"primary","provider":"opencode-go",
+                            "model":"glm-5.2","phase":"running","startedAt":1}]}
+            """
+            let providers = """
+            [{"name":"opencode-go","adapter":"openai-chat","authMode":"key",
+              "hasApiKey":true,"disabled":false,"quotaCapable":true}]
+            """
+            let quotas = """
+            {"generatedAt":1,"reports":[{"provider":"opencode-go","label":"OpenCode Go",
+              "source":"test","updatedAt":1,"quota":{"updatedAt":1}}],"availability":[]}
+            """
+            let usage = """
+            {"generatedAt":1,"models":[
+              {"provider":"opencode-go","model":"glm-5.2","requests":2,
+               "measuredRequests":2,"totalTokens":1200,"inputTokens":1000,
+               "outputTokens":200,"estimatedCostUsd":0.4},
+              {"provider":"kimi","model":"k3","requests":1,"measuredRequests":1,
+               "totalTokens":50,"inputTokens":40,"outputTokens":10}]}
+            """
+            StubProtocol.reset(
+                startupResponses(startupHealth(status: "protected", diagnosticStale: false))
+                    + healthResponses(activity)
+                    + healthResponses(providers)
+                    + healthResponses(quotas)
+                    + healthResponses(usage)
+            )
+            let endpoint = ProxyEndpoint(host: "127.0.0.1", port: 10100, expectedPID: 42)!
+            let client = ProxyClient(
+                endpoint: endpoint,
+                session: ProxyClient.secureSessionForTesting(protocolClasses: [StubProtocol.self]),
+                credentials: StaticCredentialStore("admin-secret"),
+                attestationSecret: StubProtocol.attestationSecret
+            )
+            let coordinator = PollingCoordinator(client: client, endpoint: endpoint)
+            sync { await coordinator.setPopoverOpen(true) }
+            let snapshot = sync { await coordinator.current }
+            t.equal(snapshot.openCodeGoUsageLoaded, true)
+            t.equal(snapshot.openCodeGoModelUsage.count, 1)
+            t.equal(snapshot.openCodeGoModelUsage.first?.model, "glm-5.2")
+            let request = StubProtocol.recorded.first { $0.url?.path == "/api/usage" }
+            t.equal(request?.url?.query, "range=30d")
+            sync { await coordinator.setPopoverOpen(false) }
+            t.equal(sync { await coordinator.current }.openCodeGoUsageLoaded, true)
+        }
+
         t.test("polling: connection refusal is stopped; repeated failures back off") {
             let endpoint = ProxyEndpoint(host: "127.0.0.1", port: 10100, expectedPID: 42)!
             StubProtocol.reset([
diff --git a/app/Sources/MenuBarCoreTests/TransportSuite.swift b/app/Sources/MenuBarCoreTests/TransportSuite.swift
index a9805001421..81788c0f447 100644
--- a/app/Sources/MenuBarCoreTests/TransportSuite.swift
+++ b/app/Sources/MenuBarCoreTests/TransportSuite.swift
@@ -356,6 +356,41 @@ enum TransportSuite {
             t.equal(requests[1].cachePolicy, .reloadIgnoringLocalAndRemoteCacheData)
         }
 
+        t.test("transport: catalog check and manual sync use attested management paths") {
+            StubProtocol.reset([
+                .init(status: 200, body: identity),
+                .init(status: 200, body: #"{"activation":{"schemaVersion":1,"catalog":{"status":"current"},"routing":{"status":"current"},"workers":{"status":"reload_required","staleCount":1}}}"#),
+                .init(status: 200, body: identity),
+                .init(status: 200, body: #"{"status":"applied","ok":true}"#),
+                .init(status: 200, body: identity),
+                .init(status: 200, body: #"{"status":"skipped","ok":true,"skippedReason":"desired_disabled"}"#),
+                .init(status: 200, body: identity),
+                .init(status: 200, body: #"{"status":"applied","ok":false}"#),
+            ])
+            let client = makeClient(credential: "admin-secret")
+            let status: CodexCatalogStatus? = sync { try? await client.codexCatalogStatus() }
+            t.equal(status?.reloadStatus, .restartRequired(staleWorkerCount: 1))
+            let applied: CodexCatalogSyncOutcome? = sync { try? await client.syncCodexCatalog() }
+            let skipped: CodexCatalogSyncOutcome? = sync { try? await client.syncCodexCatalog() }
+            let rejected: CodexCatalogSyncOutcome? = sync { try? await client.syncCodexCatalog() }
+            t.equal(applied, .applied(warning: nil))
+            t.equal(skipped, .skipped(.desiredDisabled))
+            t.equal(rejected, .failed)
+
+            let requests = StubProtocol.recorded
+            t.equal(requests.map { $0.url?.path ?? "" }, [
+                "/healthz", "/api/codex-catalog/status",
+                "/healthz", "/api/sync",
+                "/healthz", "/api/sync",
+                "/healthz", "/api/sync",
+            ])
+            t.equal(requests[1].httpMethod, "GET")
+            t.equal(requests[3].httpMethod, "POST")
+            t.equal(requests[3].value(forHTTPHeaderField: "x-codexcommander-api-key"), "admin-secret")
+            t.equal(requests[5].httpMethod, "POST")
+            t.equal(requests[7].httpMethod, "POST")
+        }
+
         t.test("transport: public readiness accepts ready, pending, and failed without credentials") {
             StubProtocol.reset([
                 .init(status: 200, body: readinessBody(status: "ready")),
diff --git a/app/Sources/MenuBarUI/AppDelegate.swift b/app/Sources/MenuBarUI/AppDelegate.swift
index 28c796211d1..6dd9bd87875 100644
--- a/app/Sources/MenuBarUI/AppDelegate.swift
+++ b/app/Sources/MenuBarUI/AppDelegate.swift
@@ -25,6 +25,9 @@ public final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValid
     private var lifecycleInFlight = false
     private var catalogActionInFlight = false
     private var catalogUpdateReady = false
+    private var catalogStatusCheckInFlight = false
+    private var catalogStatusCheckPending = false
+    private var lastCatalogStatusCheck: Date?
     private var companionHeartbeat: CompanionHeartbeat?
     private let launchAtLoginController = LaunchAtLoginController()
     private let appBundleLocation: AppBundleLocation
@@ -306,7 +309,95 @@ public final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValid
     }
 
     private func refreshNow() {
-        Task { [coordinator] in await coordinator?.forceRefresh() }
+        guard latest?.state.isRunning == true, let client,
+              !catalogActionInFlight, !lifecycleInFlight, !restartInFlight
+        else {
+            Task { [coordinator] in await coordinator?.forceRefresh() }
+            return
+        }
+
+        catalogActionInFlight = true
+        controller.setLifecycleControlsEnabled(false)
+        controller.setCatalogApplyEnabled(false)
+        controller.showProgress("Refreshing model catalog…")
+        Task { [weak self, coordinator] in
+            let result: Result<CodexCatalogSyncOutcome, Error>
+            do {
+                result = .success(try await client.syncCodexCatalog())
+            } catch {
+                result = .failure(error)
+            }
+            await coordinator?.forceRefresh()
+            await MainActor.run {
+                guard let self else { return }
+                self.catalogActionInFlight = false
+                self.controller.setLifecycleControlsEnabled(true)
+                self.refreshCatalogApplyAvailability()
+                switch result {
+                case .success(.applied(let warning)):
+                    if let warning, !warning.isEmpty {
+                        self.controller.showResult(warning, isError: true)
+                    } else {
+                        self.controller.showResult("Model sync finished. Restart ChatGPT if prompted below.", isError: false)
+                    }
+                case .success(.skipped(.desiredDisabled)):
+                    self.controller.showResult("Model sync was skipped because Codex integration is off.", isError: false)
+                case .success(.skipped(.externalProvider)):
+                    self.controller.showResult("Model sync was skipped because Codex uses an external provider.", isError: false)
+                case .success(.failed):
+                    self.controller.showResult("The Codex model catalog could not be refreshed.", isError: true)
+                case .failure(let error):
+                    let detail = (error as? ProxyError)?.userMessage ?? "The model catalog could not be refreshed."
+                    self.controller.showResult(detail, isError: true)
+                }
+                self.checkCatalogStatus(force: true)
+            }
+        }
+    }
+
+    /// Observe the already-published catalog without mutating it. This catches a
+    /// `ccx sync` run outside the menu app and keeps the restart card current.
+    private func checkCatalogStatus(force: Bool = false) {
+        guard panel.isShown, latest?.state.isRunning == true, let client,
+              !catalogActionInFlight
+        else { return }
+        if catalogStatusCheckInFlight {
+            if force { catalogStatusCheckPending = true }
+            return
+        }
+        let now = Date()
+        if !force, let lastCatalogStatusCheck,
+           now.timeIntervalSince(lastCatalogStatusCheck) < PollingCoordinator.heavyInterval {
+            return
+        }
+        if force { catalogStatusCheckPending = false }
+        lastCatalogStatusCheck = now
+        catalogStatusCheckInFlight = true
+        Task { [weak self] in
+            let status = try? await client.codexCatalogStatus().reloadStatus
+            await MainActor.run {
+                guard let self else { return }
+                self.catalogStatusCheckInFlight = false
+                if self.catalogActionInFlight {
+                    self.catalogStatusCheckPending = true
+                    return
+                }
+                if self.panel.isShown, self.latest?.state.isRunning == true {
+                    switch status {
+                    case .restartRequired(let count):
+                        self.presentCatalogUpdate(staleWorkerCount: count)
+                    case .current:
+                        if self.catalogUpdateReady { self.clearCatalogUpdate() }
+                    case .unknown, .none:
+                        break
+                    }
+                }
+                if self.catalogStatusCheckPending {
+                    self.catalogStatusCheckPending = false
+                    self.checkCatalogStatus(force: true)
+                }
+            }
+        }
     }
 
     @MainActor
@@ -317,6 +408,11 @@ public final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValid
         let build = sourceRevision.map { " · build \($0)" } ?? ""
         statusItem?.button?.toolTip = "CodexCommander — \(snapshot.state.title) (\(snapshot.endpoint.display))\(build)"
         controller.apply(snapshot)
+        if snapshot.state.isRunning {
+            if panel.isShown { checkCatalogStatus() }
+        } else if catalogUpdateReady {
+            clearCatalogUpdate()
+        }
         if !restartInFlight && !lifecycleInFlight && !catalogActionInFlight {
             controller.setRestartEnabled(snapshot.state.isRunning)
             controller.setLifecycleControlsEnabled(true)
@@ -348,6 +444,7 @@ public final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuItemValid
         )
         panel.present(from: button)
         installEscapeMonitor()
+        checkCatalogStatus(force: true)
         Task { [coordinator] in await coordinator?.setPopoverOpen(true) }
     }
 
diff --git a/app/Sources/MenuBarUI/PopoverViewController.swift b/app/Sources/MenuBarUI/PopoverViewController.swift
index 44c1505dee3..cb3e3815267 100644
--- a/app/Sources/MenuBarUI/PopoverViewController.swift
+++ b/app/Sources/MenuBarUI/PopoverViewController.swift
@@ -9,26 +9,33 @@ public final class PopoverViewController: NSViewController {
 
     public required init?(coder: NSCoder) { nil }
 
-    // Fixed chrome
-    private let header = StatusHeaderView()
-    private let dashboardButton = NSButton()
-    private let logsButton = NSButton()
-    private let refreshButton = NSButton()
+    // Fixed identity, controls, and one-line status
+    private let header = BrandHeaderView()
+    private let statusFooter = StatusFooterView()
+    private let moreActionsMenu = NSMenu(title: "More actions")
+    private let refreshMenuItem = NSMenuItem()
+    private let logsMenuItem = NSMenuItem()
+    private let updateSeparator = NSMenuItem.separator()
+    private let updateMenuItem = NSMenuItem()
     private let lifecycleButton = NSButton()
     private let restartButton = NSButton()
     private let restoreNativeButton = NSButton()
     private let routeThroughProxyButton = NSButton()
     private let stopAndQuitButton = NSButton()
-    private let updateButton = NSButton()
     private let updateMessage = NSTextField(wrappingLabelWithString: "")
     private var updateBlocksLifecycle = false
     private let startupMode = StartupModeView()
     private let headerSeparator = makeSeparator()
     private let operationStatus = OperationStatusView()
-    private let footerActions = NSStackView()
+    private let controlActions = NSStackView()
+    private let primaryActions = NSStackView()
+    private let separateRouteActions = NSStackView()
+    private let primaryActionSpacer = NSView()
+    private let separateRouteSpacer = NSView()
+    private var routeActionsAreSeparate = false
     private let column = NSStackView()
 
-    // Scrolling body
+    // One scrolling monitoring area below the controls
     private let scrollView = NSScrollView()
     private let body = NSStackView()
     private let catalogUpdate = CatalogUpdateView()
@@ -44,7 +51,7 @@ public final class PopoverViewController: NSViewController {
     private let startupOptionsButton = NSButton()
     private let commandField = NSTextField(labelWithString: "")
     private let activitySeparator = makeSeparator()
-    private let quotaSeparator = makeSeparator()
+    private let footerSeparator = makeSeparator()
 
     public var onDashboard: (() -> Void)?
     public var onLogs: (() -> Void)?
@@ -74,6 +81,9 @@ public final class PopoverViewController: NSViewController {
 
     public override func loadView() {
         configureControls()
+        header.onDashboard = { [weak self] in self?.onDashboard?() }
+        header.onMoreActions = { [weak self] sender in self?.showMoreActions(from: sender) }
+        header.onUpdate = { [weak self] in self?.onCheckForUpdates?() }
         startupOptionsButton.isHidden = true
 
         quotas.onManage = { [weak self] provider in
@@ -99,11 +109,13 @@ public final class PopoverViewController: NSViewController {
         body.alignment = .leading
         body.spacing = Theme.sectionGap
         body.setViews(
-            [catalogUpdate, activity, activitySeparator, quotas, guidanceLabel, startupOptionsButton, commandField],
+            [catalogUpdate, guidanceLabel, startupOptionsButton, commandField,
+             quotas, activitySeparator, activity],
             in: .top
         )
         body.translatesAutoresizingMaskIntoConstraints = false
-        for item in [catalogUpdate, activity, activitySeparator, quotas, guidanceLabel, startupOptionsButton, commandField] {
+        for item in [catalogUpdate, guidanceLabel, startupOptionsButton, commandField,
+                     quotas, activitySeparator, activity] {
             item.translatesAutoresizingMaskIntoConstraints = false
             item.widthAnchor.constraint(equalTo: body.widthAnchor).isActive = true
         }
@@ -116,26 +128,20 @@ public final class PopoverViewController: NSViewController {
         scrollView.borderType = .noBorder
         scrollView.translatesAutoresizingMaskIntoConstraints = false
 
-        let navigationActions = NSStackView(views: [
-            dashboardButton, logsButton, refreshButton, NSView()
-        ])
-        navigationActions.orientation = .horizontal
-        navigationActions.spacing = Theme.rowGap
-        navigationActions.alignment = .centerY
+        primaryActions.setViews(
+            [lifecycleButton, restartButton, restoreNativeButton,
+             routeThroughProxyButton, primaryActionSpacer],
+            in: .leading
+        )
+        primaryActions.orientation = .horizontal
+        primaryActions.spacing = Theme.rowGap
+        primaryActions.alignment = .centerY
 
-        let lifecycleActions = NSStackView(views: [
-            lifecycleButton, restartButton, NSView()
-        ])
-        lifecycleActions.orientation = .horizontal
-        lifecycleActions.spacing = Theme.rowGap
-        lifecycleActions.alignment = .centerY
-
-        let codexRouteActions = NSStackView(views: [
-            restoreNativeButton, routeThroughProxyButton, NSView()
-        ])
-        codexRouteActions.orientation = .horizontal
-        codexRouteActions.spacing = Theme.rowGap
-        codexRouteActions.alignment = .centerY
+        separateRouteActions.setViews([separateRouteSpacer], in: .leading)
+        separateRouteActions.orientation = .horizontal
+        separateRouteActions.spacing = Theme.rowGap
+        separateRouteActions.alignment = .centerY
+        separateRouteActions.isHidden = true
 
         let exitActions = NSStackView(views: [
             stopAndQuitButton, NSView()
@@ -144,16 +150,17 @@ public final class PopoverViewController: NSViewController {
         exitActions.spacing = Theme.rowGap
         exitActions.alignment = .centerY
 
-        footerActions.setViews(
-            [navigationActions, lifecycleActions, codexRouteActions, updateButton, updateMessage, exitActions],
+        controlActions.setViews(
+            [primaryActions, separateRouteActions, updateMessage, exitActions],
             in: .top
         )
-        footerActions.orientation = .vertical
-        footerActions.spacing = 5
-        footerActions.alignment = .leading
+        controlActions.orientation = .vertical
+        controlActions.spacing = 5
+        controlActions.alignment = .leading
 
         column.setViews(
-            [header, headerSeparator, operationStatus, scrollView, quotaSeparator, startupMode, footerActions],
+            [header, headerSeparator, operationStatus, controlActions,
+             startupMode, scrollView, footerSeparator, statusFooter],
             in: .top
         )
         column.orientation = .vertical
@@ -179,9 +186,10 @@ public final class PopoverViewController: NSViewController {
             header.widthAnchor.constraint(equalToConstant: contentWidth),
             headerSeparator.widthAnchor.constraint(equalToConstant: contentWidth),
             operationStatus.widthAnchor.constraint(equalToConstant: contentWidth),
-            quotaSeparator.widthAnchor.constraint(equalToConstant: contentWidth),
+            footerSeparator.widthAnchor.constraint(equalToConstant: contentWidth),
             startupMode.widthAnchor.constraint(equalToConstant: contentWidth),
-            footerActions.widthAnchor.constraint(equalToConstant: contentWidth),
+            statusFooter.widthAnchor.constraint(equalToConstant: contentWidth),
+            controlActions.widthAnchor.constraint(equalToConstant: contentWidth),
             scrollView.widthAnchor.constraint(equalToConstant: contentWidth),
             body.widthAnchor.constraint(equalToConstant: scrollingContentWidth),
         ])
@@ -191,25 +199,36 @@ public final class PopoverViewController: NSViewController {
         scrollHeight = heightConstraint
 
         view = root
+        applyCodexRouteVisibility()
         preferredContentSize = NSSize(width: Theme.width, height: Theme.preferredHeight)
     }
 
     private func configureControls() {
-        styleFooterButton(updateButton, title: "Check for Updates…", symbol: "arrow.down.circle")
-        updateButton.target = self
-        updateButton.action = #selector(updateTapped)
-        updateButton.keyEquivalent = "u"
-        updateButton.keyEquivalentModifierMask = [.command, .shift]
+        moreActionsMenu.autoenablesItems = false
+        refreshMenuItem.title = "Refresh Models"
+        refreshMenuItem.action = #selector(refreshTapped)
+        refreshMenuItem.target = self
+        refreshMenuItem.image = NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: nil)
+        refreshMenuItem.toolTip = "Check for model changes; ChatGPT may need to restart to load them"
+        logsMenuItem.title = "Logs"
+        logsMenuItem.action = #selector(logsTapped)
+        logsMenuItem.target = self
+        logsMenuItem.image = NSImage(systemSymbolName: "list.bullet.rectangle", accessibilityDescription: nil)
+        updateMenuItem.title = "Check for Updates…"
+        updateMenuItem.action = #selector(updateTapped)
+        updateMenuItem.target = self
+        updateMenuItem.image = NSImage(systemSymbolName: "arrow.down.circle", accessibilityDescription: nil)
+        moreActionsMenu.addItem(refreshMenuItem)
+        moreActionsMenu.addItem(logsMenuItem)
+        moreActionsMenu.addItem(updateSeparator)
+        moreActionsMenu.addItem(updateMenuItem)
         updateMessage.font = Theme.caption
         updateMessage.textColor = Theme.muted
         updateMessage.preferredMaxLayoutWidth = Theme.width - Theme.gutter * 2
         updateMessage.isHidden = true
-        styleFooterButton(dashboardButton, title: "Dashboard", symbol: "square.grid.2x2")
-        styleFooterButton(logsButton, title: "Logs", symbol: "list.bullet.rectangle")
-        styleFooterButton(refreshButton, title: "Refresh", symbol: "arrow.clockwise")
         styleFooterButton(startupOptionsButton, title: "Startup options…", symbol: "gearshape.2")
         styleFooterButton(lifecycleButton, title: "Start Proxy", symbol: "play.fill")
-        styleFooterButton(restartButton, title: "Restart Proxy…", symbol: "power")
+        styleFooterButton(restartButton, title: "Restart…", symbol: "power")
         styleFooterButton(
             restoreNativeButton,
             title: "Restore Native Codex",
@@ -227,9 +246,6 @@ public final class PopoverViewController: NSViewController {
         )
         stopAndQuitButton.contentTintColor = Theme.red
 
-        dashboardButton.action = #selector(dashboardTapped)
-        logsButton.action = #selector(logsTapped)
-        refreshButton.action = #selector(refreshTapped)
         startupOptionsButton.action = #selector(startupOptionsTapped)
         lifecycleButton.action = #selector(lifecycleTapped)
         restartButton.action = #selector(restartTapped)
@@ -240,9 +256,6 @@ public final class PopoverViewController: NSViewController {
         stopAndQuitButton.keyEquivalent = CompanionShortcut.keyEquivalent
         stopAndQuitButton.keyEquivalentModifierMask = CompanionShortcut.stopAndQuitModifiers
 
-        dashboardButton.setAccessibilityLabel("Open dashboard")
-        logsButton.setAccessibilityLabel("Open logs")
-        refreshButton.setAccessibilityLabel("Refresh")
         startupOptionsButton.setAccessibilityLabel("Open startup options in the dashboard")
         lifecycleButton.setAccessibilityLabel("Start CodexCommander proxy")
         restartButton.setAccessibilityLabel("Restart CodexCommander proxy")
@@ -250,6 +263,8 @@ public final class PopoverViewController: NSViewController {
         routeThroughProxyButton.setAccessibilityLabel(
             "Route Codex through the CodexCommander proxy"
         )
+        restoreNativeButton.toolTip = "Restore Native Codex"
+        routeThroughProxyButton.toolTip = "Route Codex Through Proxy"
         stopAndQuitButton.setAccessibilityLabel(
             "Stop the CodexCommander proxy and quit the menu bar app"
         )
@@ -276,7 +291,7 @@ public final class PopoverViewController: NSViewController {
 
     public func apply(_ snapshot: ProxySnapshot) {
         self.snapshot = snapshot
-        header.apply(snapshot)
+        statusFooter.apply(snapshot)
 
         activity.isHidden = false
         activity.apply(snapshot)
@@ -284,7 +299,7 @@ public final class PopoverViewController: NSViewController {
         quotas.apply(snapshot)
 
         activitySeparator.isHidden = activity.isHidden
-        quotaSeparator.isHidden = false
+        footerSeparator.isHidden = false
 
         applyGuidance(snapshot)
         applyActions(snapshot)
@@ -390,8 +405,11 @@ public final class PopoverViewController: NSViewController {
 
     public func setLifecycleControlsEnabled(_ enabled: Bool) {
         lifecycleControlsAllowed = enabled
+        refreshMenuItem.isEnabled = enabled && snapshot?.state.isRunning == true
+        updateMoreActionsAvailability()
         lifecycleButton.isEnabled = enabled && snapshot.map { lifecycleActionable($0.state) } == true
         restartButton.isEnabled = enabled && snapshot?.state.isRunning == true
+        restartButton.isHidden = snapshot?.state.isRunning != true
         applyCodexRouteAvailability()
         stopAndQuitButton.isEnabled = LifecycleActionAvailability.canStopAndQuit(
             state: snapshot?.state,
@@ -407,20 +425,25 @@ public final class PopoverViewController: NSViewController {
 
     public func applyUpdatePresentation(title: String, enabled: Bool, blocked: Bool, message: String) {
         _ = view
-        updateButton.title = title
-        updateButton.setAccessibilityLabel(title)
-        updateButton.isEnabled = enabled
-        updateMessage.stringValue = message
-        updateMessage.isHidden = message.isEmpty
+        let needsAttention = title == "Update Available…" || title == "Finish Update…"
+        header.setUpdateAction(title: needsAttention ? title : nil, enabled: enabled, message: message)
+        updateSeparator.isHidden = needsAttention
+        updateMenuItem.isHidden = needsAttention
+        updateMenuItem.title = "Check for Updates…"
+        updateMenuItem.isEnabled = enabled && !needsAttention
+        updateMenuItem.toolTip = !enabled && !message.isEmpty ? message : nil
+        updateMoreActionsAvailability()
+        updateMessage.stringValue = blocked ? message : ""
+        updateMessage.isHidden = !blocked || message.isEmpty
         updateBlocksLifecycle = blocked
         if let snapshot { applyGuidance(snapshot) }
         setLifecycleControlsEnabled(lifecycleControlsAllowed)
         refreshSize()
     }
 
-    package var updateActionTitleForTesting: String { updateButton.title }
-    package var updateActionEnabledForTesting: Bool { updateButton.isEnabled }
-    package func clickUpdateForTesting() { updateButton.performClick(nil) }
+    package var headerUpdateTitleForTesting: String? { header.updateActionTitleForTesting }
+    package var headerUpdateEnabledForTesting: Bool { header.updateActionEnabledForTesting }
+    package func clickHeaderUpdateForTesting() { header.clickUpdateForTesting() }
 
     private func applyUpdateLifecycleGuard() {
         guard updateBlocksLifecycle else { return }
@@ -475,9 +498,10 @@ public final class PopoverViewController: NSViewController {
     private func applyActions(_ snapshot: ProxySnapshot) {
         let definitelyStopped = snapshot.state == .unreachable
         let stopIntent = lifecycleStops(snapshot.state)
-        dashboardButton.isEnabled = !definitelyStopped
-        logsButton.isEnabled = !definitelyStopped
-        refreshButton.isEnabled = true
+        header.setDashboardEnabled(!definitelyStopped)
+        logsMenuItem.isEnabled = !definitelyStopped
+        refreshMenuItem.isEnabled = lifecycleControlsAllowed && snapshot.state.isRunning
+        updateMoreActionsAvailability()
         lifecycleButton.title = stopIntent ? "Stop Proxy…" : "Start Proxy"
         lifecycleButton.image = NSImage(
             systemSymbolName: stopIntent ? "stop.fill" : "play.fill",
@@ -489,8 +513,10 @@ public final class PopoverViewController: NSViewController {
         lifecycleButton.isEnabled = lifecycleControlsAllowed && lifecycleActionable(snapshot.state)
         lifecycleButton.alphaValue = lifecycleButton.isEnabled ? 1 : 0.45
         restartButton.isEnabled = lifecycleControlsAllowed && snapshot.state.isRunning
+        restartButton.isHidden = !snapshot.state.isRunning
         restartButton.alphaValue = restartButton.isEnabled ? 1 : 0.45
         applyCodexRouteAvailability()
+        applyCodexRouteVisibility()
         restoreNativeButton.alphaValue = restoreNativeButton.isEnabled ? 1 : 0.45
         routeThroughProxyButton.alphaValue = routeThroughProxyButton.isEnabled ? 1 : 0.45
         stopAndQuitButton.isEnabled = LifecycleActionAvailability.canStopAndQuit(
@@ -504,13 +530,12 @@ public final class PopoverViewController: NSViewController {
     private func resize() {
         view.layoutSubtreeIfNeeded()
         let bodyHeight = ceil(body.fittingSize.height)
-        let fixedViewsHeight = ceil(header.fittingSize.height)
-            + ceil(headerSeparator.fittingSize.height)
-            + (operationStatus.isHidden ? 0 : ceil(operationStatus.fittingSize.height))
-            + ceil(quotaSeparator.fittingSize.height)
-            + ceil(startupMode.fittingSize.height)
-            + ceil(footerActions.fittingSize.height)
-        let stackGaps = column.spacing * CGFloat(max(0, column.views.count - 1))
+        let fixedViews: [NSView] = [header, headerSeparator, operationStatus,
+                                    controlActions, startupMode, footerSeparator, statusFooter]
+        let fixedViewsHeight = fixedViews.filter { !$0.isHidden }
+            .reduce(CGFloat.zero) { $0 + ceil($1.fittingSize.height) }
+        let visibleColumnCount = column.views.filter { !$0.isHidden }.count
+        let stackGaps = column.spacing * CGFloat(max(0, visibleColumnCount - 1))
         let chrome = fixedViewsHeight
             + stackGaps
             + column.edgeInsets.top
@@ -558,11 +583,60 @@ public final class PopoverViewController: NSViewController {
         routeThroughProxyButton.isEnabled = !usesProxy
     }
 
+    /// Keep the one available route switch beside proxy controls. When route
+    /// truth is uncertain, put both recovery choices on their own row.
+    private func applyCodexRouteVisibility() {
+        let route: CodexRoutingKind?
+        switch snapshot?.codexRoute {
+        case .confirmed(let status):
+            route = status.routingKind
+        case .unobserved:
+            if case .running(let health) = snapshot?.state, !health.diagnosticStale {
+                route = CodexRoutingKind(rawValue: health.routingKind)
+            } else {
+                route = nil
+            }
+        case .confirmationUnavailable, nil:
+            route = nil
+        }
+        restoreNativeButton.isHidden = route == .native
+        routeThroughProxyButton.isHidden = route == .codexCommanderLocal
+        let needsSeparateRow = !restoreNativeButton.isHidden && !routeThroughProxyButton.isHidden
+        if needsSeparateRow != routeActionsAreSeparate {
+            let source = needsSeparateRow ? primaryActions : separateRouteActions
+            let destination = needsSeparateRow ? separateRouteActions : primaryActions
+            source.removeView(restoreNativeButton)
+            source.removeView(routeThroughProxyButton)
+            destination.insertView(restoreNativeButton, at: needsSeparateRow ? 0 : 2, in: .leading)
+            destination.insertView(routeThroughProxyButton, at: needsSeparateRow ? 1 : 3, in: .leading)
+            routeActionsAreSeparate = needsSeparateRow
+        }
+        restoreNativeButton.title = needsSeparateRow ? "Restore Native Codex" : "Use Native"
+        routeThroughProxyButton.title = needsSeparateRow ? "Route Codex Through Proxy" : "Use Commander"
+        separateRouteActions.isHidden = !needsSeparateRow
+    }
+
     // MARK: - Actions
 
-    @objc private func dashboardTapped() { onDashboard?() }
     @objc private func logsTapped() { onLogs?() }
     @objc private func refreshTapped() { onRefresh?() }
+    private func showMoreActions(from sender: NSButton) {
+        moreActionsMenu.popUp(
+            positioning: nil,
+            at: NSPoint(x: 0, y: sender.bounds.minY),
+            in: sender
+        )
+    }
+    private func updateMoreActionsAvailability() {
+        let enabled = refreshMenuItem.isEnabled || logsMenuItem.isEnabled
+            || (!updateMenuItem.isHidden && updateMenuItem.isEnabled)
+        header.setMoreActionsEnabled(
+            enabled,
+            label: updateMenuItem.isHidden
+                ? "More actions: Refresh Models and Logs"
+                : "More actions: Refresh Models, Logs, and updates"
+        )
+    }
     @objc private func startupOptionsTapped() { onOpenStartupOptions?() }
     @objc private func lifecycleTapped() {
         guard let state = snapshot?.state else { return }
@@ -614,7 +688,34 @@ public final class PopoverViewController: NSViewController {
         return scrollView.bounds.width
     }
     package var hasVerticalScroller: Bool { scrollView.hasVerticalScroller }
-    package var headerView: StatusHeaderView { header }
+    package var monitoringPrecedesPanelFooter: Bool {
+        guard let controlsIndex = column.arrangedSubviews.firstIndex(of: controlActions),
+              let statusIndex = column.arrangedSubviews.firstIndex(of: statusFooter),
+              let separatorIndex = column.arrangedSubviews.firstIndex(of: footerSeparator),
+              let scrollIndex = column.arrangedSubviews.firstIndex(of: scrollView),
+              let activityIndex = body.arrangedSubviews.firstIndex(of: activity),
+              let quotaIndex = body.arrangedSubviews.firstIndex(of: quotas) else { return false }
+        return statusIndex == column.arrangedSubviews.count - 1
+            && controlsIndex < scrollIndex && scrollIndex < separatorIndex && separatorIndex < statusIndex
+            && quotaIndex < activityIndex
+    }
+    package var visibleRouteActionTitles: [String] {
+        [restoreNativeButton, routeThroughProxyButton]
+            .filter { !$0.isHidden }
+            .map(\.title)
+    }
+    package var primaryActionTitles: [String] {
+        primaryActions.arrangedSubviews.compactMap { $0 as? NSButton }
+            .filter { !$0.isHidden }
+            .map(\.title)
+    }
+    package var separateRouteRowVisible: Bool { !separateRouteActions.isHidden }
+    package var visibleUpperControlRowCount: Int {
+        controlActions.arrangedSubviews.filter { !$0.isHidden }.count
+            + (startupMode.isHidden ? 0 : 1)
+    }
+    package var headerView: BrandHeaderView { header }
+    package var statusFooterView: StatusFooterView { statusFooter }
     package var operationStatusView: OperationStatusView { operationStatus }
     package var operationStatusTitle: String { operationStatus.titleText }
     package var operationStatusDetail: String? { operationStatus.detailText }
@@ -650,9 +751,9 @@ public final class PopoverViewController: NSViewController {
     }
     package var footerTitles: [String] {
         [
-            dashboardButton.title,
-            logsButton.title,
-            refreshButton.title,
+            "Dashboard",
+            logsMenuItem.title,
+            refreshMenuItem.title,
             lifecycleButton.title,
             restartButton.title,
             restoreNativeButton.title,
@@ -661,29 +762,58 @@ public final class PopoverViewController: NSViewController {
         ]
     }
     package var footerEnabledStates: [Bool] {
-        footerButtons.map(\.isEnabled)
+        [header.dashboardEnabledForTesting, logsMenuItem.isEnabled, refreshMenuItem.isEnabled,
+         lifecycleButton.isEnabled, restartButton.isEnabled, restoreNativeButton.isEnabled,
+         routeThroughProxyButton.isEnabled, stopAndQuitButton.isEnabled]
     }
     package var footerAccessibilityLabels: [String?] {
-        footerButtons.map { $0.accessibilityLabel() }
+        [header.dashboardAccessibilityLabelForTesting, "Open logs", "Refresh models and proxy status",
+         lifecycleButton.accessibilityLabel(), restartButton.accessibilityLabel(),
+         restoreNativeButton.accessibilityLabel(), routeThroughProxyButton.accessibilityLabel(),
+         stopAndQuitButton.accessibilityLabel()]
     }
     package var footerKeyEquivalents: [(String, NSEvent.ModifierFlags)] {
-        footerButtons.map { ($0.keyEquivalent, $0.keyEquivalentModifierMask) }
+        [
+            ("", []),
+            ("", []),
+            ("", []),
+            (lifecycleButton.keyEquivalent, lifecycleButton.keyEquivalentModifierMask),
+            (restartButton.keyEquivalent, restartButton.keyEquivalentModifierMask),
+            (restoreNativeButton.keyEquivalent, restoreNativeButton.keyEquivalentModifierMask),
+            (routeThroughProxyButton.keyEquivalent, routeThroughProxyButton.keyEquivalentModifierMask),
+            (stopAndQuitButton.keyEquivalent, stopAndQuitButton.keyEquivalentModifierMask),
+        ]
     }
     package func activateFooterForTesting(_ index: Int) {
-        guard footerButtons.indices.contains(index) else { return }
-        footerButtons[index].performClick(nil)
+        switch index {
+        case 0: header.clickDashboardForTesting()
+        case 1: activateMoreActionForTesting(1)
+        case 2: activateMoreActionForTesting(0)
+        case 3: lifecycleButton.performClick(nil)
+        case 4: restartButton.performClick(nil)
+        case 5: restoreNativeButton.performClick(nil)
+        case 6: routeThroughProxyButton.performClick(nil)
+        case 7: stopAndQuitButton.performClick(nil)
+        default: break
+        }
     }
-    private var footerButtons: [NSButton] {
-        [
-            dashboardButton,
-            logsButton,
-            refreshButton,
-            lifecycleButton,
-            restartButton,
-            restoreNativeButton,
-            routeThroughProxyButton,
-            stopAndQuitButton,
-        ]
+    package var visibleHeaderActionTitles: [String] {
+        ["Dashboard", "More actions"]
+    }
+    package var moreActionsAccessibilityLabel: String? {
+        header.moreActionsAccessibilityLabelForTesting
+    }
+    package var moreActionTitles: [String] {
+        let titles = [refreshMenuItem.title, logsMenuItem.title]
+        return updateMenuItem.isHidden ? titles : titles + [updateMenuItem.title]
+    }
+    package var moreActionEnabledStates: [Bool] {
+        let states = [refreshMenuItem.isEnabled, logsMenuItem.isEnabled]
+        return updateMenuItem.isHidden ? states : states + [updateMenuItem.isEnabled]
+    }
+    package func activateMoreActionForTesting(_ index: Int) {
+        guard moreActionEnabledStates.indices.contains(index), moreActionEnabledStates[index] else { return }
+        moreActionsMenu.performActionForItem(at: index == 2 ? 3 : index)
     }
 }
 
diff --git a/app/Sources/MenuBarUI/ProviderListView.swift b/app/Sources/MenuBarUI/ProviderListView.swift
index ec86b213480..6a58140e6aa 100644
--- a/app/Sources/MenuBarUI/ProviderListView.swift
+++ b/app/Sources/MenuBarUI/ProviderListView.swift
@@ -12,6 +12,10 @@ public final class ProviderQuotaAccordionView: NSView {
     private var expandedProviders: Set<String> = []
     private var didSeedExpansion = false
     private var currentRows: [ProviderQuotaRow] = []
+    private var currentOpenCodeGoModels: [ProviderModelUsage] = []
+    private var currentOpenCodeGoUsageLoaded = false
+    private var currentOpenCodeGoUsageUpdatedAt: Date?
+    private var currentOpenCodeGoActiveModels: Set<String> = []
 
     public var onManage: ((String) -> Void)?
     public var onViewAll: (() -> Void)?
@@ -68,6 +72,14 @@ public final class ProviderQuotaAccordionView: NSView {
     public required init?(coder: NSCoder) { nil }
 
     public func apply(_ snapshot: ProxySnapshot) {
+        currentOpenCodeGoModels = snapshot.openCodeGoModelUsage
+        currentOpenCodeGoUsageLoaded = snapshot.openCodeGoUsageLoaded
+        currentOpenCodeGoUsageUpdatedAt = snapshot.openCodeGoUsageUpdatedAt
+        currentOpenCodeGoActiveModels = Set(snapshot.activity?.activities.compactMap { activity in
+            guard activity.provider?.lowercased() == "opencode-go",
+                  let model = activity.model, !model.isEmpty else { return nil }
+            return model
+        } ?? [])
         for view in rows.arrangedSubviews {
             rows.removeArrangedSubview(view)
             view.removeFromSuperview()
@@ -111,6 +123,10 @@ public final class ProviderQuotaAccordionView: NSView {
             let row = ProviderQuotaRowView(
                 row: quotaRow,
                 expanded: expanded,
+                modelUsage: quotaRow.provider.lowercased() == "opencode-go" ? currentOpenCodeGoModels : [],
+                modelUsageLoaded: currentOpenCodeGoUsageLoaded,
+                modelUsageUpdatedAt: currentOpenCodeGoUsageUpdatedAt,
+                activeModels: currentOpenCodeGoActiveModels,
                 onToggle: { [weak self] in self?.toggle(quotaRow.provider) },
                 onManage: { [weak self] in self?.onManage?(quotaRow.provider) }
             )
@@ -169,6 +185,10 @@ public final class ProviderQuotaAccordionView: NSView {
             let row = ProviderQuotaRowView(
                 row: quotaRow,
                 expanded: expanded,
+                modelUsage: quotaRow.provider.lowercased() == "opencode-go" ? currentOpenCodeGoModels : [],
+                modelUsageLoaded: currentOpenCodeGoUsageLoaded,
+                modelUsageUpdatedAt: currentOpenCodeGoUsageUpdatedAt,
+                activeModels: currentOpenCodeGoActiveModels,
                 onToggle: { [weak self] in self?.toggle(quotaRow.provider) },
                 onManage: { [weak self] in self?.onManage?(quotaRow.provider) }
             )
@@ -196,6 +216,12 @@ public final class ProviderQuotaAccordionView: NSView {
             .first(where: { $0.providerID == provider })?
             .accessibilityLabel()
     }
+    package func modelUsageTextForTesting(_ provider: String) -> [String] {
+        rows.arrangedSubviews
+            .compactMap { $0 as? ProviderQuotaRowView }
+            .first(where: { $0.providerID == provider })?
+            .modelUsageText ?? []
+    }
     package func toggleForTesting(_ provider: String) { toggle(provider) }
     package func triggerViewAllForTesting() { onViewAll?() }
     package func triggerManageForTesting(_ provider: String) { onManage?(provider) }
@@ -209,11 +235,16 @@ public final class ProviderQuotaAccordionView: NSView {
 }
 
 final class ProviderQuotaRowView: NSView {
+    private(set) var modelUsageText: [String] = []
     let providerID: String
 
     init(
         row: ProviderQuotaRow,
         expanded: Bool,
+        modelUsage: [ProviderModelUsage],
+        modelUsageLoaded: Bool,
+        modelUsageUpdatedAt: Date?,
+        activeModels: Set<String>,
         onToggle: @escaping () -> Void,
         onManage: @escaping () -> Void
     ) {
@@ -245,7 +276,20 @@ final class ProviderQuotaRowView: NSView {
         chevron.widthAnchor.constraint(equalToConstant: 12).isActive = true
         chevron.heightAnchor.constraint(equalToConstant: 12).isActive = true
 
-        let summary = makeLabel(collapsedSummary(row), font: Theme.micro, color: Theme.faint)
+        let compactSummary: String
+        if row.provider.lowercased() == "opencode-go", !activeModels.isEmpty {
+            let activeSummary = activeModels.count == 1
+                ? "Using \(activeModels.sorted()[0])"
+                : "\(activeModels.count) models in flight"
+            if let quota = row.report?.normalized(), quota.hasPercent {
+                compactSummary = "\(activeSummary) · \(quota.windowLabel) \(Format.percent(quota.percent))"
+            } else {
+                compactSummary = activeSummary
+            }
+        } else {
+            compactSummary = collapsedSummary(row)
+        }
+        let summary = makeLabel(compactSummary, font: Theme.micro, color: Theme.faint)
 
         let manage = ActionButton(title: row.isUnavailable ? "SETTINGS" : "PROVIDER", handler: onManage)
         manage.bezelStyle = .texturedRounded
@@ -322,6 +366,49 @@ final class ProviderQuotaRowView: NSView {
                     }
                 }
             }
+            if row.provider.lowercased() == "opencode-go" {
+                let freshness = modelUsageUpdatedAt.map { " · updated \(Format.age($0))" } ?? ""
+                let heading = makeLabel("Model usage · last 30 days\(freshness)", font: Theme.captionMedium, color: Theme.muted)
+                arranged.append(heading)
+                let active = activeModels.sorted()
+                for model in active {
+                    let text = "In flight · \(model)"
+                    modelUsageText.append(text)
+                    arranged.append(makeLabel(text, font: Theme.captionMedium, color: Theme.green))
+                }
+                if !modelUsageLoaded {
+                    let text = "Completed usage unavailable"
+                    modelUsageText.append(text)
+                    arranged.append(makeLabel(text, font: Theme.caption, color: Theme.muted))
+                } else if modelUsage.isEmpty {
+                    let text = "No completed requests in the last 30 days"
+                    modelUsageText.append(text)
+                    arranged.append(makeLabel(text, font: Theme.caption, color: Theme.muted))
+                } else {
+                    let ordered = modelUsage.sorted { lhs, rhs in
+                        let leftActive = activeModels.contains(lhs.model)
+                        let rightActive = activeModels.contains(rhs.model)
+                        if leftActive != rightActive { return leftActive }
+                        if lhs.totalTokens != rhs.totalTokens { return lhs.totalTokens > rhs.totalTokens }
+                        return lhs.model < rhs.model
+                    }
+                    for usage in ordered {
+                        let tokens = usage.measuredRequests > 0
+                            ? Format.count(usage.totalTokens) + (usage.measuredRequests < usage.requests
+                                ? " measured tokens (partial)" : " tokens")
+                            : "tokens unknown"
+                        let requests = "\(usage.requests) completed request\(usage.requests == 1 ? "" : "s")"
+                        let cost = usage.estimatedCostUsd.map { " · estimated \(Format.usdEstimate($0))" } ?? ""
+                        let text = "\(usage.model) · \(requests) · \(tokens)\(cost)"
+                        modelUsageText.append(text)
+                        let label = makeLabel(text, font: Theme.caption, color: Theme.text)
+                        label.lineBreakMode = .byWordWrapping
+                        label.maximumNumberOfLines = 2
+                        label.preferredMaxLayoutWidth = Theme.width - Theme.gutter * 2 - 20
+                        arranged.append(label)
+                    }
+                }
+            }
         }
 
         let column = NSStackView(views: arranged)
@@ -434,8 +521,8 @@ final class ProviderQuotaRowView: NSView {
         }
         let references = report.referenceWindows
         if !references.isEmpty {
-            let caps = references.prefix(3).map(ReferenceQuotaPresentation.compactCapText)
-            return "Caps \(caps.joined(separator: " · "))"
+            let observed = references.first(where: { $0.observationQuality != .none }) ?? references[0]
+            return "Local usage · \(ReferenceQuotaPresentation.compactObservationText(observed))"
         }
         return "Unavailable"
     }
diff --git a/app/Sources/MenuBarUI/StartupModeView.swift b/app/Sources/MenuBarUI/StartupModeView.swift
index 0148b9909d0..7aeef8b6251 100644
--- a/app/Sources/MenuBarUI/StartupModeView.swift
+++ b/app/Sources/MenuBarUI/StartupModeView.swift
@@ -87,7 +87,16 @@ public final class StartupModeView: NSView {
             detail.stringValue = presentation.errorMessage ?? summary
             detail.textColor = presentation.errorMessage == nil ? Theme.faint : Theme.red
         }
+        let needsVisibleGuidance = presentation.relocationRequired
+            || presentation.errorMessage != nil
+            || presentation.needsApproval
+            || !presentation.isToggleEnabled
+        detail.isHidden = !needsVisibleGuidance
+        title.toolTip = detail.stringValue
+        toggle.toolTip = detail.stringValue
+        toolTip = detail.stringValue
         setAccessibilityLabel("CodexCommander startup mode, \(detail.stringValue)")
+        toggle.setAccessibilityLabel("Launch CodexCommander at login, \(detail.stringValue)")
         applying = false
     }
 
@@ -131,6 +140,8 @@ public final class StartupModeView: NSView {
 
     package var modeText: String { detail.stringValue }
     package var modeTextColor: NSColor? { detail.textColor }
+    package var modeDetailVisible: Bool { !detail.isHidden }
+    package var modeToolTip: String? { toggle.toolTip }
     package var isLaunchAtLoginOn: Bool { toggle.state == .on }
     package var isLaunchAtLoginToggleEnabled: Bool { toggle.isEnabled }
     package var showsRemediationButton: Bool { !remediationButton.isHidden }
diff --git a/app/Sources/MenuBarUI/Views.swift b/app/Sources/MenuBarUI/Views.swift
index 6ed8b2bf634..4f63c8b2c64 100644
--- a/app/Sources/MenuBarUI/Views.swift
+++ b/app/Sources/MenuBarUI/Views.swift
@@ -133,26 +133,18 @@ public final class CatalogUpdateView: NSView {
     package func activateForTesting() { applyButton.performClick(nil) }
 }
 
-// MARK: - Status header
+// MARK: - Brand header and status footer
 
-/// Brand mark + separate proxy-health, readiness, in-flight-request, and Codex-route status.
-public final class StatusHeaderView: NSView {
+/// App identity with a compact update action when a release needs attention.
+public final class BrandHeaderView: NSView {
     private let brand = NSImageView()
     private let title = makeLabel("CodexCommander", font: Theme.title, color: Theme.text)
-    private let dot = StatusDotView()
-    private let status = makeLabel("", font: Theme.captionMedium, color: Theme.muted)
-    private let requestCount = makeLabel("", font: Theme.caption, color: Theme.faint)
-    private let readiness = makeLabel("", font: Theme.micro, color: Theme.faint)
-    private let codexRoute = makeLabel("", font: Theme.micro, color: Theme.faint)
-    private let divider: NSView = {
-        let view = NSView()
-        view.wantsLayer = true
-        view.layer?.backgroundColor = Theme.cardBorder.cgColor
-        view.translatesAutoresizingMaskIntoConstraints = false
-        view.widthAnchor.constraint(equalToConstant: 1).isActive = true
-        view.heightAnchor.constraint(equalToConstant: 18).isActive = true
-        return view
-    }()
+    private let dashboardButton = NSButton()
+    private let moreActionsButton = NSButton()
+    private let updateButton = NSButton()
+    var onDashboard: (() -> Void)?
+    var onMoreActions: ((NSButton) -> Void)?
+    var onUpdate: (() -> Void)?
 
     init() {
         super.init(frame: .zero)
@@ -164,16 +156,25 @@ public final class StatusHeaderView: NSView {
         brand.widthAnchor.constraint(equalToConstant: 25).isActive = true
         brand.heightAnchor.constraint(equalToConstant: 25).isActive = true
 
-        let left = makeRow([brand, title], spacing: 8)
-        let proxyState = makeRow([dot, status, divider, requestCount], spacing: 7)
-        let right = NSStackView(views: [proxyState, readiness, codexRoute])
-        right.orientation = .vertical
-        right.alignment = .trailing
-        right.spacing = 1
-        let row = NSStackView(views: [left, NSView(), right])
-        row.orientation = .horizontal
-        row.alignment = .centerY
-        row.distribution = .fill
+        title.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        configureIconButton(dashboardButton, symbol: "square.grid.2x2", label: "Open dashboard")
+        dashboardButton.action = #selector(dashboardTapped)
+        configureIconButton(moreActionsButton, symbol: "ellipsis.circle", label: "More actions")
+        moreActionsButton.action = #selector(moreActionsTapped)
+
+        updateButton.image = NSImage(systemSymbolName: "arrow.down.circle", accessibilityDescription: nil)
+        updateButton.imagePosition = .imageLeading
+        updateButton.bezelStyle = .recessed
+        updateButton.isBordered = false
+        updateButton.controlSize = .small
+        updateButton.font = Theme.captionMedium
+        updateButton.contentTintColor = Theme.amber
+        updateButton.setButtonType(.momentaryPushIn)
+        updateButton.target = self
+        updateButton.action = #selector(updateTapped)
+        updateButton.isHidden = true
+
+        let row = makeRow([brand, title, NSView(), dashboardButton, moreActionsButton, updateButton], spacing: 7)
         row.translatesAutoresizingMaskIntoConstraints = false
         addSubview(row)
         NSLayoutConstraint.activate([
@@ -185,63 +186,141 @@ public final class StatusHeaderView: NSView {
         ])
         setAccessibilityElement(true)
         setAccessibilityRole(.group)
-        setAccessibilityLabel("CodexCommander status")
+        setAccessibilityLabel("CodexCommander")
     }
 
     required init?(coder: NSCoder) { nil }
 
-    func apply(_ snapshot: ProxySnapshot) {
-        let state = snapshot.state
-        let activeCount = snapshot.activity?.activeTurnCount
-        status.stringValue = "Proxy \(state.title.lowercased())"
-        status.textColor = Theme.color(for: bridge(state.tone))
-        dot.tone = bridge(state.tone)
-
-        if let activeCount, snapshot.activityLoaded {
-            requestCount.stringValue = activeCount == 1 ? "1 in flight" : "\(activeCount) in flight"
-            requestCount.isHidden = false
-            divider.isHidden = false
-        } else {
-            requestCount.stringValue = ""
-            requestCount.isHidden = true
-            divider.isHidden = true
-        }
+    private func configureIconButton(_ button: NSButton, symbol: String, label: String) {
+        button.title = ""
+        button.image = NSImage(systemSymbolName: symbol, accessibilityDescription: label)
+        button.imagePosition = .imageOnly
+        button.bezelStyle = .recessed
+        button.isBordered = false
+        button.controlSize = .small
+        button.contentTintColor = Theme.text
+        button.setButtonType(.momentaryPushIn)
+        button.target = self
+        button.setAccessibilityLabel(label)
+        button.toolTip = label
+        button.widthAnchor.constraint(equalToConstant: 27).isActive = true
+    }
+
+    func setDashboardEnabled(_ enabled: Bool) {
+        dashboardButton.isEnabled = enabled
+        dashboardButton.alphaValue = enabled ? 1 : 0.45
+    }
+
+    func setMoreActionsEnabled(_ enabled: Bool, label: String) {
+        moreActionsButton.isEnabled = enabled
+        moreActionsButton.alphaValue = enabled ? 1 : 0.45
+        moreActionsButton.setAccessibilityLabel(label)
+        moreActionsButton.toolTip = label
+    }
+
+    func setUpdateAction(title: String?, enabled: Bool, message: String) {
+        updateButton.isHidden = title == nil
+        guard let title else { return }
+        updateButton.title = title == "Finish Update…" ? "Finish Update" : "Update"
+        updateButton.isEnabled = enabled
+        updateButton.alphaValue = enabled ? 1 : 0.45
+        updateButton.setAccessibilityLabel(title)
+        updateButton.toolTip = message.isEmpty ? title : message
+    }
+
+    var updateActionTitleForTesting: String? {
+        updateButton.isHidden ? nil : updateButton.accessibilityLabel()
+    }
+    var updateActionEnabledForTesting: Bool { updateButton.isEnabled }
+    var dashboardEnabledForTesting: Bool { dashboardButton.isEnabled }
+    var dashboardAccessibilityLabelForTesting: String? { dashboardButton.accessibilityLabel() }
+    var moreActionsEnabledForTesting: Bool { moreActionsButton.isEnabled }
+    var moreActionsAccessibilityLabelForTesting: String? { moreActionsButton.accessibilityLabel() }
+    package var actionLayoutFitsForTesting: Bool {
+        layoutSubtreeIfNeeded()
+        let controls = [dashboardButton, moreActionsButton, updateButton].filter { !$0.isHidden }
+        return title.frame.width > 0
+            && title.frame.maxX <= dashboardButton.frame.minX
+            && zip(controls, controls.dropFirst()).allSatisfy { pair in
+                pair.0.frame.maxX <= pair.1.frame.minX
+            }
+            && controls.last.map { $0.frame.maxX <= bounds.maxX } == true
+    }
+    func clickDashboardForTesting() { dashboardButton.performClick(nil) }
+    func clickUpdateForTesting() { updateButton.performClick(nil) }
 
-        let readinessText = "Readiness · \(Self.readinessName(snapshot.readiness))"
-        readiness.stringValue = readinessText
+    @objc private func dashboardTapped() { onDashboard?() }
+    @objc private func moreActionsTapped() { onMoreActions?(moreActionsButton) }
+    @objc private func updateTapped() { onUpdate?() }
+}
 
-        let routeText: String?
-        switch snapshot.codexRoute {
-        case .confirmed(let route):
-            routeText = "Codex route · \(Self.codexRouteName(route))"
-        case .confirmationUnavailable:
-            routeText = "Codex route · Unconfirmed"
-        case .unobserved:
-            if case .running(let health) = state {
-                routeText = "Codex route · \(Self.codexRouteName(health))"
-            } else {
-                routeText = nil
-            }
-        }
+/// One compact verdict for proxy liveness and readiness, plus independent Codex route context.
+public final class StatusFooterView: NSView {
+    private let dot = StatusDotView()
+    private let status = makeLabel("Checking", font: Theme.captionMedium, color: Theme.muted)
+    private let codexRoute = makeLabel("", font: Theme.micro, color: Theme.faint)
+
+    init() {
+        super.init(frame: .zero)
+        let row = makeRow([dot, status, NSView(), codexRoute], spacing: 7)
+        row.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(row)
+        NSLayoutConstraint.activate([
+            row.topAnchor.constraint(equalTo: topAnchor),
+            row.leadingAnchor.constraint(equalTo: leadingAnchor),
+            row.trailingAnchor.constraint(equalTo: trailingAnchor),
+            row.bottomAnchor.constraint(equalTo: bottomAnchor),
+            heightAnchor.constraint(greaterThanOrEqualToConstant: 20),
+        ])
+        setAccessibilityElement(true)
+        setAccessibilityRole(.group)
+        setAccessibilityLabel("Proxy checking")
+    }
+
+    required init?(coder: NSCoder) { nil }
+
+    func apply(_ snapshot: ProxySnapshot) {
+        let presentation = Self.presentation(for: snapshot)
+        status.stringValue = presentation.label
+        status.textColor = Theme.color(for: presentation.tone)
+        dot.tone = presentation.tone
+
+        let routeText = Self.routeText(for: snapshot)
         codexRoute.stringValue = routeText ?? ""
         codexRoute.isHidden = routeText == nil
-
-        var label = "CodexCommander, proxy \(state.title.lowercased())"
-        if let activeCount, snapshot.activityLoaded {
-            label += ", \(activeCount) request\(activeCount == 1 ? "" : "s") in flight"
-        }
-        label += ", \(readinessText)"
+        var label = "Proxy \(presentation.label.lowercased())"
         if let routeText { label += ", \(routeText)" }
         setAccessibilityLabel(label)
     }
 
-    private static func readinessName(_ state: ProxyReadinessState) -> String {
-        switch state {
-        case .unknown: return "Checking"
-        case .unavailable: return "Unavailable"
-        case .pending: return "Starting"
-        case .ready: return "Ready"
-        case .failed: return "Startup failed"
+    private static func presentation(for snapshot: ProxySnapshot) -> (label: String, tone: ProxyToneBridge) {
+        switch snapshot.state {
+        case .loading: return ("Checking", .neutral)
+        case .unreachable: return ("Stopped", .bad)
+        case .unauthorized: return ("Authentication needed", .warning)
+        case .degraded: return ("Connection issue", .warning)
+        case .running(let health):
+            if snapshot.readiness == .failed { return ("Sync failed", .warning) }
+            if health.status == "at-risk" { return ("Startup at risk", .warning) }
+            switch snapshot.readiness {
+            case .unknown: return ("Checking", .neutral)
+            case .unavailable: return ("Readiness unavailable", .warning)
+            case .pending: return ("Starting", .neutral)
+            case .ready: return ("Ready", bridge(snapshot.state.tone))
+            case .failed: return ("Sync failed", .warning)
+            }
+        }
+    }
+
+    private static func routeText(for snapshot: ProxySnapshot) -> String? {
+        guard case .running(let health) = snapshot.state else {
+            return snapshot.state == .loading ? nil : "Codex: Unconfirmed"
+        }
+        switch snapshot.codexRoute {
+        case .confirmed(let route): return "Codex: \(codexRouteName(route))"
+        case .confirmationUnavailable: return "Codex: Unconfirmed"
+        case .unobserved:
+            return health.diagnosticStale ? "Codex: Unconfirmed" : "Codex: \(codexRouteName(health))"
         }
     }
 
@@ -266,7 +345,7 @@ public final class StatusHeaderView: NSView {
         }
     }
 
-    private func bridge(_ tone: ProxyState.Tone) -> ProxyToneBridge {
+    private static func bridge(_ tone: ProxyState.Tone) -> ProxyToneBridge {
         switch tone {
         case .neutral: return .neutral
         case .good: return .good
@@ -276,10 +355,6 @@ public final class StatusHeaderView: NSView {
     }
 
     package var statusText: String { status.stringValue }
-    package var requestCountText: String? {
-        requestCount.isHidden ? nil : requestCount.stringValue
-    }
-    package var readinessText: String { readiness.stringValue }
     package var codexRouteText: String? {
         codexRoute.isHidden ? nil : codexRoute.stringValue
     }
@@ -315,6 +390,7 @@ final class StatusDotView: NSView {
 /// One-level tree of in-flight primary/child turns; orphan child requests stand alone.
 public final class AgentActivityView: NSView {
     private let heading = makeLabel("Live proxy requests", font: Theme.captionMedium, color: Theme.muted)
+    private let count = makeLabel("", font: Theme.caption, color: Theme.faint)
     private let body = NSStackView()
     private let empty = makeLabel("", font: Theme.caption, color: Theme.muted)
 
@@ -327,7 +403,9 @@ public final class AgentActivityView: NSView {
         empty.maximumNumberOfLines = 2
         empty.preferredMaxLayoutWidth = Theme.width - Theme.gutter * 2
 
-        let stack = NSStackView(views: [heading, body, empty])
+        count.isHidden = true
+        let header = makeRow([heading, NSView(), count])
+        let stack = NSStackView(views: [header, body, empty])
         stack.orientation = .vertical
         stack.alignment = .leading
         stack.spacing = Theme.tightGap
@@ -338,6 +416,7 @@ public final class AgentActivityView: NSView {
             stack.leadingAnchor.constraint(equalTo: leadingAnchor),
             stack.trailingAnchor.constraint(equalTo: trailingAnchor),
             stack.bottomAnchor.constraint(equalTo: bottomAnchor),
+            header.widthAnchor.constraint(equalTo: stack.widthAnchor),
             body.widthAnchor.constraint(equalTo: stack.widthAnchor),
             empty.widthAnchor.constraint(equalTo: stack.widthAnchor),
         ])
@@ -355,6 +434,7 @@ public final class AgentActivityView: NSView {
         }
 
         guard snapshot.activityLoaded else {
+            count.isHidden = true
             body.isHidden = true
             empty.isHidden = false
             empty.stringValue = "Request activity unavailable"
@@ -363,6 +443,7 @@ public final class AgentActivityView: NSView {
         }
 
         guard let activity = snapshot.activity, activity.isSupported else {
+            count.isHidden = true
             body.isHidden = true
             empty.isHidden = false
             empty.stringValue = "Request activity unavailable"
@@ -373,12 +454,15 @@ public final class AgentActivityView: NSView {
         let visible = activity.activities.filter {
             $0.phase == .starting || $0.phase == .running
         }
+        let activeCount = max(0, activity.activeTurnCount)
+        count.stringValue = activeCount == 1 ? "1 in flight" : "\(activeCount) in flight"
+        count.isHidden = false
 
         if visible.isEmpty {
             body.isHidden = true
-            empty.isHidden = false
-            empty.stringValue = "No requests in flight"
-            setAccessibilityLabel(empty.stringValue)
+            empty.isHidden = true
+            empty.stringValue = ""
+            setAccessibilityLabel("Live proxy requests, \(count.stringValue)")
             return
         }
 
@@ -420,7 +504,7 @@ public final class AgentActivityView: NSView {
             body.addArrangedSubview(note)
         }
 
-        setAccessibilityLabel("Live proxy requests, \(visible.count) shown")
+        setAccessibilityLabel("Live proxy requests, \(count.stringValue), \(visible.count) shown")
     }
 
     private func appendRow(_ activity: AgentActivity, indented: Bool) {
@@ -431,6 +515,7 @@ public final class AgentActivityView: NSView {
     }
 
     package var headingText: String { heading.stringValue }
+    package var countText: String? { count.isHidden ? nil : count.stringValue }
     package var emptyText: String? { empty.isHidden ? nil : empty.stringValue }
 }
 
@@ -654,7 +739,7 @@ final class QuotaWindowRowView: NSView {
     }
 }
 
-/// Text contract for published caps and local observations. Kept separate from
+/// Text contract for local observations. Kept separate from
 /// `NormalizedQuota`: these values must never acquire a percentage bar unless the
 /// upstream provider actually supplied one.
 package enum ReferenceQuotaPresentation {
@@ -669,12 +754,23 @@ package enum ReferenceQuotaPresentation {
         }
     }
 
-    package static func capText(_ window: QuotaReferenceWindow) -> String {
-        "\(horizon(window)) · Published cap \(Format.usdCap(window.publishedLimitUsd))"
+    package static func title(_ window: QuotaReferenceWindow) -> String {
+        "\(horizon(window)) · Local usage"
     }
 
-    package static func compactCapText(_ window: QuotaReferenceWindow) -> String {
-        "\(Format.usdCap(window.publishedLimitUsd))/\(horizon(window))"
+    package static func compactObservationText(_ window: QuotaReferenceWindow) -> String {
+        let horizon = horizon(window)
+        switch window.observationQuality {
+        case .none:
+            return "\(horizon) no local usage"
+        case .estimate:
+            return "\(horizon) estimated \(Format.usdEstimate(window.observedSpendUsd))"
+        case .partial:
+            if let spend = window.observedSpendUsd {
+                return "\(horizon) partial estimate \(Format.usdEstimate(spend))"
+            }
+            return "\(horizon) partial · \(Format.count(window.observedTokens)) tokens"
+        }
     }
 
     package static func observationText(_ window: QuotaReferenceWindow) -> String {
@@ -719,14 +815,14 @@ package enum ReferenceQuotaPresentation {
     }
 }
 
-/// A published cap with local estimate/coverage text. No progress bar is rendered:
-/// dividing observed spend by this cap would manufacture provider quota state.
+/// Local estimate/coverage text. No progress bar is rendered because local
+/// observations cannot establish a provider quota percentage.
 final class ReferenceQuotaWindowRowView: NSView {
     init(window: QuotaReferenceWindow) {
         super.init(frame: .zero)
 
-        let cap = makeLabel(
-            ReferenceQuotaPresentation.capText(window),
+        let title = makeLabel(
+            ReferenceQuotaPresentation.title(window),
             font: Theme.captionMedium,
             color: Theme.text
         )
@@ -736,7 +832,7 @@ final class ReferenceQuotaWindowRowView: NSView {
             color: Theme.muted
         )
         observation.lineBreakMode = .byTruncatingTail
-        let column = NSStackView(views: [cap, observation])
+        let column = NSStackView(views: [title, observation])
         column.orientation = .vertical
         column.alignment = .leading
         column.spacing = 2
@@ -754,7 +850,7 @@ final class ReferenceQuotaWindowRowView: NSView {
         setAccessibilityElement(true)
         setAccessibilityRole(.staticText)
         setAccessibilityLabel(
-            "\(ReferenceQuotaPresentation.capText(window)). \(ReferenceQuotaPresentation.observationText(window))."
+            "\(ReferenceQuotaPresentation.title(window)). \(ReferenceQuotaPresentation.observationText(window))."
         )
     }
 
diff --git a/app/Sources/MenuBarUITests/main.swift b/app/Sources/MenuBarUITests/main.swift
index 49688df877a..03e40610ec2 100644
--- a/app/Sources/MenuBarUITests/main.swift
+++ b/app/Sources/MenuBarUITests/main.swift
@@ -55,14 +55,15 @@ func quotaJSON(
     label: String,
     fiveHour: Double? = nil,
     weekly: Double? = nil,
-    monthly: Double? = nil
+    monthly: Double? = nil,
+    updatedAt: Int64 = 1
 ) -> String {
     var parts: [String] = []
     if let fiveHour { parts.append("\"fiveHourPercent\":\(fiveHour)") }
     if let weekly { parts.append("\"weeklyPercent\":\(weekly)") }
     if let monthly { parts.append("\"monthlyPercent\":\(monthly)") }
-    let quota = "{\"updatedAt\":1\(parts.isEmpty ? "" : "," + parts.joined(separator: ","))}"
-    return "{\"provider\":\"\(provider)\",\"label\":\"\(label)\",\"source\":\"test\",\"quota\":\(quota),\"updatedAt\":1}"
+    let quota = "{\"updatedAt\":\(updatedAt)\(parts.isEmpty ? "" : "," + parts.joined(separator: ","))}"
+    return "{\"provider\":\"\(provider)\",\"label\":\"\(label)\",\"source\":\"test\",\"quota\":\(quota),\"updatedAt\":\(updatedAt)}"
 }
 
 func decodeQuotas(_ json: String) -> [QuotaReport] {
@@ -143,7 +144,10 @@ func makeSnapshot(
     quotaAvailability: [ProviderQuotaAvailability] = [],
     activity: AgentActivitySnapshot? = nil,
     providers: [ProviderSummary] = [],
+    openCodeGoModelUsage: [ProviderModelUsage] = [],
+    openCodeGoUsageLoaded: Bool = false,
     health: StartupHealth = currentHealth(),
+    state: ProxyState? = nil,
     readiness: ProxyReadinessState = .unknown,
     recommendedCommand: String? = nil,
     providersLoaded: Bool = false,
@@ -151,13 +155,15 @@ func makeSnapshot(
     activityLoaded: Bool = true
 ) -> ProxySnapshot {
     ProxySnapshot(
-        state: .running(health),
+        state: state ?? .running(health),
         readiness: readiness,
         endpoint: .default,
         quotas: quotas,
         quotaAvailability: quotaAvailability,
         activity: activity,
         providers: providers,
+        openCodeGoModelUsage: openCodeGoModelUsage,
+        openCodeGoUsageLoaded: openCodeGoUsageLoaded,
         lastUpdated: Date(),
         recommendedCommand: recommendedCommand,
         providersLoaded: providersLoaded,
@@ -166,11 +172,51 @@ func makeSnapshot(
     )
 }
 
+func menuPreviewSnapshot() -> ProxySnapshot {
+    let now = Int64(Date().timeIntervalSince1970 * 1_000)
+    let quotas = decodeQuotas("""
+    [
+      \(quotaJSON(provider: "openai", label: "ChatGPT", weekly: 49, updatedAt: now)),
+      \(quotaJSON(provider: "opencode-go", label: "OpenCode Go", fiveHour: 4, weekly: 2, monthly: 1, updatedAt: now))
+    ]
+    """)
+    let activity = activitySnapshot(activities: """
+      {"id":"preview-primary","role":"primary","provider":"opencode-go",
+       "model":"deepseek-v4.1-flash","phase":"running","startedAt":\(now - 120_000)},
+      {"id":"preview-child","role":"subagent","provider":"opencode-go",
+       "model":"gpt-6-luna","phase":"running","startedAt":\(now - 45_000)}
+    """, activeTurnCount: 2)
+    return makeSnapshot(quotas: quotas, activity: activity, readiness: .ready)
+}
+
 func textFields(in view: NSView) -> [NSTextField] {
     let own = (view as? NSTextField).map { [$0] } ?? []
     return own + view.subviews.flatMap(textFields(in:))
 }
 
+func writePanelScreenshot(_ controller: PopoverViewController, to output: String) {
+    let window = NSWindow(contentRect: controller.view.bounds, styleMask: [.borderless], backing: .buffered, defer: false)
+    window.appearance = NSAppearance(named: .darkAqua)
+    window.contentView = controller.view
+    window.backgroundColor = NSColor(calibratedWhite: 0.12, alpha: 1)
+    controller.view.layoutSubtreeIfNeeded()
+    window.displayIfNeeded()
+    guard let bitmap = controller.view.bitmapImageRepForCachingDisplay(in: controller.view.bounds) else { return }
+    controller.view.cacheDisplay(in: controller.view.bounds, to: bitmap)
+    let rendered = NSImage(size: controller.view.bounds.size)
+    rendered.lockFocus()
+    NSColor(calibratedWhite: 0.12, alpha: 1).setFill()
+    controller.view.bounds.fill()
+    let foreground = NSImage(size: controller.view.bounds.size)
+    foreground.addRepresentation(bitmap)
+    NSGraphicsContext.current?.imageInterpolation = .high
+    foreground.draw(in: controller.view.bounds, from: .zero, operation: .sourceOver, fraction: 1)
+    rendered.unlockFocus()
+    if let tiff = rendered.tiffRepresentation, let opaque = NSBitmapImageRep(data: tiff) {
+        try? opaque.representation(using: .png, properties: [:])?.write(to: URL(fileURLWithPath: output))
+    }
+}
+
 // MARK: - Hierarchy / sizing
 
 runner.test("ui: panel prefers the approved width") {
@@ -217,19 +263,103 @@ runner.test("ui: running proxy keeps the terminal glyph regardless of service pr
     runner.equal(Set(symbols).count, states.count, "every other operational state stays distinct")
 }
 
-runner.test("ui: footer exposes navigation, lifecycle, Codex routing, and a single exit") {
+runner.test("ui: quotas precede live requests and the status is the panel footer") {
     let controller = PopoverViewController()
     _ = controller.view
+    runner.expect(controller.monitoringPrecedesPanelFooter,
+                  "quota and request scrolling ends above the fixed status footer")
+    runner.equal(controller.visibleHeaderActionTitles, ["Dashboard", "More actions"],
+                 "dashboard remains prominent without a separate navigation row")
+    runner.equal(controller.moreActionTitles, ["Refresh Models", "Logs", "Check for Updates…"],
+                 "secondary actions live in More actions")
+    runner.equal(controller.headerUpdateTitleForTesting, nil,
+                 "the header has no update action without an available update")
     let titles = controller.footerTitles
     runner.equal(
         titles,
         [
-            "Dashboard", "Logs", "Refresh", "Start Proxy", "Restart Proxy…",
+            "Dashboard", "Logs", "Refresh Models", "Start Proxy", "Restart…",
             "Restore Native Codex", "Route Codex Through Proxy",
             "Stop CodexCommander and Quit…",
         ],
         "footer titles"
     )
+    controller.apply(makeSnapshot())
+    runner.equal(controller.visibleRouteActionTitles, ["Use Native"],
+                 "confirmed Commander route shows its available alternative")
+    runner.equal(controller.primaryActionTitles, ["Stop Proxy…", "Restart…", "Use Native"],
+                 "proxy and the available route action share the first row")
+    runner.equal(controller.separateRouteRowVisible, false)
+    runner.equal(controller.visibleUpperControlRowCount, 3,
+                 "normal controls use two action rows and the login row")
+    if let output = ProcessInfo.processInfo.environment["CCX_ACTION_LAYOUT_SCREENSHOT"] {
+        controller.apply(menuPreviewSnapshot())
+        writePanelScreenshot(controller, to: output)
+    }
+    runner.equal(controller.footerEnabledStates[2], true, "model refresh is available while proxy runs")
+    controller.setLifecycleControlsEnabled(false)
+    runner.equal(controller.footerEnabledStates[2], false, "model refresh is guarded during lifecycle actions")
+    controller.setLifecycleControlsEnabled(true)
+    controller.apply(makeSnapshot(state: .unreachable))
+    runner.equal(controller.footerEnabledStates[2], false, "model refresh is unavailable when proxy is stopped")
+    runner.equal(controller.moreActionEnabledStates, [false, false, true],
+                 "stopped proxy disables refresh and Logs while leaving update checks available")
+}
+
+runner.test("ui: update action moves between the header and More actions") {
+    let controller = PopoverViewController()
+    _ = controller.view
+    controller.apply(makeSnapshot())
+    var checks = 0
+    controller.onCheckForUpdates = { checks += 1 }
+    controller.applyUpdatePresentation(title: "Update Available…", enabled: true,
+                                       blocked: false, message: "")
+    runner.equal(controller.headerUpdateTitleForTesting, "Update Available…")
+    runner.equal(controller.moreActionTitles, ["Refresh Models", "Logs"])
+    runner.expect(controller.headerView.actionLayoutFitsForTesting,
+                  "dashboard and available update fit beside the app title")
+    if let output = ProcessInfo.processInfo.environment["CCX_ACTION_LAYOUT_UPDATE_SCREENSHOT"] {
+        controller.apply(menuPreviewSnapshot())
+        writePanelScreenshot(controller, to: output)
+    }
+    controller.clickHeaderUpdateForTesting()
+    runner.equal(checks, 1)
+
+    controller.applyUpdatePresentation(title: "Check for Updates…", enabled: true,
+                                       blocked: false, message: "")
+    runner.equal(controller.headerUpdateTitleForTesting, nil)
+    runner.equal(controller.moreActionTitles, ["Refresh Models", "Logs", "Check for Updates…"])
+    controller.activateMoreActionForTesting(2)
+    runner.equal(checks, 2)
+    runner.expect(controller.headerView.actionLayoutFitsForTesting,
+                  "dashboard and More actions fit without an update")
+}
+
+runner.test("ui: route controls show both recovery choices when route is uncertain") {
+    let controller = PopoverViewController()
+    _ = controller.view
+    controller.apply(makeSnapshot(health: currentHealth(
+        status: "native", routingKind: "native", routingInjected: false
+    )))
+    runner.equal(controller.visibleRouteActionTitles, ["Use Commander"],
+                 "confirmed native route shows its available alternative")
+    runner.equal(controller.primaryActionTitles, ["Stop Proxy…", "Restart…", "Use Commander"])
+
+    var unknown = makeSnapshot()
+    unknown.codexRoute = .confirmationUnavailable
+    controller.apply(unknown)
+    runner.equal(controller.visibleRouteActionTitles,
+                 ["Restore Native Codex", "Route Codex Through Proxy"],
+                 "unconfirmed route keeps both recovery choices")
+    runner.equal(controller.separateRouteRowVisible, true,
+                 "uncertain routing gives both recovery actions their own row")
+    if let output = ProcessInfo.processInfo.environment["CCX_ACTION_LAYOUT_UNKNOWN_SCREENSHOT"] {
+        writePanelScreenshot(controller, to: output)
+    }
+    controller.apply(makeSnapshot())
+    runner.equal(controller.visibleRouteActionTitles, ["Use Native"])
+    runner.equal(controller.separateRouteRowVisible, false,
+                 "route recovery row collapses after confirmation")
 }
 
 runner.test("ui: catalog update presents manual ChatGPT restart outside the proxy footer") {
@@ -297,6 +427,9 @@ runner.test("ui: startup control exposes desktop, headless, off, and approval st
         controller.startupModeView.modeText,
         "Desktop · starts CodexCommander at login"
     )
+    runner.equal(controller.startupModeView.modeDetailVisible, false)
+    runner.equal(controller.startupModeView.modeToolTip,
+                 "Desktop · starts CodexCommander at login")
     runner.equal(controller.startupModeView.isLaunchAtLoginOn, true)
 
     controller.applyLaunchAtLogin(
@@ -310,12 +443,18 @@ runner.test("ui: startup control exposes desktop, headless, off, and approval st
         controller.startupModeView.modeText,
         "Headless · proxy runs without the menu bar"
     )
+    runner.equal(controller.startupModeView.modeDetailVisible, false)
+    runner.equal(controller.startupModeView.modeToolTip,
+                 "Headless · proxy runs without the menu bar")
 
     controller.apply(makeSnapshot(health: currentHealth(status: "at-risk")))
     runner.equal(
         controller.startupModeView.modeText,
         "Off · start CodexCommander manually"
     )
+    runner.equal(controller.startupModeView.modeDetailVisible, false)
+    runner.equal(controller.startupModeView.modeToolTip,
+                 "Off · start CodexCommander manually")
 
     controller.applyLaunchAtLogin(
         LaunchAtLoginPresentation(
@@ -325,6 +464,8 @@ runner.test("ui: startup control exposes desktop, headless, off, and approval st
         )
     )
     runner.equal(controller.startupModeView.isLaunchAtLoginToggleEnabled, false)
+    runner.equal(controller.startupModeView.modeDetailVisible, true,
+                 "approval guidance remains visible beside its recovery action")
     runner.expect(
         controller.startupModeView.showsRemediationButton,
         "approval state should expose Login Items settings"
@@ -382,6 +523,8 @@ runner.test("ui: relocation guidance is neutral and opens Applications on explic
         )
     )
     let errorColor = controller.startupModeView.modeTextColor
+    runner.equal(controller.startupModeView.modeDetailVisible, true,
+                 "startup errors stay visible without hovering")
 
     controller.applyLaunchAtLogin(
         LaunchAtLoginPresentation(
@@ -396,6 +539,7 @@ runner.test("ui: relocation guidance is neutral and opens Applications on explic
         controller.startupModeView.modeText,
         "Move CodexCommander to Applications to launch at login."
     )
+    runner.equal(controller.startupModeView.modeDetailVisible, true)
     runner.expect(
         controller.startupModeView.modeTextColor != errorColor,
         "relocation detail must use the neutral faint tone, not the error tone"
@@ -657,20 +801,20 @@ runner.test("ui: overflowing provider content fits the scroll viewport") {
     )
 }
 
-runner.test("ui: OpenCode Go renders published caps and honest local observation semantics") {
+runner.test("ui: OpenCode Go renders local observations without obsolete caps") {
     let quotas = decodeQuotas("""
     [{"provider":"opencode-go","label":"OpenCode Go","source":"test","updatedAt":1,"quota":{"updatedAt":1,
       "referenceWindows":[
         {"id":"five_hour","label":"5-hour","windowSeconds":18000,
-         "publishedLimitUsd":12,"observedSpendUsd":0.3,"observedTokens":1000120,
+         "observedSpendUsd":0.3,"observedTokens":1000120,
          "observedRequests":3,"pricedRequests":3,"unpricedRequests":0,
          "unmeasuredRequests":0,"coverage":"complete"},
         {"id":"weekly","label":"7-day","windowSeconds":604800,
-         "publishedLimitUsd":30,"observedSpendUsd":1.1,"observedTokens":2400000,
+         "observedSpendUsd":1.1,"observedTokens":2400000,
          "observedRequests":4,"pricedRequests":2,"unpricedRequests":1,
          "unmeasuredRequests":1,"coverage":"partial"},
         {"id":"monthly","label":"30-day","windowSeconds":2592000,
-         "publishedLimitUsd":60,"observedTokens":0,"observedRequests":0,
+         "observedTokens":0,"observedRequests":0,
          "pricedRequests":0,"unpricedRequests":0,"unmeasuredRequests":0,
          "coverage":"none"}],
       "observedLimitEvent":{"limitName":"weekly","observedAt":1784915000000,
@@ -678,9 +822,12 @@ runner.test("ui: OpenCode Go renders published caps and honest local observation
     """)
     let report = quotas[0]
     let references = report.referenceWindows
-    runner.equal(ReferenceQuotaPresentation.capText(references[0]), "5h · Published cap $12")
-    runner.equal(ReferenceQuotaPresentation.capText(references[1]), "7d · Published cap $30")
-    runner.equal(ReferenceQuotaPresentation.capText(references[2]), "30d · Published cap $60")
+    runner.equal(ReferenceQuotaPresentation.title(references[0]), "5h · Local usage")
+    runner.equal(ReferenceQuotaPresentation.title(references[1]), "7d · Local usage")
+    runner.equal(ReferenceQuotaPresentation.title(references[2]), "30d · Local usage")
+    runner.equal(ReferenceQuotaPresentation.compactObservationText(references[0]), "5h estimated $0.30")
+    runner.equal(ReferenceQuotaPresentation.compactObservationText(references[1]), "7d partial estimate $1.10")
+    runner.equal(ReferenceQuotaPresentation.compactObservationText(references[2]), "30d no local usage")
     runner.equal(
         ReferenceQuotaPresentation.observationText(references[0]),
         "Estimate $0.30 · 1,000,120 tokens · 3 requests"
@@ -704,9 +851,10 @@ runner.test("ui: OpenCode Go renders published caps and honest local observation
     )
 
     let rendered = references.flatMap {
-        [ReferenceQuotaPresentation.capText($0), ReferenceQuotaPresentation.observationText($0)]
+        [ReferenceQuotaPresentation.title($0), ReferenceQuotaPresentation.observationText($0)]
     }.joined(separator: " ")
     runner.expect(!rendered.contains("%"), "reference data must not manufacture a percentage")
+    runner.expect(!rendered.contains("cap"), "local observations must not claim a current cap")
 
     let accordion = ProviderQuotaAccordionView()
     accordion.apply(makeSnapshot(quotas: quotas))
@@ -714,6 +862,55 @@ runner.test("ui: OpenCode Go renders published caps and honest local observation
     runner.expect(accordion.expandedProviderIDs.contains("opencode-go"), "reference provider expands")
 }
 
+runner.test("ui: OpenCode Go ignores obsolete caps in an older proxy payload") {
+    let quotas = decodeQuotas("""
+    [{"provider":"opencode-go","label":"OpenCode Go","source":"test","updatedAt":1,
+      "quota":{"updatedAt":1,"referenceWindows":[{
+        "id":"five_hour","label":"5-hour","windowSeconds":18000,
+        "publishedLimitUsd":12,"observedSpendUsd":0.3,"observedTokens":100,
+        "observedRequests":1,"pricedRequests":1,"unpricedRequests":0,
+        "unmeasuredRequests":0,"coverage":"complete"}]}}]
+    """)
+    let window = quotas[0].referenceWindows[0]
+    runner.equal(window.publishedLimitUsd, 12)
+    let presentation = "\(ReferenceQuotaPresentation.title(window)) · \(ReferenceQuotaPresentation.observationText(window))"
+    runner.expect(!presentation.contains("$12"), "legacy caps must not appear as current limits")
+    runner.expect(presentation.contains("$0.30"), "local estimate remains visible")
+}
+
+runner.test("ui: OpenCode Go shows the active model and completed per-model usage") {
+    let quotas = decodeQuotas("""
+    [{"provider":"opencode-go","label":"OpenCode Go","source":"test","updatedAt":1,
+      "quota":{"updatedAt":1,"fiveHourPercent":12,"weeklyPercent":40,
+               "monthlyPercent":65}}]
+    """)
+    let usage = try! JSONDecoder().decode(ProviderUsageEnvelope.self, from: Data("""
+    {"generatedAt":1784915336899,"models":[
+      {"provider":"opencode-go","model":"glm-5.2","requests":3,"measuredRequests":2,
+       "totalTokens":1200,"inputTokens":1000,"outputTokens":200,"estimatedCostUsd":0.4},
+      {"provider":"opencode-go","model":"new-unpriced","requests":1,"measuredRequests":0,
+       "totalTokens":0,"inputTokens":0,"outputTokens":0}]}
+    """.utf8))
+    let activity = activitySnapshot(activities: """
+      {"id":"go","role":"primary","provider":"opencode-go","model":"glm-5.2",
+       "phase":"running","startedAt":1}
+    """, activeTurnCount: 1)
+    let accordion = ProviderQuotaAccordionView()
+    accordion.apply(makeSnapshot(
+        quotas: quotas,
+        activity: activity,
+        openCodeGoModelUsage: usage.models,
+        openCodeGoUsageLoaded: true
+    ))
+    let text = accordion.modelUsageTextForTesting("opencode-go")
+    runner.equal(quotas[0].normalizedWindows().count, 3, "live Go quota windows are present")
+    runner.expect(text.contains("In flight · glm-5.2"), "live model is separate from completed usage")
+    runner.expect(text.contains("glm-5.2 · 3 completed requests · 1,200 measured tokens (partial) · estimated $0.40"),
+                  "partially measured totals")
+    runner.expect(text.contains("new-unpriced · 1 completed request · tokens unknown"),
+                  "unmeasured and unpriced usage is not a false zero")
+}
+
 // MARK: - Deep links
 
 runner.test("ui: provider deep-link encoding preserves safe ids") {
@@ -752,6 +949,7 @@ runner.test("ui: activity empty and unavailable states stay compact") {
     let unloaded = makeSnapshot(activityLoaded: false)
     controller.apply(unloaded)
     runner.equal(controller.activityView.headingText, "Live proxy requests", "request heading")
+    runner.equal(controller.activityView.countText, nil, "unknown count is not shown as zero")
     runner.equal(controller.activityView.emptyText, "Request activity unavailable", "unavailable copy")
     runner.expect(controller.activityView.accessibilityLabel()?.contains("unavailable") == true
         || controller.activityView.accessibilityLabel()?.contains("Activity") == true,
@@ -759,23 +957,24 @@ runner.test("ui: activity empty and unavailable states stay compact") {
 
     let empty = activitySnapshot(activities: "", activeTurnCount: 0)
     controller.apply(makeSnapshot(activity: empty))
-    runner.equal(controller.activityView.emptyText, "No requests in flight", "empty request copy")
+    runner.equal(controller.activityView.countText, "0 in flight", "idle count moves into the heading")
+    runner.equal(controller.activityView.emptyText, nil, "idle state needs no duplicate empty row")
     // Should not crash and should keep preferred width.
     runner.equal(controller.preferredContentSize.width, 387, "width stable")
 }
 
-runner.test("ui: header separates proxy requests from the Codex route") {
+runner.test("ui: compact status footer leaves the brand header and request heading uncluttered") {
     let controller = PopoverViewController()
     _ = controller.view
     let activity = activitySnapshot(activities: "", activeTurnCount: 2)
 
     controller.apply(makeSnapshot(activity: activity))
-    runner.equal(controller.headerView.statusText, "Proxy running", "proxy status")
-    runner.equal(controller.headerView.requestCountText, "2 in flight", "request count")
-    runner.equal(controller.headerView.readinessText, "Readiness · Checking", "initial readiness")
+    runner.equal(controller.headerView.accessibilityLabel(), "CodexCommander", "brand-only header")
+    runner.equal(controller.activityView.countText, "2 in flight", "request count beside activity heading")
+    runner.equal(controller.statusFooterView.statusText, "Checking", "initial combined status")
     runner.equal(
-        controller.headerView.codexRouteText,
-        "Codex route · CodexCommander",
+        controller.statusFooterView.codexRouteText,
+        "Codex: CodexCommander",
         "managed Codex route"
     )
 
@@ -787,17 +986,17 @@ runner.test("ui: header separates proxy requests from the Codex route") {
             routingInjected: false
         )
     ))
-    runner.equal(controller.headerView.codexRouteText, "Codex route · Native OpenAI", "native route")
-    runner.expect(
-        controller.headerView.accessibilityLabel()?.contains("2 requests in flight") == true,
-        "request count is explicit to assistive technology"
-    )
+    runner.equal(controller.statusFooterView.codexRouteText, "Codex: Native OpenAI", "native route")
+    runner.expect(controller.activityView.accessibilityLabel()?.contains("2 in flight") == true,
+                  "request count is explicit to assistive technology")
+    runner.expect(controller.statusFooterView.accessibilityLabel()?.contains("in flight") == false,
+                  "status footer does not repeat the request count")
 
     controller.apply(makeSnapshot(
         activity: activity,
         health: currentHealth(diagnosticStale: true)
     ))
-    runner.equal(controller.headerView.codexRouteText, "Codex route · Unknown", "stale route fails closed")
+    runner.equal(controller.statusFooterView.codexRouteText, "Codex: Unconfirmed", "stale route fails closed")
 }
 
 runner.test("ui: fresh route truth overrides stale startup diagnostics immediately") {
@@ -808,8 +1007,8 @@ runner.test("ui: fresh route truth overrides stale startup diagnostics immediate
     controller.apply(snapshot)
 
     runner.equal(
-        controller.headerView.codexRouteText,
-        "Codex route · Native OpenAI",
+        controller.statusFooterView.codexRouteText,
+        "Codex: Native OpenAI",
         "focused route observation"
     )
     runner.equal(controller.footerEnabledStates[5], false, "native action follows fresh route")
@@ -823,7 +1022,7 @@ runner.test("ui: unconfirmed route truth is explicit and leaves both choices ava
     snapshot.codexRoute = .confirmationUnavailable
     controller.apply(snapshot)
 
-    runner.equal(controller.headerView.codexRouteText, "Codex route · Unconfirmed")
+    runner.equal(controller.statusFooterView.codexRouteText, "Codex: Unconfirmed")
     runner.equal(controller.footerEnabledStates[5], true, "native recovery remains available")
     runner.equal(controller.footerEnabledStates[6], true, "proxy recovery remains available")
 }
@@ -835,7 +1034,7 @@ runner.test("ui: backend-confirmed unknown stays distinct from unavailable confi
     snapshot.codexRoute = .confirmed(CodexRouteStatus(routingKind: .unknown))
     controller.apply(snapshot)
 
-    runner.equal(controller.headerView.codexRouteText, "Codex route · Unknown")
+    runner.equal(controller.statusFooterView.codexRouteText, "Codex: Unknown")
     runner.equal(controller.footerEnabledStates[5], true)
     runner.equal(controller.footerEnabledStates[6], true)
 }
@@ -1019,33 +1218,57 @@ runner.test("ui: current Codex route disables only the redundant route action")
     runner.equal(controller.footerEnabledStates[6], false, "proxy action disabled in flight")
 }
 
-runner.test("ui: header keeps readiness separate from liveness and routing") {
+runner.test("ui: footer combines liveness and readiness while preserving route context") {
     let controller = PopoverViewController()
     _ = controller.view
     let states: [(ProxyReadinessState, String)] = [
         (.unknown, "Checking"),
         (.pending, "Starting"),
         (.ready, "Ready"),
-        (.failed, "Startup failed"),
-        (.unavailable, "Unavailable"),
+        (.failed, "Sync failed"),
+        (.unavailable, "Readiness unavailable"),
     ]
 
     for (state, label) in states {
         controller.apply(makeSnapshot(readiness: state))
-        runner.equal(controller.headerView.statusText, "Proxy running", "liveness stays running for \(label)")
-        runner.equal(controller.headerView.readinessText, "Readiness · \(label)", "readiness \(label)")
+        runner.equal(controller.statusFooterView.statusText, label, "combined status \(label)")
         runner.equal(
-            controller.headerView.codexRouteText,
-            "Codex route · CodexCommander",
+            controller.statusFooterView.codexRouteText,
+            "Codex: CodexCommander",
             "route stays independent for \(label)"
         )
     }
     runner.expect(
-        controller.headerView.accessibilityLabel()?.contains("Readiness · Unavailable") == true,
-        "readiness is explicit to assistive technology"
+        controller.statusFooterView.accessibilityLabel()?.contains("readiness unavailable") == true,
+        "unavailable readiness is explicit to assistive technology"
     )
 }
 
+runner.test("ui: status footer distinguishes stopped, unverified, and failed states") {
+    let controller = PopoverViewController()
+    _ = controller.view
+    let cases: [(ProxyState, ProxyReadinessState, String)] = [
+        (.loading, .unknown, "Checking"),
+        (.unreachable, .unavailable, "Stopped"),
+        (.unauthorized, .unavailable, "Authentication needed"),
+        (.degraded("probe failed"), .unavailable, "Connection issue"),
+        (.running(currentHealth()), .failed, "Sync failed"),
+        (.running(currentHealth(status: "at-risk")), .ready, "Startup at risk"),
+    ]
+    for (state, readiness, label) in cases {
+        controller.apply(makeSnapshot(state: state, readiness: readiness))
+        runner.equal(controller.statusFooterView.statusText, label, "status \(label)")
+    }
+    runner.equal(controller.statusFooterView.codexRouteText, "Codex: CodexCommander",
+                 "a live proxy retains independently observed route context")
+
+    controller.apply(makeSnapshot(state: .unreachable))
+    runner.equal(controller.statusFooterView.codexRouteText, "Codex: Unconfirmed",
+                 "a stopped proxy does not present the last route as current")
+    runner.expect(controller.statusFooterView.accessibilityLabel()?.contains("Proxy stopped") == true,
+                  "combined footer status is accessible")
+}
+
 runner.test("ui: activity rows render once and elapsed timers clear the scrollbar") {
     let now = Int64(Date().timeIntervalSince1970 * 1_000)
     let activity = activitySnapshot(
@@ -1088,12 +1311,13 @@ runner.test("ui: activity rows render once and elapsed timers clear the scrollba
     }
 }
 
-runner.test("ui: accessibility labels exist on header and accordion") {
+runner.test("ui: accessibility labels exist on header, status footer, and accordion") {
     let controller = PopoverViewController()
     _ = controller.view
     let quotas = decodeQuotas("[\(quotaJSON(provider: "openai", label: "ChatGPT", fiveHour: 12))]")
     controller.apply(makeSnapshot(quotas: quotas))
     _ = runner.notNil(controller.headerView.accessibilityLabel(), "header a11y")
+    _ = runner.notNil(controller.statusFooterView.accessibilityLabel(), "status a11y")
     _ = runner.notNil(controller.quotaAccordion.accessibilityLabel(), "quota a11y")
 }
 
@@ -1113,12 +1337,14 @@ runner.test("ui: running footer invokes proxy, Codex route, and exit actions ind
     controller.onRestoreNativeCodex = { calls.append("restore-native") }
     controller.onRouteCodexThroughProxy = { calls.append("restore-back") }
     controller.onStopAndQuit = { calls.append("stop-and-quit") }
+    controller.onCheckForUpdates = { calls.append("updates") }
     for index in 0..<8 { controller.activateFooterForTesting(index) }
+    controller.activateMoreActionForTesting(2)
     runner.equal(
         calls,
         [
             "dashboard", "logs", "refresh", "stop", "restart",
-            "restore-native", "restore-back", "stop-and-quit",
+            "restore-native", "restore-back", "stop-and-quit", "updates",
         ]
     )
 }
@@ -1935,7 +2161,12 @@ MainActor.assumeIsolated {
         let controller = PopoverViewController()
         controller.applyUpdatePresentation(title: driver.updateAvailable ? "Update Available…" : "Check for Updates…",
             enabled: true, blocked: false, message: "")
-        runner.equal(controller.updateActionTitleForTesting, "Update Available…")
+        runner.equal(controller.headerUpdateTitleForTesting, "Update Available…")
+        runner.equal(controller.headerUpdateEnabledForTesting, true)
+        runner.equal(controller.moreActionTitles, ["Refresh Models", "Logs"],
+                     "available update moves out of More actions")
+        runner.equal(controller.moreActionsAccessibilityLabel,
+                     "More actions: Refresh Models and Logs")
         decide?(.install)
         runner.equal(disclosures, 1, "only explicit install opens the pause disclosure")
         runner.equal(preparations, 0, "Later never prepares or downloads")
@@ -2210,35 +2441,17 @@ MainActor.assumeIsolated {
         controller.apply(ProxySnapshot(state: .unreachable, endpoint: .default))
         runner.equal(controller.guidanceText, nil, "guarded recovery must not advise starting the proxy")
         runner.equal(controller.commandText, nil, "guarded recovery must not advertise ccx start")
-        runner.equal(controller.updateActionTitleForTesting, "Finish Update…")
-        runner.equal(controller.updateActionEnabledForTesting, true)
+        runner.equal(controller.headerUpdateTitleForTesting, "Finish Update…")
+        runner.equal(controller.headerUpdateEnabledForTesting, true)
+        runner.equal(controller.moreActionTitles, ["Refresh Models", "Logs"],
+                     "pending update moves out of More actions")
         var clicked = false
         controller.onCheckForUpdates = { clicked = true }
-        controller.clickUpdateForTesting()
+        controller.clickHeaderUpdateForTesting()
         runner.equal(clicked, true)
         if let output = ProcessInfo.processInfo.environment["CCX_UPDATER_SCREENSHOT"] {
             controller.apply(ProxySnapshot(state: .unreachable, endpoint: .default))
-            let window = NSWindow(contentRect: controller.view.bounds, styleMask: [.borderless], backing: .buffered, defer: false)
-            window.appearance = NSAppearance(named: .darkAqua)
-            window.contentView = controller.view
-            window.backgroundColor = NSColor(calibratedWhite: 0.12, alpha: 1)
-            controller.view.layoutSubtreeIfNeeded()
-            window.displayIfNeeded()
-            if let bitmap = controller.view.bitmapImageRepForCachingDisplay(in: controller.view.bounds) {
-                controller.view.cacheDisplay(in: controller.view.bounds, to: bitmap)
-                let rendered = NSImage(size: controller.view.bounds.size)
-                rendered.lockFocus()
-                NSColor(calibratedWhite: 0.12, alpha: 1).setFill()
-                controller.view.bounds.fill()
-                let foreground = NSImage(size: controller.view.bounds.size)
-                foreground.addRepresentation(bitmap)
-                NSGraphicsContext.current?.imageInterpolation = .high
-                foreground.draw(in: controller.view.bounds, from: .zero, operation: .sourceOver, fraction: 1)
-                rendered.unlockFocus()
-                if let tiff = rendered.tiffRepresentation, let opaque = NSBitmapImageRep(data: tiff) {
-                    try? opaque.representation(using: .png, properties: [:])?.write(to: URL(fileURLWithPath: output))
-                }
-            }
+            writePanelScreenshot(controller, to: output)
         }
     }
 }
diff --git a/docs-site/public/macos-menu-bar.png b/docs-site/public/macos-menu-bar.png
index b0a9be9662e..0a0ccd23dab 100644
Binary files a/docs-site/public/macos-menu-bar.png and b/docs-site/public/macos-menu-bar.png differ
diff --git a/docs-site/src/content/docs/guides/macos-menu-bar.md b/docs-site/src/content/docs/guides/macos-menu-bar.md
index e22a98400db..db8e213bfa5 100644
--- a/docs-site/src/content/docs/guides/macos-menu-bar.md
+++ b/docs-site/src/content/docs/guides/macos-menu-bar.md
@@ -29,13 +29,12 @@ In-app updates are available starting with the numbered v0.1.6 build. If you ins
 v0.1.6 archive without a build number in its name, install the newer build or a later release manually
 once using the steps above.
 
-![macOS menu with an update action](/macos-updates.png)
-
 The app checks for compatible stable releases quietly in the background. Starting with v0.1.8, it checks
-on launch and every six hours while running. When it finds an update, the menu shows
-**Update Available…**. Closing the update window or choosing **Later** keeps that reminder available
-so you can return to it. Select it to review the version and release notes.
-You can also choose **Check for Updates…** to check manually. Checking, including a failed or
+on launch and every six hours while running. When it finds an update, the panel header shows
+**Update** in the upper right. Closing the update window or choosing **Later** keeps that button available
+so you can return to it. Select it to review the version and release notes. If an installation needs
+attention, the header button changes to **Finish Update**.
+You can also choose **More actions → Check for Updates…** to check manually. Checking, including a failed or
 offline background check, leaves the proxy running and does not open an unsolicited update window.
 
 Downloads and installation require an explicit choice. When you choose to install, a confirmation
@@ -94,7 +93,8 @@ the app and reopen it. The ad-hoc Gatekeeper steps above remain unchanged.
 
 ## Startup modes
 
-The panel has one **Launch at Login** switch and reports the resulting mode:
+The panel has one **Launch at Login** switch. Hover over its label or switch for the normal mode
+summary; approval, errors, and recovery guidance remain visible in the row. The resulting modes are:
 
 - **Desktop** — the CodexCommander menu app launches when you sign in, performs an explicit Start,
   starts or attaches to exactly one proxy, and routes managed Codex through it when Codex
@@ -143,14 +143,27 @@ override it.
 
 ## What the panel shows
 
-- **Proxy status** — reports process liveness without treating a running server as proof that startup
-  synchronization finished or that Codex uses the proxy.
-- **Readiness** — reports startup and catalog synchronization as **Checking**, **Starting**, **Ready**,
-  **Startup failed**, or **Unavailable**. This signal is independent of proxy liveness.
-- **Codex route** — reports whether Codex currently routes through CodexCommander, native OpenAI, or
+Proxy controls and the available Codex route switch share the first action row. Dashboard and More
+actions are compact buttons in the header; Stop and Quit remains visible above the one-line
+Launch at Login control. If the Codex route is uncertain, both recovery choices appear on a separate
+row. More actions contains Refresh Models, Logs, and the manual update check. An
+available update or installation needing attention appears in the upper-right header instead. The
+scroll area contains provider quotas followed by live requests, with the in-flight count beside the
+live-request heading. A one-line status footer
+sits below the scroll area, at the bottom of the panel. When the current Codex route is confirmed,
+the controls show the available route switch instead of a disabled action for the route already in
+use. If the route cannot be confirmed, both recovery actions remain visible.
+
+- **Status footer** — combines proxy liveness and startup readiness into one label: **Checking**,
+  **Starting**, **Ready**, **Sync failed**, **Startup at risk**, **Readiness unavailable**, **Stopped**,
+  **Authentication needed**, or **Connection issue**. **Ready** requires both a running proxy and
+  completed startup synchronization. The footer reports status; actions remain in the controls or
+  guidance above it.
+- **Codex route** — appears beside the footer status and reports whether Codex currently routes through CodexCommander, native OpenAI, or
   another custom route. A running proxy does not by itself mean that Codex is using it. After an
   explicit switch, the companion confirms this value from a fresh uncached read of the route Codex
-  will consume instead of waiting for cached startup diagnostics.
+  will consume instead of waiting for cached startup diagnostics. An unconfirmed or stale route is
+  labeled **Unconfirmed** rather than presented as current.
 - **Live proxy requests** — the current in-flight request count and live model/provider turn rows. A
   spawned-child request is nested only when CodexCommander can prove its in-flight parent from request
   metadata; otherwise it is shown as a standalone subagent turn. A row disappears when that model
@@ -158,10 +171,16 @@ override it.
   persistent Codex agent-lifecycle view, and the companion never invents queued, reviewing,
   rate-limited, or completed history.
 - **Provider quotas** — provider-reported 5-hour, weekly, monthly, or provider-specific credit
-  windows and reset times when available. OpenCode Go instead shows its published caps and local
-  observations, never an invented live balance. Missing data is shown as unavailable, never as zero
-  usage or unlimited capacity.
-- **Dashboard and Logs** — open the corresponding local dashboard view in your default browser with
+  windows and reset times when available. OpenCode Go shows its account-wide rolling, weekly, and
+  monthly used percentages from its Go usage endpoint. If that endpoint is unavailable, the menu
+  shows locally observed requests, tokens, and estimated cost without a limit or remaining balance.
+  Missing data is never shown as zero usage or unlimited capacity.
+- **OpenCode Go model usage** — expand the provider to see each model's completed requests and
+  measured tokens over the last 30 days. An active model is marked **In flight** separately; its
+  final usage is recorded when the request completes. The dashboard's OpenCode Go Overview and Usage
+  tab show the same 30-day model totals. These local observations are not a live provider balance.
+- **Dashboard and Logs** — Dashboard opens from the header; Logs is under **More actions**.
+  Both open the corresponding local dashboard view in your default browser with
   a one-time launch authorization for full dashboard changes, including catalog Apply.
 - **Startup options…** — opens the dashboard's Startup page when an optional startup upgrade or
   repair is available; the panel does not make a raw CLI command the primary action.
@@ -244,6 +263,12 @@ configured in CodexCommander. If no Codex worker is running, the new roster is r
 task. If a long-lived worker loaded an older roster, CodexCommander stays running and the panel keeps the
 nonfatal **Restart ChatGPT to load models** card visible.
 
+Choose **More actions → Refresh Models** in the panel to run the same non-disruptive catalog sync as `ccx sync`.
+This checks the current native Codex account and enabled providers; the panel then checks whether
+running Codex workers still hold an older catalog. The panel also reads catalog status when opened
+and periodically while open, so a sync run from the CLI can show the restart card without relaunching
+the menu app. A model added upstream is discovered on the next sync, not by the status check alone.
+
 Choose **Show restart steps…**, quit ChatGPT completely, and reopen it. Return to the same task and
 check its model picker. This replaces the old worker; CodexCommander and the menu app remain running
 throughout. Some task-scoped collaboration setting changes still require a new task.
@@ -323,8 +348,9 @@ bun run build:macos
 open dist/macos/CodexCommander.app
 ```
 
-Without a release public key, a development build shows **Updates unavailable in this build**;
-normal Start still works. Its default integer build identifier is `1`. Keyed builds require an
+Without a release public key, a development build disables **More actions → Check for Updates…**;
+its tooltip explains that updates are unavailable in this build. Normal Start still works. Its
+default integer build identifier is `1`. Keyed builds require an
 explicit positive-integer `MACOS_BUILD_NUMBER`; release packaging also requires the signing public
 key and a build number above the published inventory. These are maintainer release prerequisites,
 not required for ordinary source development.
diff --git a/docs-site/src/content/docs/guides/providers.md b/docs-site/src/content/docs/guides/providers.md
index 15f2c0430e9..ba0b757ad21 100644
--- a/docs-site/src/content/docs/guides/providers.md
+++ b/docs-site/src/content/docs/guides/providers.md
@@ -290,19 +290,31 @@ Volcengine Agent Plan uses its native Responses endpoint through `openai-respons
 OpenCode authentication store or Keychain for this key.
 
 The public model catalog is not evidence that a key works, so a saved key is **unverified** until the
-first successful inference using that active key. The provider's published caps are reference caps —
-**$12 / 5 hours**, **$30 / 7 days**, and **$60 / 30 days**. The dashboard's matching 5-hour, 7-day,
-and 30-day observations are local usage estimates, not live remaining quota or billing. An
-authoritative limit event is shown only after the upstream reports a concrete limit event (and, when
-provided, its reset).
-
-The provider pins 28 verified Zen Go model ids, including `deepseek-v4.1-flash`,
-`glm-5.3-flash`, and `qwen3.8-flash`, as
-its static catalog. Live `/v1/models` discovery is authoritative on the canonical host; ids
-outside the trusted set are quarantined rather than routed. Transports follow the official
-endpoint table: Qwen and MiniMax models go over Anthropic Messages, `gpt-5.6-luna` and `grok-4.5`
-over OpenAI Responses, and the
-remaining models over OpenAI Chat Completions. These trust facts attach only to the canonical
+first successful inference using that active key. With a configured Go key, CodexCommander reads
+OpenCode's Go usage endpoint and shows its account-wide rolling, weekly, and monthly **used
+percentages** and reset times in the dashboard and macOS menu. When the endpoint is unavailable,
+the quota view shows only traffic observed through this proxy in the corresponding time windows.
+Those local request, token, and estimated-cost totals are not the provider's current balance or
+per-model allowance. A concrete upstream limit event can also be shown with its reported reset.
+
+OpenCode Go's **Overview** in the dashboard also shows completed requests and tokens for each model
+over the last 30 days; the **Usage** tab retains the full model breakdown. Expanding OpenCode Go in
+the macOS menu shows the same per-model completed usage beside the provider quota. While
+a request is active, the menu identifies its model as **In flight**; its final token count appears
+only after the request completes and the proxy records it. Unmeasured token totals are shown as
+unknown rather than zero, and estimated cost appears only when pricing is available for that model.
+
+The Muse Spark 1.2 and 1.3 **Contributor** models may use submitted prompts and completions to train
+future Meta models. See [Meta's Contributor tier terms](https://dev.meta.ai/docs/pricing-rate-limits#contributor-tier)
+before sending data through either model.
+
+The provider keeps a reviewed fallback catalog of OpenCode Go models, including
+`deepseek-v4.1-flash`, `gpt-6-luna`, and `grok-4.7`. With a Go key, live `/v1/models`
+discovery determines which of those models the account can use. That endpoint returns model ids
+without transport metadata, so a new id appears in Commander after its protocol is verified and
+added to the trusted catalog; unverified ids are held back. The [OpenCode Go endpoint
+table](https://opencode.ai/v2/docs/console/go#endpoints) identifies models using Anthropic Messages,
+OpenAI Responses, or Chat Completions. These transport facts attach only to the canonical
 `https://opencode.ai/zen/go/v1` destination; a same-named custom provider keeps its own behavior.
 
 OpenCode Go requires a session identifier for each conversation. CodexCommander derives an opaque
diff --git a/docs-site/src/content/docs/guides/web-dashboard.md b/docs-site/src/content/docs/guides/web-dashboard.md
index 6c34d401c8c..b083cc7cc3c 100644
--- a/docs-site/src/content/docs/guides/web-dashboard.md
+++ b/docs-site/src/content/docs/guides/web-dashboard.md
@@ -91,9 +91,9 @@ on. **Logs** works the same way with `#logs` and `#logs/debug`.
 Cost values in **Dashboard**, **Logs**, and **Usage** are API list-price equivalents calculated from
 reported tokens. They are not billing receipts or evidence of an actual charge; subscription usage
 or provider credits may apply instead. The Dashboard's **Plan & quota** section shows
-provider-reported limits (5-hour / weekly / monthly windows), the provider plan, and observed
-reference spend versus published caps — always labeled as provider-reported estimates, never billed
-spend.
+provider-reported limits (5-hour / weekly / monthly windows) and the provider plan when available.
+If OpenCode Go's live meter is unavailable, it shows only locally observed traffic and estimated
+cost, without a claimed cap or remaining balance. Estimated cost is not billed spend.
 
 ### Request usage and dispatch evidence
 
@@ -120,6 +120,16 @@ providers are capped or their saved values differ. Native OpenAI models always k
 Automatic upstream catalog refresh is configured per provider under **Providers → Settings**. The
 Models page shows that state and links directly to it; it does not keep a second discovery setting.
 
+On **Models**, choose **Refresh models** to run the same explicit, non-disruptive sync as `ccx sync`.
+It rechecks the native Codex account and enabled routed providers, then updates the published Codex
+catalog. Provider models that Commander discovered and enabled but did not publish into Codex's
+current picker catalog appear gray with a **Commander only** badge; use the badge count to filter
+them. This comparison is unavailable when the published catalog cannot be read, and a provider's
+model listing alone does not prove that the account can complete an inference with it. If the
+catalog is current but running Codex workers hold an older version, Models shows a prompt to quit
+and reopen ChatGPT. Opening Models checks the existing local catalog; upstream discovery occurs on
+the explicit sync.
+
 ## Catalog activation
 
 Saving model visibility, the featured roster, or collaboration mode is deliberately non-disruptive:
diff --git a/gui/src/components/provider-workspace/ProviderDetails.tsx b/gui/src/components/provider-workspace/ProviderDetails.tsx
index f5f6b9894a4..eda2e6eb3f3 100644
--- a/gui/src/components/provider-workspace/ProviderDetails.tsx
+++ b/gui/src/components/provider-workspace/ProviderDetails.tsx
@@ -263,6 +263,7 @@ export default function ProviderDetails({
             apiBase={apiBase}
             connectionIdentity={connectionIdentity}
             usageTotals={usageTotals}
+            modelUsage={modelUsage}
             quotaReport={quotaReport}
             quotaUnavailableReason={quotaUnavailableReason}
             onRetryQuota={onRetryQuota}
diff --git a/gui/src/components/provider-workspace/ProviderOverview.tsx b/gui/src/components/provider-workspace/ProviderOverview.tsx
index e0f38525dfa..4663c3572fc 100644
--- a/gui/src/components/provider-workspace/ProviderOverview.tsx
+++ b/gui/src/components/provider-workspace/ProviderOverview.tsx
@@ -10,7 +10,7 @@ import { binProviderStatus, type WorkspaceItem } from "../../provider-workspace/
 import { formatRelativeTime, relativeTimeLabelsFromT, formatRequestCount, formatTokenCount } from "../../provider-workspace/usage";
 import { accountQuotaFromReport, formatQuotaSourceLabel, type ProviderQuotaReportView } from "../../provider-workspace/report";
 import { quotaUnavailableReasonKey } from "../../quota-unavailable";
-import type { ProviderUsageTotals } from "./types";
+import type { ProviderModelUsageRow, ProviderUsageTotals } from "./types";
 import { authModeLabel } from "./ProviderRail";
 import type { ProviderUpdatePatch } from "./types";
 import { ProviderCapacityQuota } from "./ProviderCapacityQuota";
@@ -31,7 +31,7 @@ type ConnectionTestState = {
 };
 
 export default function ProviderOverview({
-  item, usageTotals, quotaReport, quotaUnavailableReason, onRetryQuota, oauthEmail, oauth,
+  item, usageTotals, modelUsage, quotaReport, quotaUnavailableReason, onRetryQuota, oauthEmail, oauth,
   accountNeedsReauth = false,
   apiBase, connectionIdentity,
   onEditSettings, onViewUsage, onUpdateProvider,
@@ -39,6 +39,7 @@ export default function ProviderOverview({
 }: {
   item: WorkspaceItem;
   usageTotals?: ProviderUsageTotals;
+  modelUsage?: ProviderModelUsageRow[];
   quotaReport?: ProviderQuotaReportView;
   /** Provider quota is unavailable (no report); reason drives the notice copy. */
   quotaUnavailableReason?: string;
@@ -86,6 +87,9 @@ export default function ProviderOverview({
       : t("prov.disabledBadge");
   const requests = usageTotals?.requests;
   const tokens = usageTotals?.totalTokens;
+  const openCodeGoModels = item.name === "opencode-go"
+    ? (modelUsage ?? []).toSorted((a, b) => b.totalTokens - a.totalTokens)
+    : [];
   const quota = quotaReport ? accountQuotaFromReport(quotaReport) : null;
   const connectionProbeKey = JSON.stringify([
     apiBase ?? null,
@@ -246,6 +250,67 @@ export default function ProviderOverview({
         </section>
       ) : null}
 
+      {item.name === "opencode-go" && (
+        <section className="pws-section" aria-label={t("pws.usageLast30d")}>
+          <h3 className="pws-section-title">{t("pws.usageLast30d")}</h3>
+          {typeof requests === "number" && (
+            <div className="pws-usage-metrics" role="group" aria-label={t("pws.usageLast30d")}>
+              <div className="pws-usage-metric">
+                <span className="pws-usage-metric-value">{formatRequestCount(requests, locale)}</span>
+                <span className="muted pws-usage-metric-label">{t("pws.metricRequests")}</span>
+              </div>
+              {typeof tokens === "number" && (
+                <div className="pws-usage-metric">
+                  <span className="pws-usage-metric-value">
+                    {requests > 0 && !(typeof usageTotals?.measuredRequests === "number" && usageTotals.measuredRequests > 0)
+                      ? t("logs.tokens.unreported")
+                      : formatTokenCount(tokens, locale)}
+                  </span>
+                  <span className="muted pws-usage-metric-label">
+                    {t("pws.metricTokens")}
+                    {requests > 0 && typeof usageTotals?.measuredRequests === "number" && usageTotals.measuredRequests > 0 && usageTotals.measuredRequests < requests
+                      ? ` · ${t("pws.reference.partial")}`
+                      : ""}
+                  </span>
+                </div>
+              )}
+            </div>
+          )}
+          {openCodeGoModels.length > 0 ? (
+            <div className="tbl-wrap">
+              <table className="pws-model-table">
+                <caption>{t("pws.modelBreakdown")}</caption>
+                <thead>
+                  <tr>
+                    <th scope="col">{t("pws.col.model")}</th>
+                    <th scope="col" className="num">{t("pws.col.requests")}</th>
+                    <th scope="col" className="num">{t("pws.col.tokens")}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {openCodeGoModels.map(row => (
+                    <tr key={row.model}>
+                      <td className="mono">{row.model}</td>
+                      <td className="num">{formatRequestCount(row.requests, locale)}</td>
+                      <td className="num mono">
+                        {row.requests > 0 && !(typeof row.measuredRequests === "number" && row.measuredRequests > 0)
+                          ? t("logs.tokens.unreported")
+                          : formatTokenCount(row.totalTokens, locale)}
+                        {row.requests > 0 && typeof row.measuredRequests === "number" && row.measuredRequests > 0 && row.measuredRequests < row.requests
+                          ? <span className="muted"> · {t("pws.reference.partial")}</span>
+                          : null}
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          ) : typeof requests !== "number" ? (
+            <p className="muted">{t("pws.usageUnavailable")}</p>
+          ) : null}
+        </section>
+      )}
+
       <section className="pws-section" aria-label={t("pws.authSummary")}>
         <h3 className="pws-section-title">{t("pws.authSummary")}</h3>
         {showAuthWarning ? (
diff --git a/gui/src/components/provider-workspace/ProviderOverviewDashboard.tsx b/gui/src/components/provider-workspace/ProviderOverviewDashboard.tsx
index ad95ac5df32..dddbd82d67d 100644
--- a/gui/src/components/provider-workspace/ProviderOverviewDashboard.tsx
+++ b/gui/src/components/provider-workspace/ProviderOverviewDashboard.tsx
@@ -27,6 +27,7 @@ import { ProviderIcon } from "./ProviderRail";
 import { formatProviderDisplayName } from "../../provider-icons";
 import QuotaBars from "../QuotaBars";
 import { ProviderCapacityQuota } from "./ProviderCapacityQuota";
+import { referenceCoverageLabel, referenceObservedLabels } from "../../provider-workspace/reference-observation";
 
 export default function ProviderOverviewDashboard({
   sections,
@@ -181,15 +182,16 @@ export default function ProviderOverviewDashboard({
                   <IconChevron className="pws-dashboard-row-chevron" aria-hidden="true" />
                   <div className="pws-dashboard-row-bars">
                     {referenceQuotaFromReport(report) ? (
-                      <div className="pws-dashboard-reference-caps">
+                      <div className="pws-dashboard-reference-observations">
                         {referenceQuotaFromReport(report)!.windows.map(window => (
                           <span key={window.id}>
-                            <strong>{new Intl.NumberFormat(locale, { style: "currency", currency: "USD", maximumFractionDigits: 0 }).format(window.publishedLimitUsd)}</strong>
-                            {t(window.id === "five_hour"
-                              ? "pws.reference.fiveHourShort"
+                            <strong>{t(window.id === "five_hour"
+                              ? "pws.reference.fiveHour"
                               : window.id === "weekly"
-                                ? "pws.reference.weeklyShort"
-                                : "pws.reference.monthlyShort")}
+                                ? "pws.reference.weekly"
+                                : "pws.reference.monthly")}</strong>
+                            {referenceObservedLabels(window, locale, t).join(" · ")}
+                            {referenceCoverageLabel(window.coverage, t) && ` · ${referenceCoverageLabel(window.coverage, t)}`}
                           </span>
                         ))}
                         <small>{t("pws.reference.dashboardHint")}</small>
diff --git a/gui/src/components/provider-workspace/ProviderUsage.tsx b/gui/src/components/provider-workspace/ProviderUsage.tsx
index 983f825a487..f4da05d7ca5 100644
--- a/gui/src/components/provider-workspace/ProviderUsage.tsx
+++ b/gui/src/components/provider-workspace/ProviderUsage.tsx
@@ -15,6 +15,7 @@ import {
   type ProviderQuotaReferenceWindowView,
   type ProviderQuotaReportView,
 } from "../../provider-workspace/report";
+import { referenceCoverageLabel, referenceObservedLabels } from "../../provider-workspace/reference-observation";
 import type { ProviderUsageTotals, ProviderModelUsageRow } from "./types";
 
 export default function ProviderUsage({ item, usageTotals, quotaReport, modelUsage }: {
@@ -206,11 +207,6 @@ function ReferenceQuota({ windows, limitEvent, locale }: {
   locale: string;
 }) {
   const t = useT();
-  const money = (amount: number) => new Intl.NumberFormat(locale, {
-    style: "currency",
-    currency: "USD",
-    maximumFractionDigits: amount >= 10 ? 0 : 2,
-  }).format(amount);
   const reset = limitEvent?.resetAt === undefined ? null : new Intl.DateTimeFormat(locale, {
     month: "short",
     day: "numeric",
@@ -237,19 +233,12 @@ function ReferenceQuota({ windows, limitEvent, locale }: {
           <div className="pws-reference-row" key={window.id}>
             <div className="pws-reference-row-head">
               <strong>{t(REFERENCE_WINDOW_KEYS[window.id])}</strong>
-              <span className="pws-reference-cap">
-                {t("pws.reference.publishedCap", { amount: money(window.publishedLimitUsd) })}
-              </span>
             </div>
             <div className="pws-reference-observed">
-              <span>{observedWindowLabel(window, locale, t)}</span>
+              {referenceObservedLabels(window, locale, t).map(label => <span key={label}>{label}</span>)}
               {window.coverage !== "none" && (
                 <span className={`pws-reference-badge pws-reference-badge--${window.coverage}`}>
-                  {t(window.coverage === "complete"
-                    ? "pws.reference.estimate"
-                    : window.coverage === "partial"
-                      ? "pws.reference.partial"
-                      : "pws.reference.tokensOnly")}
+                  {referenceCoverageLabel(window.coverage, t)}
                 </span>
               )}
             </div>
@@ -260,24 +249,3 @@ function ReferenceQuota({ windows, limitEvent, locale }: {
     </div>
   );
 }
-
-function observedWindowLabel(
-  window: ProviderQuotaReferenceWindowView,
-  locale: string,
-  t: ReturnType<typeof useT>,
-): string {
-  if (window.observedRequests === 0) return t("pws.reference.noTraffic");
-  if (window.observedSpendUsd !== undefined) {
-    const amount = new Intl.NumberFormat(locale, {
-      style: "currency",
-      currency: "USD",
-      minimumFractionDigits: 2,
-      maximumFractionDigits: window.observedSpendUsd < 0.01 ? 4 : 2,
-    }).format(window.observedSpendUsd);
-    return t("pws.reference.spendObserved", { amount });
-  }
-  if (window.observedTokens > 0) {
-    return t("pws.reference.tokensObserved", { tokens: formatTokenCount(window.observedTokens, locale) });
-  }
-  return t("pws.reference.requestsObserved", { requests: formatRequestCount(window.observedRequests, locale) });
-}
diff --git a/gui/src/components/provider-workspace/ProviderWorkspaceShell.tsx b/gui/src/components/provider-workspace/ProviderWorkspaceShell.tsx
index 2df71c62254..fd1087a0d0f 100644
--- a/gui/src/components/provider-workspace/ProviderWorkspaceShell.tsx
+++ b/gui/src/components/provider-workspace/ProviderWorkspaceShell.tsx
@@ -193,20 +193,23 @@ export default function ProviderWorkspaceShell({
 
   useEffect(() => {
     let cancelled = false;
-    const timeout = window.setTimeout(() => {
+    let inFlight = false;
+    const refreshUsage = (initial: boolean) => {
+      if (cancelled || inFlight) return;
+      inFlight = true;
       // Keep last-good paint when sessionStorage already seeded — don't flash loading skeletons.
       // Read inside the effect (keyed by usageCacheKey) so the seed check stays correct without
       // closing over an unstable cachedUsage render value.
-      if (!readSessionListCache(usageCacheKey)) setUsageLoading(true);
+      if (initial && !readSessionListCache(usageCacheKey)) setUsageLoading(true);
       void fetch(`${apiBase}/api/usage?range=30d`)
         .then(r => readJsonIfOk<{
-          providers?: Array<{ provider: string; requests: number; totalTokens?: number }>;
-          models?: Array<{ provider: string; model: string; resolvedModel?: string; requests: number; totalTokens: number; inputTokens: number; outputTokens: number; shareRatio: number; estimatedCostUsd?: number }>;
+          providers?: Array<{ provider: string; requests: number; measuredRequests?: number; totalTokens?: number }>;
+          models?: Array<{ provider: string; model: string; resolvedModel?: string; requests: number; measuredRequests?: number; totalTokens: number; inputTokens: number; outputTokens: number; shareRatio: number; estimatedCostUsd?: number }>;
         }>(r))
         .then((data) => {
           if (cancelled || !data) return;
           const byProvider: Record<string, ProviderUsageTotals> = {};
-          for (const p of data.providers ?? []) byProvider[p.provider] = { requests: p.requests, totalTokens: p.totalTokens };
+          for (const p of data.providers ?? []) byProvider[p.provider] = { requests: p.requests, measuredRequests: p.measuredRequests, totalTokens: p.totalTokens };
           setUsageTotals(byProvider);
           // Group model rows by provider
           const byProviderModels: Record<string, ProviderModelUsageRow[]> = {};
@@ -217,6 +220,7 @@ export default function ProviderWorkspaceShell({
               model: m.model,
               ...(m.resolvedModel ? { resolvedModel: m.resolvedModel } : {}),
               requests: m.requests,
+              measuredRequests: m.measuredRequests,
               totalTokens: m.totalTokens,
               inputTokens: m.inputTokens,
               outputTokens: m.outputTokens,
@@ -228,11 +232,19 @@ export default function ProviderWorkspaceShell({
           writeSessionListCache(usageCacheKey, { totals: byProvider, models: byProviderModels });
         })
         .catch(() => {})
-        .finally(() => { if (!cancelled) setUsageLoading(false); });
-    }, 0);
+        .finally(() => {
+          inFlight = false;
+          if (!cancelled && initial) setUsageLoading(false);
+        });
+    };
+    const timeout = window.setTimeout(() => refreshUsage(true), 0);
+    const interval = window.setInterval(() => {
+      if (document.visibilityState === "visible") refreshUsage(false);
+    }, 60_000);
     return () => {
       cancelled = true;
       window.clearTimeout(timeout);
+      window.clearInterval(interval);
     };
   }, [apiBase, usageCacheKey]);
 
diff --git a/gui/src/components/provider-workspace/types.ts b/gui/src/components/provider-workspace/types.ts
index 26bab46bf19..7aae6ab889d 100644
--- a/gui/src/components/provider-workspace/types.ts
+++ b/gui/src/components/provider-workspace/types.ts
@@ -22,6 +22,8 @@ export type TypeFilter = { cloud: boolean; local: boolean; selfHosted: boolean;
 /** Per-provider usage totals for the workspace overview (30d window). */
 export interface ProviderUsageTotals {
   requests?: number;
+  /** Requests with token usage reported by the provider. */
+  measuredRequests?: number;
   totalTokens?: number;
 }
 
@@ -30,6 +32,8 @@ export interface ProviderModelUsageRow {
   model: string;
   resolvedModel?: string;
   requests: number;
+  /** Requests with token usage reported by the provider. Optional for cached/legacy rows. */
+  measuredRequests?: number;
   totalTokens: number;
   inputTokens: number;
   outputTokens: number;
diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts
index 4123fc10e41..94fda7170ba 100644
--- a/gui/src/i18n/de.ts
+++ b/gui/src/i18n/de.ts
@@ -212,8 +212,8 @@ export const de: Record<TKey, string> = {
   "dash.planQuota.hint": "Vom Anbieter gemeldete Limits und Schätzungen — niemals abgerechnete Ausgaben.",
   "dash.planQuota.loading": "Anbieterkontingent wird geladen…",
   "dash.planQuota.empty": "Noch keine Anbieter-Kontingentdaten.",
-  "dash.planQuota.disclaimer": "Vom Anbieter gemeldete Obergrenzen und lokale Schätzungen — keine Abrechnung.",
-  "dash.planQuota.referenceIntro": "Veröffentlichte Obergrenzen vs. über diesen Proxy beobachteter Datenverkehr",
+  "dash.planQuota.disclaimer": "Vom Anbieter gemeldete Limits und lokale Beobachtungen — keine Abrechnung.",
+  "dash.planQuota.referenceIntro": "Über diesen Proxy beobachtete Nutzung, solange die Live-Nutzung von Go nicht verfügbar ist",
   "dash.planQuota.unavailable": "Kontingent nicht verfügbar",
   "dash.planQuota.manageProvider": "{provider} verwalten",
   "dash.planQuota.retry": "Kontingentprüfung wiederholen",
@@ -430,6 +430,18 @@ export const de: Record<TKey, string> = {
   "prov.openaiApiMissing": "API-Schlüssel erforderlich",
   "prov.openaiApiSetup": "API-Schlüssel einrichten",
   "models.subtitle": "Verwalte, welche Modelle Codex sieht und wie Modellkontext behandelt wird.",
+  "models.refreshModels": "Modelle aktualisieren",
+  "models.refreshing": "Modelle werden aktualisiert…",
+  "models.syncComplete": "Modellabgleich abgeschlossen. Starte ChatGPT neu, falls unten dazu aufgefordert wird.",
+  "models.syncSkipped": "Modellabgleich übersprungen. Prüfe die Codex-Integrationseinstellungen.",
+  "models.syncFailed": "Modellabgleich fehlgeschlagen.",
+  "models.commanderOnlyBadge": "Nur Commander",
+  "models.commanderOnlyHint": "Von Commander erkannt, aber nicht im aktuellen Codex-Modellkatalog enthalten.",
+  "models.commanderOnlyFilter": "Nur Commander ({count})",
+  "models.commanderOnlySummary": "{count} aktivierte Modelle wurden von Commander erkannt, sind aber nicht im aktuellen Codex-Katalog aufgeführt.",
+  "models.tipCommanderOnly": "Von Commander erkannt; nicht in Codex aufgeführt",
+  "models.restartCodex": "{count} laufende Codex-Prozesse verwenden einen älteren Modellkatalog. Beende ChatGPT vollständig und öffne es erneut.",
+  "models.catalogUnavailable": "Der Codex-Katalog konnte nicht gelesen werden; der Vergleich ist nicht verfügbar.",
   "models.nativeGroupLabel": "OpenAI nativ",
   "models.nativeHint": "Passthrough-Modelle verwenden die unter Anbieter gewählte Pool- oder Direkt-Option. Ausblenden entfernt sie aus der Codex-Auswahl (Katalogeintrag bleibt, Reaktivierung stellt exakt wieder her).",
   "models.active": "{active}/{total} sichtbar",
@@ -1787,14 +1799,13 @@ export const de: Record<TKey, string> = {
   "pws.quota.retry": "Erneut versuchen",
   "pws.quotaUnavailable": "Keine Kontingentdaten für diesen Provider.",
   "pws.planLimits": "Plangrenzen und lokale Beobachtungen",
-  "pws.reference.intro": "OpenCode Go bietet keine Live-API für das verbleibende Guthaben. Diese veröffentlichten Obergrenzen stehen neben dem Datenverkehr, den dieser CodexCommander-Proxy beobachtet hat.",
+  "pws.reference.intro": "Die Live-Nutzung von OpenCode Go ist nicht verfügbar. Angezeigt wird nur der über diesen CodexCommander-Proxy beobachtete Datenverkehr.",
   "pws.reference.limitReported": "OpenCode Go hat das Limit für {window} gemeldet.",
   "pws.reference.limitReset": "Zurücksetzung durch den Anbieter: {reset}",
   "pws.reference.limitResetUnknown": "Der Anbieter hat keine Rücksetzzeit angegeben.",
   "pws.reference.fiveHour": "5-Stunden-Sitzung",
   "pws.reference.weekly": "7-Tage-Zeitraum",
   "pws.reference.monthly": "30-Tage-Zeitraum",
-  "pws.reference.publishedCap": "Veröffentlichte Obergrenze: {amount}",
   "pws.reference.estimate": "Schätzung",
   "pws.reference.partial": "Teilweise",
   "pws.reference.tokensOnly": "Nur Token",
@@ -1802,11 +1813,8 @@ export const de: Record<TKey, string> = {
   "pws.reference.noTraffic": "Keine weitergeleiteten Anfragen beobachtet",
   "pws.reference.spendObserved": "{amount} über CodexCommander beobachtet",
   "pws.reference.tokensObserved": "{tokens} Token beobachtet",
-  "pws.reference.requestsObserved": "{requests} Anfragen beobachtet; Kosten nicht verfügbar",
-  "pws.reference.fiveHourShort": " / 5 Std.",
-  "pws.reference.weeklyShort": " / 7 T.",
-  "pws.reference.monthlyShort": " / 30 T.",
-  "pws.reference.dashboardHint": "Veröffentlichte Obergrenzen · lokale Schätzungen im Tab „Nutzung“",
+  "pws.reference.requestsObserved": "{requests} Anfragen beobachtet",
+  "pws.reference.dashboardHint": "Lokale Beobachtungen · Details im Tab „Nutzung“",
   "pws.accountQuotaUnavailable": "Ratenlimit-Daten vorübergehend nicht verfügbar; falls vorhanden, werden zuletzt bekannte Werte angezeigt.",
   "pws.selected": "Ausgewählt",
   "pws.copyModelId": "ID kopieren",
diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts
index 6d80824aaa6..a6c98435c0b 100644
--- a/gui/src/i18n/en.ts
+++ b/gui/src/i18n/en.ts
@@ -226,8 +226,8 @@ export const en = {
   "dash.planQuota.hint": "Provider-reported limits and estimates — never billed spend.",
   "dash.planQuota.loading": "Loading provider quota…",
   "dash.planQuota.empty": "No provider quota data yet.",
-  "dash.planQuota.disclaimer": "Provider-reported caps and local estimates — not a billing receipt.",
-  "dash.planQuota.referenceIntro": "Published caps vs. traffic observed through this proxy",
+  "dash.planQuota.disclaimer": "Provider-reported limits and local observations — not a billing receipt.",
+  "dash.planQuota.referenceIntro": "Usage observed through this proxy while live Go usage is unavailable",
   "dash.planQuota.unavailable": "Quota unavailable",
   "dash.planQuota.manageProvider": "Manage {provider}",
   "dash.planQuota.retry": "Retry quota check",
@@ -451,6 +451,18 @@ export const en = {
 
   // models
   "models.subtitle": "Manage which models Codex sees and how model context is handled.",
+  "models.refreshModels": "Refresh models",
+  "models.refreshing": "Refreshing models…",
+  "models.syncComplete": "Model sync finished. Restart ChatGPT if prompted below.",
+  "models.syncSkipped": "Model sync skipped. Check the Codex integration settings.",
+  "models.syncFailed": "Model sync failed.",
+  "models.commanderOnlyBadge": "Commander only",
+  "models.commanderOnlyHint": "Discovered by Commander but absent from the current Codex picker catalog.",
+  "models.commanderOnlyFilter": "Commander only ({count})",
+  "models.commanderOnlySummary": "{count} enabled models were discovered by Commander but are not listed in the current Codex catalog.",
+  "models.tipCommanderOnly": "Discovered by Commander; not listed in Codex",
+  "models.restartCodex": "{count} running Codex workers have an older model catalog. Quit and reopen ChatGPT to load the updated catalog.",
+  "models.catalogUnavailable": "Codex catalog could not be read; Commander-only comparison is unavailable.",
   "models.nativeGroupLabel": "OpenAI native",
   "models.nativeHint": "Passthrough models use the Pool or Direct account option selected on Providers. Toggling one off hides it from the Codex picker (the catalog entry is kept, so re-enabling restores it exactly).",
   "models.active": "{active}/{total} visible",
@@ -1242,14 +1254,13 @@ export const en = {
   "pws.quota.upstreamUnavailable": "Temporarily unavailable",
   "pws.quota.retry": "Retry",
   "pws.planLimits": "Plan limits and local observations",
-  "pws.reference.intro": "OpenCode Go does not expose a live remaining-balance API. These published caps are shown beside traffic observed through this CodexCommander proxy.",
+  "pws.reference.intro": "Live OpenCode Go usage is unavailable. Showing only traffic observed through this CodexCommander proxy.",
   "pws.reference.limitReported": "OpenCode Go reported the {window} limit.",
   "pws.reference.limitReset": "Provider reset: {reset}",
   "pws.reference.limitResetUnknown": "The provider did not include a reset time.",
   "pws.reference.fiveHour": "5-hour session",
   "pws.reference.weekly": "7-day window",
   "pws.reference.monthly": "30-day window",
-  "pws.reference.publishedCap": "{amount} published cap",
   "pws.reference.estimate": "Estimate",
   "pws.reference.partial": "Partial",
   "pws.reference.tokensOnly": "Tokens only",
@@ -1257,11 +1268,8 @@ export const en = {
   "pws.reference.noTraffic": "No routed requests observed",
   "pws.reference.spendObserved": "{amount} observed through CodexCommander",
   "pws.reference.tokensObserved": "{tokens} tokens observed",
-  "pws.reference.requestsObserved": "{requests} requests observed; spend unavailable",
-  "pws.reference.fiveHourShort": " / 5h",
-  "pws.reference.weeklyShort": " / 7d",
-  "pws.reference.monthlyShort": " / 30d",
-  "pws.reference.dashboardHint": "Published caps · local estimates on the Usage tab",
+  "pws.reference.requestsObserved": "{requests} requests observed",
+  "pws.reference.dashboardHint": "Local observations · details on the Usage tab",
   "pws.accountQuotaUnavailable": "Rate-limit data temporarily unavailable; showing last known values when present.",
   "pws.selected": "Selected",
   "pws.copyModelId": "Copy ID",
diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts
index c566b5a2f8b..eb87250ff36 100644
--- a/gui/src/i18n/ja.ts
+++ b/gui/src/i18n/ja.ts
@@ -224,8 +224,8 @@ export const ja: Record<TKey, string> = {
   "dash.planQuota.hint": "プロバイダー報告の上限と推定値 — 請求される金額ではありません。",
   "dash.planQuota.loading": "プロバイダー割り当てを読み込み中…",
   "dash.planQuota.empty": "プロバイダー割り当てデータはまだありません。",
-  "dash.planQuota.disclaimer": "プロバイダー報告の上限とローカル推定値 — 請求書ではありません。",
-  "dash.planQuota.referenceIntro": "公開上限とこのプロキシ経由で観測されたトラフィックの比較",
+  "dash.planQuota.disclaimer": "プロバイダー報告の制限とローカル観測値 — 請求書ではありません。",
+  "dash.planQuota.referenceIntro": "Go のライブ使用量が取得できないため、このプロキシで観測された使用量を表示",
   "dash.planQuota.unavailable": "クォータを利用できません",
   "dash.planQuota.manageProvider": "{provider} を管理",
   "dash.planQuota.retry": "クォータ確認を再試行",
@@ -440,6 +440,18 @@ export const ja: Record<TKey, string> = {
 
   // models
   "models.subtitle": "Codex に表示するモデルとモデルコンテキストの扱いを管理します。",
+  "models.refreshModels": "モデルを更新",
+  "models.refreshing": "モデルを更新中…",
+  "models.syncComplete": "モデルの同期が完了しました。下に案内が表示された場合は ChatGPT を再起動してください。",
+  "models.syncSkipped": "モデルの同期をスキップしました。Codex 連携の設定を確認してください。",
+  "models.syncFailed": "モデルの同期に失敗しました。",
+  "models.commanderOnlyBadge": "Commander のみ",
+  "models.commanderOnlyHint": "Commander では検出されていますが、現在の Codex モデル一覧にはありません。",
+  "models.commanderOnlyFilter": "Commander のみ ({count})",
+  "models.commanderOnlySummary": "有効なモデル {count} 件は Commander で検出されましたが、現在の Codex カタログにはありません。",
+  "models.tipCommanderOnly": "Commander で検出、Codex の一覧にはなし",
+  "models.restartCodex": "実行中の Codex ワーカー {count} 件は古いモデルカタログを使用しています。ChatGPT を完全に終了して開き直してください。",
+  "models.catalogUnavailable": "Codex カタログを読み取れないため、Commander 専用モデルを比較できません。",
   "models.nativeGroupLabel": "OpenAI ネイティブ",
   "models.nativeHint": "パススルーモデルはプロバイダーで選択したプールまたはダイレクトアカウントオプションを使用します。一つオフにすると Codex ピッカーから隠します(カタログエントリは保持されるので、再有効化で正確に復元されます)。",
   "models.active": "{active}/{total} 表示中",
@@ -1194,14 +1206,13 @@ export const ja: Record<TKey, string> = {
   "pws.quota.retry": "再試行",
   "pws.quotaUnavailable": "このプロバイダーのクォータデータがありません。",
   "pws.planLimits": "プラン上限とローカル観測",
-  "pws.reference.intro": "OpenCode Go は残量を取得するライブ API を公開していません。公開上限と、この CodexCommander プロキシを通過した通信の観測値を並べて表示します。",
+  "pws.reference.intro": "OpenCode Go のライブ使用量を取得できません。この CodexCommander プロキシで観測された通信のみを表示します。",
   "pws.reference.limitReported": "OpenCode Go が{window}の上限到達を報告しました。",
   "pws.reference.limitReset": "プロバイダーのリセット: {reset}",
   "pws.reference.limitResetUnknown": "プロバイダーからリセット時刻は返されませんでした。",
   "pws.reference.fiveHour": "5時間セッション",
   "pws.reference.weekly": "7日間",
   "pws.reference.monthly": "30日間",
-  "pws.reference.publishedCap": "公開上限 {amount}",
   "pws.reference.estimate": "推定",
   "pws.reference.partial": "一部のみ",
   "pws.reference.tokensOnly": "トークンのみ",
@@ -1209,11 +1220,8 @@ export const ja: Record<TKey, string> = {
   "pws.reference.noTraffic": "経由したリクエストはまだありません",
   "pws.reference.spendObserved": "CodexCommander で {amount} を観測",
   "pws.reference.tokensObserved": "{tokens} トークンを観測",
-  "pws.reference.requestsObserved": "{requests} リクエストを観測（費用は不明）",
-  "pws.reference.fiveHourShort": " / 5時間",
-  "pws.reference.weeklyShort": " / 7日",
-  "pws.reference.monthlyShort": " / 30日",
-  "pws.reference.dashboardHint": "公開上限 · ローカル推定は「使用状況」タブに表示",
+  "pws.reference.requestsObserved": "{requests} リクエストを観測",
+  "pws.reference.dashboardHint": "ローカル観測値 · 詳細は「使用状況」タブ",
   "pws.accountQuotaUnavailable": "レート制限データを一時的に取得できません。前回の値がある場合はそれを表示します。",
   "pws.selected": "選択中",
   "pws.copyModelId": "ID をコピー",
diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts
index af65a935ded..9566e7a90a0 100644
--- a/gui/src/i18n/ko.ts
+++ b/gui/src/i18n/ko.ts
@@ -216,8 +216,8 @@ export const ko: Record<TKey, string> = {
   "dash.planQuota.hint": "프로바이더 보고 한도 및 추정치 — 청구 금액이 아닙니다.",
   "dash.planQuota.loading": "프로바이더 할당량 불러오는 중…",
   "dash.planQuota.empty": "아직 프로바이더 할당량 데이터가 없습니다.",
-  "dash.planQuota.disclaimer": "프로바이더 보고 상한과 로컬 추정치 — 청구서가 아닙니다.",
-  "dash.planQuota.referenceIntro": "게시된 상한과 이 프록시를 통해 관측된 트래픽 비교",
+  "dash.planQuota.disclaimer": "프로바이더가 보고한 한도와 로컬 관측값 — 청구서가 아닙니다.",
+  "dash.planQuota.referenceIntro": "Go 실시간 사용량을 가져올 수 없어 이 프록시에서 관측된 사용량 표시",
   "dash.planQuota.unavailable": "할당량을 사용할 수 없음",
   "dash.planQuota.manageProvider": "{provider} 관리",
   "dash.planQuota.retry": "할당량 확인 다시 시도",
@@ -440,6 +440,18 @@ export const ko: Record<TKey, string> = {
 
   // models
   "models.subtitle": "Codex에 표시할 모델과 모델 컨텍스트 처리 방식을 관리합니다.",
+  "models.refreshModels": "모델 새로고침",
+  "models.refreshing": "모델 새로고침 중…",
+  "models.syncComplete": "모델 동기화가 완료되었습니다. 아래에 안내가 표시되면 ChatGPT를 다시 시작하세요.",
+  "models.syncSkipped": "모델 동기화를 건너뛰었습니다. Codex 통합 설정을 확인하세요.",
+  "models.syncFailed": "모델 동기화에 실패했습니다.",
+  "models.commanderOnlyBadge": "Commander 전용",
+  "models.commanderOnlyHint": "Commander에서 검색되었지만 현재 Codex 모델 목록에는 없습니다.",
+  "models.commanderOnlyFilter": "Commander 전용 ({count})",
+  "models.commanderOnlySummary": "활성화된 모델 {count}개는 Commander에서 검색되었지만 현재 Codex 카탈로그에는 없습니다.",
+  "models.tipCommanderOnly": "Commander에서 검색됨, Codex 목록에는 없음",
+  "models.restartCodex": "실행 중인 Codex 워커 {count}개가 이전 모델 카탈로그를 사용 중입니다. ChatGPT를 완전히 종료한 뒤 다시 여세요.",
+  "models.catalogUnavailable": "Codex 카탈로그를 읽을 수 없어 Commander 전용 모델을 비교할 수 없습니다.",
   "models.nativeGroupLabel": "OpenAI 네이티브",
   "models.nativeHint": "프로바이더에서 선택한 풀 또는 직접 계정 옵션으로 서빙되는 passthrough 모델입니다. 끄면 Codex 선택기에서 숨겨지고, 카탈로그 항목은 유지되므로 다시 켜면 그대로 복원됩니다.",
   "models.active": "{active}/{total} 표시",
@@ -1809,14 +1821,13 @@ export const ko: Record<TKey, string> = {
   "pws.quota.retry": "다시 시도",
   "pws.quotaUnavailable": "이 프로바이더의 쿼터 데이터가 없습니다.",
   "pws.planLimits": "플랜 한도 및 로컬 관측",
-  "pws.reference.intro": "OpenCode Go는 실시간 잔여 한도 API를 제공하지 않습니다. 공개된 한도와 이 CodexCommander 프록시를 통해 관측된 트래픽을 함께 표시합니다.",
+  "pws.reference.intro": "OpenCode Go의 실시간 사용량을 가져올 수 없습니다. 이 CodexCommander 프록시를 통해 관측된 트래픽만 표시합니다.",
   "pws.reference.limitReported": "OpenCode Go가 {window} 한도 도달을 보고했습니다.",
   "pws.reference.limitReset": "제공자 초기화: {reset}",
   "pws.reference.limitResetUnknown": "제공자가 초기화 시간을 제공하지 않았습니다.",
   "pws.reference.fiveHour": "5시간 세션",
   "pws.reference.weekly": "7일 구간",
   "pws.reference.monthly": "30일 구간",
-  "pws.reference.publishedCap": "공개 한도 {amount}",
   "pws.reference.estimate": "추정",
   "pws.reference.partial": "부분",
   "pws.reference.tokensOnly": "토큰만",
@@ -1824,11 +1835,8 @@ export const ko: Record<TKey, string> = {
   "pws.reference.noTraffic": "라우팅된 요청이 아직 관측되지 않음",
   "pws.reference.spendObserved": "CodexCommander에서 {amount} 관측",
   "pws.reference.tokensObserved": "{tokens} 토큰 관측",
-  "pws.reference.requestsObserved": "{requests}개 요청 관측, 비용 정보 없음",
-  "pws.reference.fiveHourShort": " / 5시간",
-  "pws.reference.weeklyShort": " / 7일",
-  "pws.reference.monthlyShort": " / 30일",
-  "pws.reference.dashboardHint": "공개 한도 · 로컬 추정치는 사용량 탭에서 확인",
+  "pws.reference.requestsObserved": "{requests}개 요청 관측",
+  "pws.reference.dashboardHint": "로컬 관측값 · 자세한 내용은 사용량 탭",
   "pws.accountQuotaUnavailable": "요금 한도 데이터를 일시적으로 가져올 수 없습니다. 이전 값이 있으면 그대로 표시합니다.",
   "pws.selected": "선택됨",
   "pws.copyModelId": "ID 복사",
diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts
index 5dd07af0141..ed32e21e322 100644
--- a/gui/src/i18n/ru.ts
+++ b/gui/src/i18n/ru.ts
@@ -224,8 +224,8 @@ export const ru: Record<TKey, string> = {
   "dash.planQuota.hint": "Лимиты и оценки от провайдера — не счёт к оплате.",
   "dash.planQuota.loading": "Загрузка квоты провайдера…",
   "dash.planQuota.empty": "Данных о квоте провайдера пока нет.",
-  "dash.planQuota.disclaimer": "Лимиты от провайдера и локальные оценки — не платёжный документ.",
-  "dash.planQuota.referenceIntro": "Опубликованные лимиты и трафик, наблюдаемый через этот прокси",
+  "dash.planQuota.disclaimer": "Лимиты от провайдера и локальные наблюдения — не платёжный документ.",
+  "dash.planQuota.referenceIntro": "Использование, наблюдаемое через этот прокси, пока данные Go недоступны",
   "dash.planQuota.unavailable": "Квота недоступна",
   "dash.planQuota.manageProvider": "Управлять {provider}",
   "dash.planQuota.retry": "Повторить проверку квоты",
@@ -445,6 +445,18 @@ export const ru: Record<TKey, string> = {
 
   // models
   "models.subtitle": "Управляйте моделями, которые видит Codex, и использованием контекста моделей.",
+  "models.refreshModels": "Обновить модели",
+  "models.refreshing": "Обновление моделей…",
+  "models.syncComplete": "Синхронизация моделей завершена. Перезапустите ChatGPT, если ниже появится подсказка.",
+  "models.syncSkipped": "Синхронизация моделей пропущена. Проверьте настройки интеграции Codex.",
+  "models.syncFailed": "Не удалось синхронизировать модели.",
+  "models.commanderOnlyBadge": "Только Commander",
+  "models.commanderOnlyHint": "Модель обнаружена Commander, но отсутствует в текущем каталоге выбора Codex.",
+  "models.commanderOnlyFilter": "Только Commander ({count})",
+  "models.commanderOnlySummary": "{count} включенных моделей обнаружены Commander, но отсутствуют в текущем каталоге Codex.",
+  "models.tipCommanderOnly": "Обнаружена Commander; отсутствует в списке Codex",
+  "models.restartCodex": "{count} запущенных процессов Codex используют старый каталог моделей. Полностью закройте ChatGPT и откройте снова.",
+  "models.catalogUnavailable": "Не удалось прочитать каталог Codex; сравнение с моделями Commander недоступно.",
   "models.nativeGroupLabel": "Нативные OpenAI",
   "models.nativeHint": "Модели сквозного проброса используют режим аккаунта (пул или прямое подключение), выбранный на странице «Провайдеры». Отключение модели скрывает её из селектора Codex (запись в каталоге сохраняется, поэтому при повторном включении она восстанавливается в точности).",
   "models.active": "{active}/{total} видимо",
@@ -1236,14 +1248,13 @@ export const ru: Record<TKey, string> = {
   "pws.quota.retry": "Повторить",
   "pws.quotaUnavailable": "Нет данных о квоте для этого провайдера.",
   "pws.planLimits": "Лимиты плана и локальные наблюдения",
-  "pws.reference.intro": "OpenCode Go не предоставляет API с актуальным остатком. Опубликованные лимиты показаны рядом с трафиком, который прошёл через этот прокси CodexCommander.",
+  "pws.reference.intro": "Текущие данные об использовании OpenCode Go недоступны. Показан только трафик, наблюдаемый через этот прокси CodexCommander.",
   "pws.reference.limitReported": "OpenCode Go сообщил о достижении лимита «{window}».",
   "pws.reference.limitReset": "Сброс у провайдера: {reset}",
   "pws.reference.limitResetUnknown": "Провайдер не указал время сброса.",
   "pws.reference.fiveHour": "5-часовая сессия",
   "pws.reference.weekly": "7 дней",
   "pws.reference.monthly": "30 дней",
-  "pws.reference.publishedCap": "Опубликованный лимит: {amount}",
   "pws.reference.estimate": "Оценка",
   "pws.reference.partial": "Частично",
   "pws.reference.tokensOnly": "Только токены",
@@ -1251,11 +1262,8 @@ export const ru: Record<TKey, string> = {
   "pws.reference.noTraffic": "Маршрутизированные запросы не наблюдались",
   "pws.reference.spendObserved": "Через CodexCommander наблюдалось {amount}",
   "pws.reference.tokensObserved": "Наблюдалось токенов: {tokens}",
-  "pws.reference.requestsObserved": "Наблюдалось запросов: {requests}; стоимость недоступна",
-  "pws.reference.fiveHourShort": " / 5 ч",
-  "pws.reference.weeklyShort": " / 7 дн.",
-  "pws.reference.monthlyShort": " / 30 дн.",
-  "pws.reference.dashboardHint": "Опубликованные лимиты · локальные оценки на вкладке «Использование»",
+  "pws.reference.requestsObserved": "Наблюдалось запросов: {requests}",
+  "pws.reference.dashboardHint": "Локальные наблюдения · подробности на вкладке «Использование»",
   "pws.accountQuotaUnavailable": "Данные о лимитах временно недоступны; при наличии показываются последние известные значения.",
   "pws.selected": "Выбрана",
   "pws.copyModelId": "Копировать ID",
diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts
index 9226a5139fa..960604241f6 100644
--- a/gui/src/i18n/zh.ts
+++ b/gui/src/i18n/zh.ts
@@ -216,8 +216,8 @@ export const zh: Record<TKey, string> = {
   "dash.planQuota.hint": "服务商报告的限额与估算 — 绝不代表实际扣费。",
   "dash.planQuota.loading": "正在加载服务商配额…",
   "dash.planQuota.empty": "暂无服务商配额数据。",
-  "dash.planQuota.disclaimer": "服务商报告的上限与本地估算 — 并非账单。",
-  "dash.planQuota.referenceIntro": "公布上限与本代理观察到的流量对比",
+  "dash.planQuota.disclaimer": "服务商报告的限制与本地观测值 — 并非账单。",
+  "dash.planQuota.referenceIntro": "Go 实时用量不可用，显示通过本代理观察到的用量",
   "dash.planQuota.unavailable": "配额不可用",
   "dash.planQuota.manageProvider": "管理 {provider}",
   "dash.planQuota.retry": "重试配额检查",
@@ -437,6 +437,18 @@ export const zh: Record<TKey, string> = {
 
   // models
   "models.subtitle": "管理 Codex 可见的模型以及模型上下文的处理方式。",
+  "models.refreshModels": "刷新模型",
+  "models.refreshing": "正在刷新模型…",
+  "models.syncComplete": "模型同步已完成。如果下方出现提示，请重启 ChatGPT。",
+  "models.syncSkipped": "已跳过模型同步。请检查 Codex 集成设置。",
+  "models.syncFailed": "模型同步失败。",
+  "models.commanderOnlyBadge": "仅 Commander",
+  "models.commanderOnlyHint": "Commander 已发现此模型，但当前 Codex 模型列表中没有它。",
+  "models.commanderOnlyFilter": "仅 Commander ({count})",
+  "models.commanderOnlySummary": "有 {count} 个已启用模型已被 Commander 发现，但未列入当前 Codex 目录。",
+  "models.tipCommanderOnly": "Commander 已发现；Codex 列表中没有",
+  "models.restartCodex": "有 {count} 个正在运行的 Codex 工作进程仍使用旧模型目录。请完全退出并重新打开 ChatGPT。",
+  "models.catalogUnavailable": "无法读取 Codex 目录，因此暂时无法比较 Commander 专用模型。",
   "models.nativeGroupLabel": "OpenAI 原生",
   "models.nativeHint": "Passthrough 模型使用在提供方页面选择的账户池或直连选项。关闭后会从 Codex 选择器中隐藏（目录条目保留，重新开启即可完整恢复）。",
   "models.active": "{active}/{total} 可见",
@@ -1806,14 +1818,13 @@ export const zh: Record<TKey, string> = {
   "pws.quota.retry": "重试",
   "pws.quotaUnavailable": "此提供商暂无配额数据。",
   "pws.planLimits": "套餐上限与本地观测",
-  "pws.reference.intro": "OpenCode Go 不提供实时剩余额度 API。这里将公开上限与通过此 CodexCommander 代理观测到的流量并列显示。",
+  "pws.reference.intro": "无法获取 OpenCode Go 的实时用量。这里只显示通过此 CodexCommander 代理观测到的流量。",
   "pws.reference.limitReported": "OpenCode Go 报告已达到{window}上限。",
   "pws.reference.limitReset": "提供商重置时间：{reset}",
   "pws.reference.limitResetUnknown": "提供商未返回重置时间。",
   "pws.reference.fiveHour": "5 小时会话",
   "pws.reference.weekly": "7 天窗口",
   "pws.reference.monthly": "30 天窗口",
-  "pws.reference.publishedCap": "公开上限 {amount}",
   "pws.reference.estimate": "估算",
   "pws.reference.partial": "部分数据",
   "pws.reference.tokensOnly": "仅令牌",
@@ -1821,11 +1832,8 @@ export const zh: Record<TKey, string> = {
   "pws.reference.noTraffic": "尚未观测到路由请求",
   "pws.reference.spendObserved": "通过 CodexCommander 观测到 {amount}",
   "pws.reference.tokensObserved": "观测到 {tokens} 个令牌",
-  "pws.reference.requestsObserved": "观测到 {requests} 个请求，费用不可用",
-  "pws.reference.fiveHourShort": " / 5 小时",
-  "pws.reference.weeklyShort": " / 7 天",
-  "pws.reference.monthlyShort": " / 30 天",
-  "pws.reference.dashboardHint": "公开上限 · 本地估算见“用量”标签页",
+  "pws.reference.requestsObserved": "观测到 {requests} 个请求",
+  "pws.reference.dashboardHint": "本地观测值 · 详情见“用量”标签页",
   "pws.accountQuotaUnavailable": "速率限制数据暂时不可用；若有上次已知值则继续显示。",
   "pws.selected": "已选择",
   "pws.copyModelId": "复制 ID",
diff --git a/gui/src/models-codex-catalog.ts b/gui/src/models-codex-catalog.ts
new file mode 100644
index 00000000000..d45fa1fcb30
--- /dev/null
+++ b/gui/src/models-codex-catalog.ts
@@ -0,0 +1,42 @@
+/** The published Codex picker is a separate snapshot from Commander's provider discovery. */
+export function listedCodexModelSlugs(value: unknown): string[] | null {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
+  const models = (value as { models?: unknown }).models;
+  if (!Array.isArray(models)) return null;
+  const slugs: string[] = [];
+  for (const model of models) {
+    if (model === null || typeof model !== "object" || Array.isArray(model)) return null;
+    const { slug, visibility } = model as { slug?: unknown; visibility?: unknown };
+    if (typeof slug !== "string" || !slug) return null;
+    if (visibility === "list") slugs.push(slug);
+  }
+  return [...new Set(slugs)];
+}
+
+/** Only claim a routed model is absent when the published snapshot was read successfully. */
+export function commanderOnlyModel(
+  model: { native?: boolean; namespaced: string },
+  enabled: boolean,
+  listedSlugs: ReadonlySet<string> | null,
+): boolean {
+  return enabled && model.native !== true && listedSlugs !== null && !listedSlugs.has(model.namespaced);
+}
+
+/** null means status is unproven; zero means no running worker needs a reload. */
+export function staleCodexWorkerCount(value: unknown): number | null {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return null;
+  const activation = (value as { activation?: unknown }).activation;
+  if (activation === null || typeof activation !== "object" || Array.isArray(activation)) return null;
+  const state = activation as {
+    schemaVersion?: unknown;
+    catalog?: { status?: unknown };
+    routing?: { status?: unknown };
+    workers?: { status?: unknown; staleCount?: unknown };
+  };
+  if (state.schemaVersion !== 1 || state.catalog?.status !== "current" || state.routing?.status !== "current") return null;
+  if (state.workers?.status === "current" || state.workers?.status === "not_running") return 0;
+  if (state.workers?.status === "reload_required"
+    && Number.isInteger(state.workers.staleCount)
+    && (state.workers.staleCount as number) > 0) return state.workers.staleCount as number;
+  return null;
+}
diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx
index dc6259012dd..a6b22ff6a70 100644
--- a/gui/src/pages/Models.tsx
+++ b/gui/src/pages/Models.tsx
@@ -22,6 +22,7 @@ import { setClientResourceData } from "../client-resource";
 import { useDataSurface } from "../data-surface";
 import { DataSurfaceSkeleton } from "../components/data-surface";
 import { providerRouteHash } from "../provider-route";
+import { commanderOnlyModel, listedCodexModelSlugs, staleCodexWorkerCount } from "../models-codex-catalog";
 import {
   buildProviderModelGroups,
   type ConfiguredProviderSummary,
@@ -67,6 +68,7 @@ type CachedModelsPage = {
   providers: ConfiguredProviderSummary[];
   selectedModels: ProviderModelMap;
   disabled: string[];
+  publishedSlugs?: string[] | null;
   contextCaps: Record<string, number>;
   contextCapValue: number;
 };
@@ -117,6 +119,11 @@ export default function Models({ apiBase }: { apiBase: string }) {
   const [providers, setProviders] = useState<ConfiguredProviderSummary[]>(() => cached?.providers ?? []);
   const [disabled, setDisabled] = useState<Set<string>>(() => new Set(cached?.disabled ?? []));
   const [selectedModels, setSelectedModels] = useState<ProviderModelMap | null>(() => cached?.selectedModels ?? null);
+  const [publishedSlugs, setPublishedSlugs] = useState<string[] | null>(() => cached?.publishedSlugs ?? null);
+  const [staleWorkers, setStaleWorkers] = useState<number | null>(null);
+  const [syncing, setSyncing] = useState(false);
+  const syncingRef = useRef(false);
+  const [onlyCommanderModels, setOnlyCommanderModels] = useState(false);
   const [catalogQuery, setCatalogQuery] = useState("");
   const [limit, setLimit] = useState<Record<string, number>>({});
   const [contextCaps, setContextCaps] = useState<Record<string, number>>(() => cached?.contextCaps ?? {});
@@ -256,11 +263,18 @@ export default function Models({ apiBase }: { apiBase: string }) {
   }, [apiBase, t]);
 
   const fetchCatalog = useCallback(async (signal: AbortSignal): Promise<CachedModelsPage> => {
-    const [modelsRes, capsRes, providersRes, selectionData] = await Promise.all([
+    // A missing/unreadable published catalog is unknown, never evidence that every
+    // discovered provider model is unavailable in Codex.
+    const published = fetch(`${apiBase}/api/catalog`, { cache: "no-store" })
+      .then(response => readJsonIfOk<unknown>(response))
+      .then(listedCodexModelSlugs)
+      .catch(() => null);
+    const [modelsRes, capsRes, providersRes, selectionData, nextPublishedSlugs] = await Promise.all([
       fetch(`${apiBase}/api/models`),
       fetch(`${apiBase}/api/provider-context-caps`),
       fetch(`${apiBase}/api/providers`),
       fetchSelectedModels(apiBase),
+      published,
     ]);
     const [data, capsPayload, providerData] = await Promise.all([
       readJsonOrThrow<ModelRow[]>(modelsRes),
@@ -278,6 +292,7 @@ export default function Models({ apiBase }: { apiBase: string }) {
       providers: providerData,
       selectedModels: selectionData,
       disabled: [...nextDisabled],
+      publishedSlugs: nextPublishedSlugs,
       contextCaps: capsData.caps,
       contextCapValue: capsData.value,
     } satisfies CachedModelsPage;
@@ -296,6 +311,7 @@ export default function Models({ apiBase }: { apiBase: string }) {
     setProviders(next.providers);
     setDisabled(new Set(next.disabled));
     setSelectedModels(next.selectedModels);
+    setPublishedSlugs(next.publishedSlugs ?? null);
     setContextCapValue(next.contextCapValue);
     setContextCaps(next.contextCaps);
   }, []);
@@ -336,6 +352,50 @@ export default function Models({ apiBase }: { apiBase: string }) {
     }
   }, [applyCatalog, cacheKey, fetchCatalog]);
 
+  const loadCodexStatus = useCallback(async () => {
+    try {
+      const response = await fetch(`${apiBase}/api/codex-catalog/status`, { cache: "no-store" });
+      const body = await readJsonIfOk<unknown>(response);
+      setStaleWorkers(staleCodexWorkerCount(body));
+    } catch {
+      setStaleWorkers(null);
+    }
+  }, [apiBase]);
+
+  useEffect(() => {
+    const initial = window.setTimeout(() => { void loadCodexStatus(); }, 0);
+    const timer = window.setInterval(() => { void loadCodexStatus(); }, 60_000);
+    return () => {
+      window.clearTimeout(initial);
+      window.clearInterval(timer);
+    };
+  }, [loadCodexStatus]);
+
+  const refreshModels = async () => {
+    if (syncingRef.current || busyRef.current) return;
+    syncingRef.current = true;
+    setSyncing(true);
+    busyRef.current = true;
+    setBusy(true);
+    try {
+      const response = await fetch(`${apiBase}/api/sync`, { method: "POST" });
+      const result = await readJsonOrThrow<{ ok: boolean; status: string; message?: string }>(response, t("models.syncFailed"));
+      if (!result?.ok) throw new Error(result?.message || t("models.syncFailed"));
+      const refreshed = await load(true);
+      await loadCodexStatus();
+      if (!refreshed) throw new Error(t("models.loadFail"));
+      setOnlyCommanderModels(false);
+      publishFeedback(true, t(result.status === "skipped" ? "models.syncSkipped" : "models.syncComplete"));
+    } catch (error) {
+      publishFeedback(false, error instanceof Error ? error.message : t("models.syncFailed"));
+    } finally {
+      syncingRef.current = false;
+      setSyncing(false);
+      busyRef.current = false;
+      setBusy(false);
+    }
+  };
+
   // Shadow/v2 controls must not wait on the models catalog (live discovery can be slow).
   useEffect(() => {
     const timeout = window.setTimeout(() => {
@@ -355,6 +415,13 @@ export default function Models({ apiBase }: { apiBase: string }) {
     () => buildProviderModelGroups(models, providers),
     [models, providers],
   );
+  const listedSlugs = useMemo(() => publishedSlugs === null ? null : new Set(publishedSlugs), [publishedSlugs]);
+  const commanderOnlyCount = useMemo(() => {
+    if (listedSlugs === null || selectedModels === null) return 0;
+    return models.filter(model => commanderOnlyModel(model, modelVisible(
+      selectedModels, model.provider, model.id, model.native === true, disabled.has(model.namespaced),
+    ), listedSlugs)).length;
+  }, [disabled, listedSlugs, models, selectedModels]);
 
   const routedProviderNames = useMemo(
     () => groups.filter(group => !group.native && group.rows.length > 0).map(group => group.provider),
@@ -387,8 +454,8 @@ export default function Models({ apiBase }: { apiBase: string }) {
       model.id,
       model.native === true,
       disabled.has(model.namespaced),
-    )).length;
-  }, [disabled, models, selectedModels]);
+    ) && !commanderOnlyModel(model, true, listedSlugs)).length;
+  }, [disabled, listedSlugs, models, selectedModels]);
 
   const applyVisibility = async (
     scope: ModelVisibilityScope,
@@ -751,18 +818,18 @@ export default function Models({ apiBase }: { apiBase: string }) {
   const renderGroup = (group: ProviderModelGroup<ModelRow>) => {
     const { provider, rows, native, liveModels, discovery } = group;
     const q = catalogQuery.trim().toLowerCase();
-    const isCollapsed = collapsed.has(provider) && q === "";
-    // Final visibility, not just the disable flag: a model is visible to Codex only when the
-    // provider allowlist admits it AND it is not disabled. Reading `disabled` alone made the
-    // switches disagree with what the picker actually offers.
-    const isVisible = (model: ModelRow) => modelVisible(
+    const isCollapsed = collapsed.has(provider) && q === "" && !(onlyCommanderModels && commanderOnlyCount > 0);
+    // The switch is the user's visibility preference. Publication is a separate
+    // result: a provider model can be enabled here yet absent from Codex's picker.
+    const isEnabled = (model: ModelRow) => modelVisible(
       selectedModelMap,
       provider,
       model.id,
       model.native === true,
       disabled.has(model.namespaced),
     );
-    const activeCount = rows.filter(isVisible).length;
+    const isCommanderOnly = (model: ModelRow) => commanderOnlyModel(model, isEnabled(model), listedSlugs);
+    const activeCount = rows.filter(model => isEnabled(model) && !isCommanderOnly(model)).length;
     const providerCap = contextCaps[provider];
     const capOn = isPositiveContextCap(providerCap);
     const isNative = native;
@@ -770,26 +837,25 @@ export default function Models({ apiBase }: { apiBase: string }) {
     const discoveryLabel = t(liveModels ? "models.discoveryAutoOn" : "models.discoveryAutoOff");
     const providerSettingsHref = `#${providerRouteHash(provider, "settings")}`;
     const providerMatchesQuery = provider.toLowerCase().includes(q);
-    const filtered = q && !providerMatchesQuery
+    const queried = q && !providerMatchesQuery
       ? rows.filter(model => (
         model.id.toLowerCase().includes(q)
         || model.namespaced.toLowerCase().includes(q)
         || model.displayName?.toLowerCase().includes(q)
       ))
       : rows;
-    // Display-only: enabled models float to the top of each provider group so they
-    // stay findable in long lists. The sort is stable, so the server order is kept
-    // inside each partition, and this does not affect the picker order above
-    // (visibility toggles still only filter).
-    const sorted = filtered.toSorted((a, b) => Number(!isVisible(a)) - Number(!isVisible(b)));
+    const filtered = onlyCommanderModels && commanderOnlyCount > 0 ? queried.filter(isCommanderOnly) : queried;
+    // Codex-listed, Commander-only, then disabled; preserve server order within each tier.
+    const rank = (model: ModelRow) => !isEnabled(model) ? 2 : isCommanderOnly(model) ? 1 : 0;
+    const sorted = filtered.toSorted((a, b) => rank(a) - rank(b));
     const shown = limit[provider] ?? PAGE;
     const visible = sorted.slice(0, shown);
     const remaining = filtered.length - visible.length;
      // An empty provider has nothing to send: keep both bulk buttons inert so we never PUT an
      // empty target list (the management API rejects it with 400).
      const hasRows = rows.length > 0;
-     const allOn = !hasRows || rows.every(isVisible);
-     const allOff = !hasRows || rows.every(m => !isVisible(m));
+     const allOn = !hasRows || rows.every(isEnabled);
+     const allOff = !hasRows || rows.every(m => !isEnabled(m));
      const bulkToggle = (enable: boolean) => {
        if (!hasRows) return;
        void applyVisibility(
@@ -884,12 +950,12 @@ export default function Models({ apiBase }: { apiBase: string }) {
               <EmptyProviderHint provider={provider} liveModels={liveModels} discovery={discovery} showFailureBadge={false} />
             )}
              {visible.map(m => {
-               // The row reflects the same final-visibility answer as the count and the picker.
-               const off = !isVisible(m);
+               const off = !isEnabled(m);
+               const commanderOnly = isCommanderOnly(m);
                return (
                  <div
                    key={m.namespaced}
-                   className="model-row-wrap"
+                   className={`model-row-wrap${commanderOnly ? " model-row-wrap--commander-only" : ""}`}
                    onMouseEnter={(e) => onRowEnter(m.namespaced, e.currentTarget)}
                    onMouseLeave={onRowLeave}
                    onFocus={(e) => onRowFocus(m.namespaced, e.currentTarget)}
@@ -899,7 +965,12 @@ export default function Models({ apiBase }: { apiBase: string }) {
                  >
                    <div className="row models-model-row">
                      <Switch on={!off} onClick={() => void applyVisibility("models", provider, [{ id: m.id, native: m.native === true }], off)} disabled={busy} label={m.native ? m.id : m.namespaced} />
-                      <code className="mono text-control" style={{ color: off ? "var(--faint)" : "var(--text)", textDecoration: off ? "line-through" : "none" }}>{m.native ? modelLabel(m.id) : formatNamespacedModelId(m.namespaced, t)}</code>
+                      <code className="mono text-control" style={{ color: off ? "var(--faint)" : commanderOnly ? "var(--muted)" : "var(--text)", textDecoration: off ? "line-through" : "none" }}>{m.native ? modelLabel(m.id) : formatNamespacedModelId(m.namespaced, t)}</code>
+                     {commanderOnly && (
+                       <span className="models-chip models-chip--commander-only text-caption" title={t("models.commanderOnlyHint")}>
+                         {t("models.commanderOnlyBadge")}
+                       </span>
+                     )}
                      {m.custom && (
                        <span className="models-chip muted mono text-caption">
                          {t("models.customBadge")}
@@ -948,7 +1019,7 @@ export default function Models({ apiBase }: { apiBase: string }) {
                              </>
                            )}
                            <span className="model-tip-key">{t("models.tipStatus")}</span>
-                           <span className="model-tip-val">{off ? t("models.tipDisabled") : t("models.tipActive")}</span>
+                           <span className="model-tip-val">{off ? t("models.tipDisabled") : commanderOnly ? t("models.tipCommanderOnly") : t("models.tipActive")}</span>
                          </div>
                          {m.custom && m.customId && (
                            <div className="model-tip-actions">
@@ -1005,16 +1076,25 @@ export default function Models({ apiBase }: { apiBase: string }) {
     ? groups.filter(group => group.provider === selectedProvider)
     : groups;
   const normalizedCatalogQuery = catalogQuery.trim().toLowerCase();
+  const scopedGroups = onlyCommanderModels && commanderOnlyCount > 0
+    ? providerScopedGroups.filter(group => group.rows.some(model => commanderOnlyModel(model, modelVisible(
+      selectedModelMap, group.provider, model.id, model.native === true, disabled.has(model.namespaced),
+    ), listedSlugs)))
+    : providerScopedGroups;
   const visibleGroups = normalizedCatalogQuery
-    ? providerScopedGroups.filter(group => (
+    ? scopedGroups.filter(group => (
       group.provider.toLowerCase().includes(normalizedCatalogQuery)
       || group.rows.some(model => (
-        model.id.toLowerCase().includes(normalizedCatalogQuery)
-        || model.namespaced.toLowerCase().includes(normalizedCatalogQuery)
-        || model.displayName?.toLowerCase().includes(normalizedCatalogQuery)
+        (!(onlyCommanderModels && commanderOnlyCount > 0) || commanderOnlyModel(model, modelVisible(
+          selectedModelMap, group.provider, model.id, model.native === true, disabled.has(model.namespaced),
+        ), listedSlugs)) && (
+          model.id.toLowerCase().includes(normalizedCatalogQuery)
+          || model.namespaced.toLowerCase().includes(normalizedCatalogQuery)
+          || model.displayName?.toLowerCase().includes(normalizedCatalogQuery)
+        )
       ))
     ))
-    : providerScopedGroups;
+    : scopedGroups;
 
   const contextStateLabel = contextPolicy.state === "uncapped"
     ? t("models.contextStateUncapped")
@@ -1360,6 +1440,14 @@ export default function Models({ apiBase }: { apiBase: string }) {
         />
       </label>
       <div className="row models-catalog-actions">
+        <button type="button" className="btn btn-ghost btn-sm text-caption" onClick={() => void refreshModels()} disabled={busy || syncing} aria-busy={syncing || undefined}>
+          {t(syncing ? "models.refreshing" : "models.refreshModels")}
+        </button>
+        {commanderOnlyCount > 0 && (
+          <button type="button" className="btn btn-ghost btn-sm text-caption" onClick={() => setOnlyCommanderModels(value => !value)} aria-pressed={onlyCommanderModels}>
+            {t("models.commanderOnlyFilter", { count: commanderOnlyCount })}
+          </button>
+        )}
         <button type="button" className="btn btn-ghost btn-sm text-caption" onClick={() => setAllCollapsed(true)} disabled={busy}>
           <IconChevron width={12} height={12} aria-hidden="true" /> {t("models.collapseAll")}
         </button>
@@ -1652,7 +1740,7 @@ export default function Models({ apiBase }: { apiBase: string }) {
                 m.id,
                 m.native === true,
                 disabled.has(m.namespaced),
-              )).length;
+              ) && !commanderOnlyModel(m, true, listedSlugs)).length;
               return (
                 <button
                   key={provider}
@@ -1669,6 +1757,15 @@ export default function Models({ apiBase }: { apiBase: string }) {
           </div>
         </aside>
         <section className="models-workspace-main" aria-label={t("models.workspace.mainAria")}>
+          {staleWorkers !== null && staleWorkers > 0 && (
+            <Notice tone="warn">{t("models.restartCodex", { count: staleWorkers })}</Notice>
+          )}
+          {publishedSlugs === null && !catalogState.refreshing && (
+            <p className="muted text-label models-catalog-unavailable">{t("models.catalogUnavailable")}</p>
+          )}
+          {commanderOnlyCount > 0 && (
+            <p className="muted text-label models-commander-only-summary">{t("models.commanderOnlySummary", { count: commanderOnlyCount })}</p>
+          )}
           {controlsBlock}
           {catalogToolbar}
           {combosBlock}
diff --git a/gui/src/pages/dashboard-plan-quota-section.tsx b/gui/src/pages/dashboard-plan-quota-section.tsx
index 33a7bd92bd8..d75e1c4ae72 100644
--- a/gui/src/pages/dashboard-plan-quota-section.tsx
+++ b/gui/src/pages/dashboard-plan-quota-section.tsx
@@ -6,14 +6,14 @@
  * last-known-good data. Reuses the workspace parsing (accountQuotaFromReport /
  * capacityAggregationFromReport / referenceQuotaFromReport) and the
  * ProviderCapacityQuota presentation so both surfaces share semantics: per-provider
- * plan, 5h/week/month windows, and observed reference spend vs published caps —
+ * plan, 5h/week/month windows, and locally observed fallback usage —
  * always labeled provider-reported / estimates, never billed spend.
  *
  * Styling reuses existing dashboard tokens/classes (panel, dash-sidecar-grid,
  * pws-capacity-*, muted/text-caption/mono); no new stylesheet is introduced.
  */
 import { useEffect } from "react";
-import { useI18n, useT, type TFn, type TKey } from "../i18n/shared";
+import { useI18n, useT, type TKey } from "../i18n/shared";
 import { useProviderQuota } from "../provider-quota-store";
 import { formatProviderDisplayName } from "../provider-icons";
 import { quotaUnavailableReasonKey } from "../quota-unavailable";
@@ -24,7 +24,7 @@ import {
   type ProviderQuotaReferenceWindowView,
   type ProviderQuotaReportView,
 } from "../provider-workspace/report";
-import { formatRequestCount, formatTokenCount } from "../provider-workspace/usage";
+import { referenceCoverageLabel, referenceObservedLabels } from "../provider-workspace/reference-observation";
 import { ProviderCapacityQuota } from "../components/provider-workspace/ProviderCapacityQuota";
 
 const REFERENCE_WINDOW_KEYS: Record<ProviderQuotaReferenceWindowView["id"], TKey> = {
@@ -33,46 +33,20 @@ const REFERENCE_WINDOW_KEYS: Record<ProviderQuotaReferenceWindowView["id"], TKey
   monthly: "pws.reference.monthly",
 };
 
-function referenceObservedLabel(
-  window: ProviderQuotaReferenceWindowView,
-  locale: string,
-  t: TFn,
-): string {
-  if (window.observedRequests === 0) return t("pws.reference.noTraffic");
-  if (window.observedSpendUsd !== undefined) {
-    const amount = new Intl.NumberFormat(locale, {
-      style: "currency",
-      currency: "USD",
-      minimumFractionDigits: 2,
-      maximumFractionDigits: window.observedSpendUsd < 0.01 ? 4 : 2,
-    }).format(window.observedSpendUsd);
-    return t("pws.reference.spendObserved", { amount });
-  }
-  if (window.observedTokens > 0) {
-    return t("pws.reference.tokensObserved", { tokens: formatTokenCount(window.observedTokens, locale) });
-  }
-  return t("pws.reference.requestsObserved", { requests: formatRequestCount(window.observedRequests, locale) });
-}
-
 function PlanQuotaReference({ report, locale }: { report: ProviderQuotaReportView; locale: string }) {
   const t = useT();
   const reference = referenceQuotaFromReport(report);
   if (!reference) return null;
-  const money = (amount: number) => new Intl.NumberFormat(locale, {
-    style: "currency",
-    currency: "USD",
-    maximumFractionDigits: amount >= 10 ? 0 : 2,
-  }).format(amount);
   return (
     <div className="pws-reference-quota" style={{ marginTop: 10 }}>
       <div className="muted text-caption" style={{ marginBottom: 6 }}>{t("dash.planQuota.referenceIntro")}</div>
       {reference.windows.map(window => (
         <div key={window.id} style={{ display: "flex", alignItems: "baseline", gap: 8, flexWrap: "wrap", marginTop: 4 }}>
           <strong className="text-caption">{t(REFERENCE_WINDOW_KEYS[window.id])}</strong>
-          <span className="mono text-caption">
-            {t("pws.reference.publishedCap", { amount: money(window.publishedLimitUsd) })}
-          </span>
-          <span className="muted text-caption">{referenceObservedLabel(window, locale, t)}</span>
+          <span className="muted text-caption">{referenceObservedLabels(window, locale, t).join(" · ")}</span>
+          {referenceCoverageLabel(window.coverage, t) && (
+            <span className="muted text-caption">{referenceCoverageLabel(window.coverage, t)}</span>
+          )}
         </div>
       ))}
     </div>
diff --git a/gui/src/provider-quota-store.ts b/gui/src/provider-quota-store.ts
index 5bb108e8459..3920fdfbb32 100644
--- a/gui/src/provider-quota-store.ts
+++ b/gui/src/provider-quota-store.ts
@@ -286,7 +286,6 @@ function projectQuota(value: unknown): Record<string, unknown> | null {
       const coverage = window.coverage;
       const label = typeof window.label === "string" && window.label.trim() ? window.label : null;
       const windowSeconds = finiteNumber(window.windowSeconds);
-      const publishedLimitUsd = finiteNumber(window.publishedLimitUsd);
       const observedTokens = finiteNumber(window.observedTokens);
       const observedRequests = finiteNumber(window.observedRequests);
       const pricedRequests = finiteNumber(window.pricedRequests);
@@ -294,7 +293,7 @@ function projectQuota(value: unknown): Record<string, unknown> | null {
       const unmeasuredRequests = finiteNumber(window.unmeasuredRequests);
       const validId = id === "five_hour" || id === "weekly" || id === "monthly";
       const validCoverage = coverage === "none" || coverage === "complete" || coverage === "partial" || coverage === "unpriced";
-      if (!validId || !validCoverage || !label || windowSeconds === undefined || publishedLimitUsd === undefined
+      if (!validId || !validCoverage || !label || windowSeconds === undefined
         || observedTokens === undefined || observedRequests === undefined
         || pricedRequests === undefined || unpricedRequests === undefined || unmeasuredRequests === undefined) return [];
       const observedSpendUsd = finiteNumber(window.observedSpendUsd);
@@ -302,7 +301,6 @@ function projectQuota(value: unknown): Record<string, unknown> | null {
         id,
         label,
         windowSeconds,
-        publishedLimitUsd,
         observedTokens,
         observedRequests,
         pricedRequests,
diff --git a/gui/src/provider-workspace/reference-observation.ts b/gui/src/provider-workspace/reference-observation.ts
new file mode 100644
index 00000000000..5480bfb9cda
--- /dev/null
+++ b/gui/src/provider-workspace/reference-observation.ts
@@ -0,0 +1,39 @@
+import type { TFn } from "../i18n/shared";
+import type { ProviderQuotaReferenceWindowView } from "./report";
+import { formatRequestCount, formatTokenCount } from "./usage";
+
+/** Local proxy observations, with no inferred provider balance or cap. */
+export function referenceObservedLabels(
+  window: ProviderQuotaReferenceWindowView,
+  locale: string,
+  t: TFn,
+): string[] {
+  if (window.observedRequests === 0) return [t("pws.reference.noTraffic")];
+  const labels: string[] = [];
+  if (window.observedSpendUsd !== undefined) {
+    const amount = new Intl.NumberFormat(locale, {
+      style: "currency",
+      currency: "USD",
+      minimumFractionDigits: 2,
+      maximumFractionDigits: window.observedSpendUsd < 0.01 ? 4 : 2,
+    }).format(window.observedSpendUsd);
+    labels.push(t("pws.reference.spendObserved", { amount }));
+  }
+  if (window.observedTokens > 0) {
+    labels.push(t("pws.reference.tokensObserved", { tokens: formatTokenCount(window.observedTokens, locale) }));
+  }
+  labels.push(t("pws.reference.requestsObserved", { requests: formatRequestCount(window.observedRequests, locale) }));
+  return labels;
+}
+
+export function referenceCoverageLabel(
+  coverage: ProviderQuotaReferenceWindowView["coverage"],
+  t: TFn,
+): string | null {
+  if (coverage === "none") return null;
+  return t(coverage === "complete"
+    ? "pws.reference.estimate"
+    : coverage === "partial"
+      ? "pws.reference.partial"
+      : "pws.reference.tokensOnly");
+}
diff --git a/gui/src/provider-workspace/report.ts b/gui/src/provider-workspace/report.ts
index 8ea23ce5e27..889e9799324 100644
--- a/gui/src/provider-workspace/report.ts
+++ b/gui/src/provider-workspace/report.ts
@@ -78,7 +78,6 @@ export interface ProviderQuotaReferenceWindowView {
   id: "five_hour" | "weekly" | "monthly";
   label: string;
   windowSeconds: number;
-  publishedLimitUsd: number;
   observedSpendUsd?: number;
   observedTokens: number;
   observedRequests: number;
@@ -115,9 +114,8 @@ function validTimestamp(value: unknown): number | undefined {
 }
 
 /**
- * Parse published-cap/local-observation reports without adapting them to percentage bars.
- * These values are deliberately a distinct shape: turning spend/caps into "remaining" would
- * imply a provider balance that OpenCode Go does not expose.
+ * Parse local-observation reports without adapting them to percentage bars.
+ * Legacy published caps are ignored: they are no longer reliable denominators for Go usage.
  */
 export function referenceQuotaFromReport(report: ProviderQuotaReportView): ProviderReferenceQuotaView | null {
   const quota = report.quota;
@@ -134,14 +132,13 @@ export function referenceQuotaFromReport(report: ProviderQuotaReportView): Provi
           ? row.coverage as ProviderQuotaReferenceCoverage
           : null;
         const windowSeconds = finiteNonNegative(row.windowSeconds);
-        const publishedLimitUsd = finiteNonNegative(row.publishedLimitUsd);
         const observedTokens = finiteNonNegative(row.observedTokens);
         const observedRequests = finiteNonNegative(row.observedRequests);
         const pricedRequests = finiteNonNegative(row.pricedRequests);
         const unpricedRequests = finiteNonNegative(row.unpricedRequests);
         const unmeasuredRequests = finiteNonNegative(row.unmeasuredRequests);
         if (!id || !coverage || typeof row.label !== "string" || !row.label.trim()
-          || !windowSeconds || !publishedLimitUsd
+          || !windowSeconds
           || observedTokens === undefined || observedRequests === undefined
           || pricedRequests === undefined || unpricedRequests === undefined || unmeasuredRequests === undefined) return [];
         const observedSpendUsd = finiteNonNegative(row.observedSpendUsd);
@@ -161,7 +158,6 @@ export function referenceQuotaFromReport(report: ProviderQuotaReportView): Provi
           id,
           label: row.label,
           windowSeconds,
-          publishedLimitUsd,
           ...(observedSpendUsd !== undefined ? { observedSpendUsd } : {}),
           observedTokens,
           observedRequests,
@@ -261,6 +257,10 @@ export function capacityAggregationFromReport(report: ProviderQuotaReportView):
 /** Human label for a quota report source id (e.g. "cursor:period-usage"). */
 export function formatQuotaSourceLabel(source: string | undefined): string {
   if (!source?.trim()) return "";
+  // Cached pre-migration reports must not revive the withdrawn cap claim.
+  if (source === "opencode-go:published-caps-2026-08-05+local-estimate") {
+    source = "opencode-go:local-observations";
+  }
   const [provider, path] = source.split(":", 2);
   if (!path) return source;
   return `${provider} · ${path.replace(/-/g, " ").replace(/\+/g, " + ")}`;
diff --git a/gui/src/styles-models-workspace.css b/gui/src/styles-models-workspace.css
index 2ebb99f9a69..6a309994aaa 100644
--- a/gui/src/styles-models-workspace.css
+++ b/gui/src/styles-models-workspace.css
@@ -604,6 +604,17 @@
   flex-wrap: wrap;
 }
 
+.models-catalog-actions [aria-pressed="true"] {
+  color: var(--accent);
+  background: var(--surface);
+  border-color: var(--accent-ring);
+}
+
+.models-catalog-unavailable,
+.models-commander-only-summary {
+  margin: 0 0 var(--space-2);
+}
+
 .models-provider-columns,
 .models-provider-head {
   display: grid;
@@ -809,8 +820,18 @@ button.models-context-policy:hover:not(:disabled) {
   margin-bottom: var(--space-1);
 }
 
+.models-chip--commander-only {
+  color: var(--muted);
+  background: var(--surface);
+}
+
+.model-row-wrap--commander-only .models-model-row {
+  background: color-mix(in srgb, var(--surface) 75%, transparent);
+}
+
 .models-model-row {
   padding: var(--space-2) 0;
+  flex-wrap: wrap;
 }
 
 .models-show-more {
diff --git a/gui/src/styles/provider-overview-dashboard.css b/gui/src/styles/provider-overview-dashboard.css
index 2a0109557e2..625447eac10 100644
--- a/gui/src/styles/provider-overview-dashboard.css
+++ b/gui/src/styles/provider-overview-dashboard.css
@@ -254,7 +254,7 @@
   color: var(--amber);
 }
 
-.pws-dashboard-reference-caps {
+.pws-dashboard-reference-observations {
   display: flex;
   align-items: baseline;
   flex-wrap: wrap;
@@ -263,21 +263,22 @@
   padding: 6px 0;
 }
 
-.pws-dashboard-reference-caps > span {
+.pws-dashboard-reference-observations > span {
   display: inline-flex;
   align-items: baseline;
+  flex-basis: 100%;
   gap: 3px;
   color: var(--muted);
   font-size: 11px;
-  white-space: nowrap;
+  flex-wrap: wrap;
 }
 
-.pws-dashboard-reference-caps > span strong {
+.pws-dashboard-reference-observations > span strong {
   color: var(--text);
   font-size: 12px;
 }
 
-.pws-dashboard-reference-caps > small {
+.pws-dashboard-reference-observations > small {
   flex-basis: 100%;
   color: var(--muted);
   font-size: 10.5px;
diff --git a/gui/src/styles/provider-quota.css b/gui/src/styles/provider-quota.css
index 58153a937ce..bf629a88b1f 100644
--- a/gui/src/styles/provider-quota.css
+++ b/gui/src/styles/provider-quota.css
@@ -172,11 +172,6 @@
   font-size: var(--text-control);
 }
 
-.pws-reference-cap {
-  color: var(--muted);
-  font-size: var(--text-caption);
-}
-
 .pws-reference-observed {
   margin-top: 9px;
   color: var(--text);
diff --git a/gui/tests/dashboard-plan-quota.test.tsx b/gui/tests/dashboard-plan-quota.test.tsx
index 1e069326990..174712126e2 100644
--- a/gui/tests/dashboard-plan-quota.test.tsx
+++ b/gui/tests/dashboard-plan-quota.test.tsx
@@ -251,8 +251,12 @@ test("Plan & quota section renders provider plan, windows, and reference spend",
     expect(text).toContain("OpenAI (Codex login)");
     expect(text).toContain("31% used");
     expect(text).toContain("OpenCode Go");
-    expect(text).toContain("$12 published cap");
+    expect(text).not.toContain("$12");
+    expect(text).not.toContain("published cap");
     expect(text).toContain("$1.25 observed through CodexCommander");
+    expect(text).toContain("42.0k tokens observed");
+    expect(text).toContain("3 requests observed");
+    expect(text).toContain("Partial");
   } finally {
     await act(async () => { root.unmount(); });
     container.remove();
@@ -369,7 +373,7 @@ test("Plan & quota renders a full-width strip for unavailable providers with per
     }
     // F4: grid precedes the strip, strip precedes the disclaimer.
     expect(strip?.previousElementSibling?.classList.contains("dash-sidecar-grid")).toBe(true);
-    expect(strip?.nextElementSibling?.textContent).toContain("Provider-reported caps and local estimates");
+    expect(strip?.nextElementSibling?.textContent).toContain("Provider-reported limits and local observations");
   } finally {
     await act(async () => { root.unmount(); });
     container.remove();
diff --git a/gui/tests/models-codex-catalog.test.ts b/gui/tests/models-codex-catalog.test.ts
new file mode 100644
index 00000000000..74bb3d76a0b
--- /dev/null
+++ b/gui/tests/models-codex-catalog.test.ts
@@ -0,0 +1,30 @@
+import { expect, test } from "bun:test";
+import { commanderOnlyModel, listedCodexModelSlugs, staleCodexWorkerCount } from "../src/models-codex-catalog";
+
+test("published picker comparison only grays a confirmed missing routed model", () => {
+  const slugs = listedCodexModelSlugs({ models: [
+    { slug: "opencode-go/deepseek-v4.1-flash", visibility: "list" },
+    { slug: "opencode-go/hidden", visibility: "hide" },
+  ] });
+  expect(slugs).toEqual(["opencode-go/deepseek-v4.1-flash"]);
+  const published = new Set(slugs!);
+  expect(commanderOnlyModel({ namespaced: "opencode-go/deepseek-v4.1-flash" }, true, published)).toBe(false);
+  expect(commanderOnlyModel({ namespaced: "opencode-go/hidden" }, true, published)).toBe(true);
+  expect(commanderOnlyModel({ namespaced: "opencode-go/missing" }, false, published)).toBe(false);
+  expect(commanderOnlyModel({ namespaced: "gpt-6.1-sol", native: true }, true, published)).toBe(false);
+  expect(commanderOnlyModel({ namespaced: "opencode-go/missing" }, true, null)).toBe(false);
+  expect(listedCodexModelSlugs({ models: [{ slug: 42 }] })).toBeNull();
+});
+
+test("restart notice requires a current catalog, route, and confirmed stale workers", () => {
+  const activation = {
+    schemaVersion: 1,
+    catalog: { status: "current" },
+    routing: { status: "current" },
+    workers: { status: "reload_required", staleCount: 2 },
+  };
+  expect(staleCodexWorkerCount({ activation })).toBe(2);
+  expect(staleCodexWorkerCount({ activation: { ...activation, workers: { status: "current", staleCount: 0 } } })).toBe(0);
+  expect(staleCodexWorkerCount({ activation: { ...activation, catalog: { status: "pending" } } })).toBeNull();
+  expect(staleCodexWorkerCount({ activation: { ...activation, routing: { status: "external" } } })).toBeNull();
+});
diff --git a/gui/tests/models-status-toast.test.tsx b/gui/tests/models-status-toast.test.tsx
index bfe8bad508c..38b0a1b05a4 100644
--- a/gui/tests/models-status-toast.test.tsx
+++ b/gui/tests/models-status-toast.test.tsx
@@ -211,3 +211,61 @@ test("success toast expires after 6s and a repeated action re-arms it", async ()
   await fireTimers(6000);
   expect(container.querySelector(".action-toast")).toBeNull();
 });
+
+test("Models refreshes the catalog and distinguishes Commander-only models from stale Codex workers", async () => {
+  const canonicalFetch = globalThis.fetch;
+  let synced = false;
+  let syncCalls = 0;
+  globalThis.fetch = (async (input, init) => {
+    const url = String(input);
+    if (url.endsWith("/api/catalog")) {
+      return Response.json({ models: [
+        { slug: "anthropic/claude-sonnet-5", visibility: "list" },
+        ...(synced ? [{ slug: "anthropic/claude-opus-4-5", visibility: "list" }] : []),
+      ] });
+    }
+    if (url.endsWith("/api/codex-catalog/status")) {
+      return Response.json({ activation: {
+        schemaVersion: 1,
+        catalog: { status: "current" },
+        routing: { status: "current" },
+        workers: { status: synced ? "reload_required" : "current", staleCount: synced ? 1 : 0 },
+      } });
+    }
+    if (url.endsWith("/api/sync") && init?.method === "POST") {
+      syncCalls += 1;
+      synced = true;
+      return Response.json({ ok: true, status: "applied" });
+    }
+    return canonicalFetch(input, init);
+  }) as typeof fetch;
+
+  const { createRoot } = await import("react-dom/client");
+  await act(async () => {
+    root = createRoot(container);
+    root.render(<LanguageProvider><Models apiBase="http://localhost" /></LanguageProvider>);
+  });
+  await act(async () => {
+    await new Promise(resolve => testWindow.setTimeout(resolve, 0));
+    await Promise.resolve();
+  });
+
+  expect(container.querySelectorAll(".models-chip--commander-only")).toHaveLength(1);
+  expect(container.querySelector(".models-chip--commander-only")?.textContent).toBe("Commander only");
+  const filter = [...container.querySelectorAll<HTMLButtonElement>("button")]
+    .find(button => button.textContent?.includes("Commander only (1)"))!;
+  await act(async () => { filter.click(); });
+  expect(container.querySelectorAll(".models-model-row")).toHaveLength(1);
+  await act(async () => { filter.click(); });
+
+  const refresh = [...container.querySelectorAll<HTMLButtonElement>("button")]
+    .find(button => button.textContent === "Refresh models")!;
+  await act(async () => {
+    refresh.click();
+    await new Promise(resolve => testWindow.setTimeout(resolve, 0));
+    await Promise.resolve();
+  });
+  expect(syncCalls).toBe(1);
+  expect(container.querySelectorAll(".models-chip--commander-only")).toHaveLength(0);
+  expect(container.textContent).toContain("Quit and reopen ChatGPT");
+});
diff --git a/gui/tests/provider-overview-opencode-go-usage.test.tsx b/gui/tests/provider-overview-opencode-go-usage.test.tsx
new file mode 100644
index 00000000000..9535017423b
--- /dev/null
+++ b/gui/tests/provider-overview-opencode-go-usage.test.tsx
@@ -0,0 +1,162 @@
+import { afterEach, beforeEach, expect, test } from "bun:test";
+import { Window } from "happy-dom";
+import { act } from "react";
+import type { Root } from "react-dom/client";
+import { LanguageProvider } from "../src/i18n/provider";
+import ProviderOverview from "../src/components/provider-workspace/ProviderOverview";
+import type { ProviderModelUsageRow } from "../src/components/provider-workspace/types";
+import type { WorkspaceItem } from "../src/provider-workspace/catalog";
+
+const globals = ["document", "window", "navigator", "localStorage", "IS_REACT_ACT_ENVIRONMENT"] as const;
+let previousGlobals: Record<(typeof globals)[number], unknown>;
+let testWindow: Window;
+
+beforeEach(() => {
+  previousGlobals = Object.fromEntries(globals.map(key => [key, Reflect.get(globalThis, key)])) as typeof previousGlobals;
+  testWindow = new Window({ url: "http://localhost/#providers" });
+  Object.defineProperty(testWindow.navigator, "language", { configurable: true, value: "en-US" });
+  Object.defineProperties(globalThis, {
+    document: { configurable: true, value: testWindow.document },
+    window: { configurable: true, value: testWindow },
+    navigator: { configurable: true, value: testWindow.navigator },
+    localStorage: { configurable: true, value: testWindow.localStorage },
+  });
+  (globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+});
+
+afterEach(() => {
+  testWindow.close();
+  for (const key of globals) {
+    Object.defineProperty(globalThis, key, { configurable: true, value: previousGlobals[key] });
+  }
+});
+
+const item = {
+  name: "opencode-go",
+  adapter: "openai-chat",
+  baseUrl: "https://opencode.ai/zen/go/v1",
+  authMode: "key",
+  hasApiKey: true,
+} as WorkspaceItem;
+
+const modelUsage: ProviderModelUsageRow[] = [
+  { model: "glm-5", requests: 3, measuredRequests: 3, totalTokens: 400, inputTokens: 250, outputTokens: 150, shareRatio: 0.2 },
+  { model: "deepseek-v4", requests: 7, measuredRequests: 7, totalTokens: 1600, inputTokens: 1000, outputTokens: 600, shareRatio: 0.8 },
+];
+
+async function mountOverview(providerItem: WorkspaceItem, usage = modelUsage, totals = { requests: 10, measuredRequests: 10, totalTokens: 2000 }): Promise<{ root: Root; container: HTMLElement }> {
+  const container = document.createElement("div");
+  document.body.append(container);
+  const { createRoot } = await import("react-dom/client");
+  let root!: Root;
+  await act(async () => {
+    root = createRoot(container);
+    root.render(
+      <LanguageProvider>
+        <ProviderOverview item={providerItem} usageTotals={totals} modelUsage={usage} />
+      </LanguageProvider>,
+    );
+  });
+  return { root, container };
+}
+
+test("OpenCode Go overview shows 30-day provider totals and per-model request and token counts", async () => {
+  const { root, container } = await mountOverview(item);
+  try {
+    const section = container.querySelector('section[aria-label="Usage (last 30 days)"]');
+    expect(section).toBeTruthy();
+    const metrics = Array.from(section?.querySelectorAll(".pws-usage-metric") ?? []);
+    expect(metrics.map(metric => [
+      metric.querySelector(".pws-usage-metric-value")?.textContent,
+      metric.querySelector(".pws-usage-metric-label")?.textContent,
+    ])).toEqual([["10", "requests"], ["2.0k", "tokens"]]);
+    const table = section?.querySelector("table");
+    expect(table?.caption?.textContent).toBe("Model breakdown");
+    const rows = Array.from(table?.querySelectorAll("tbody tr") ?? []);
+    expect(rows.map(row => Array.from(row.querySelectorAll("td"), cell => cell.textContent))).toEqual([
+      ["deepseek-v4", "7", "1.6k"],
+      ["glm-5", "3", "400"],
+    ]);
+    expect(section?.textContent).not.toContain("balance");
+    expect(section?.textContent).not.toContain("Est. cost");
+  } finally {
+    await act(async () => { root.unmount(); });
+    container.remove();
+  }
+});
+
+test("OpenCode Go labels completed requests with no token measurement as unreported", async () => {
+  const rows: ProviderModelUsageRow[] = [
+    { model: "no-usage", requests: 2, measuredRequests: 0, totalTokens: 0, inputTokens: 0, outputTokens: 0, shareRatio: 1 },
+  ];
+  const { root, container } = await mountOverview(item, rows, { requests: 2, measuredRequests: 0, totalTokens: 0 });
+  try {
+    const section = container.querySelector('section[aria-label="Usage (last 30 days)"]');
+    expect(section?.textContent).toContain("unreported");
+    expect(section?.textContent).not.toContain("0 tokens");
+  } finally {
+    await act(async () => { root.unmount(); });
+    container.remove();
+  }
+});
+
+test("OpenCode Go labels partially measured provider and model token totals", async () => {
+  const rows: ProviderModelUsageRow[] = [
+    { model: "partial", requests: 4, measuredRequests: 2, totalTokens: 70, inputTokens: 40, outputTokens: 30, shareRatio: 1 },
+  ];
+  const { root, container } = await mountOverview(item, rows, { requests: 4, measuredRequests: 2, totalTokens: 70 });
+  try {
+    const section = container.querySelector('section[aria-label="Usage (last 30 days)"]');
+    expect(section?.textContent).toContain("Partial");
+    expect(section?.textContent).toContain("70");
+  } finally {
+    await act(async () => { root.unmount(); });
+    container.remove();
+  }
+});
+
+test("OpenCode Go does not infer measurement coverage from legacy cached token totals", async () => {
+  const rows: ProviderModelUsageRow[] = [
+    { model: "legacy", requests: 1, totalTokens: 99, inputTokens: 60, outputTokens: 39, shareRatio: 1 },
+  ];
+  const { root, container } = await mountOverview(item, rows, { requests: 1, measuredRequests: 0, totalTokens: 99 });
+  try {
+    const row = container.querySelector("tbody tr");
+    expect(row?.textContent).toContain("unreported");
+    expect(row?.textContent).not.toContain("99");
+  } finally {
+    await act(async () => { root.unmount(); });
+    container.remove();
+  }
+});
+
+test("model summary stays scoped to OpenCode Go", async () => {
+  const { root, container } = await mountOverview({ ...item, name: "deepseek" });
+  try {
+    expect(container.querySelector('section[aria-label="Usage (last 30 days)"]')).toBeNull();
+    expect(container.textContent).not.toContain("deepseek-v4");
+  } finally {
+    await act(async () => { root.unmount(); });
+    container.remove();
+  }
+});
+
+test("OpenCode Go overview does not invent zero usage when no report is available", async () => {
+  const { root, container } = await mountOverview(item, []);
+  try {
+    await act(async () => {
+      root.render(
+        <LanguageProvider>
+          <ProviderOverview item={item} />
+        </LanguageProvider>,
+      );
+    });
+    const section = container.querySelector('section[aria-label="Usage (last 30 days)"]');
+    expect(section?.textContent).toContain("No usage recorded yet.");
+    expect(section?.querySelector(".pws-usage-metrics")).toBeNull();
+    expect(section?.querySelector("table")).toBeNull();
+  } finally {
+    await act(async () => { root.unmount(); });
+    container.remove();
+  }
+});
diff --git a/gui/tests/provider-reference-quota.test.ts b/gui/tests/provider-reference-quota.test.ts
index d5a73304940..2bbb38014aa 100644
--- a/gui/tests/provider-reference-quota.test.ts
+++ b/gui/tests/provider-reference-quota.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { accountQuotaFromReport, referenceQuotaFromReport } from "../src/provider-workspace/report";
+import { accountQuotaFromReport, formatQuotaSourceLabel, referenceQuotaFromReport } from "../src/provider-workspace/report";
 
 const currentAggregation = () => ({
   kind: "capacity-weighted-v1",
@@ -38,12 +38,11 @@ describe("OpenCode Go reference quota reports", () => {
     },
   };
 
-  test("keeps published caps and observations distinct from percentage quota bars", () => {
+  test("ignores stale legacy caps and keeps observations distinct from percentage quota bars", () => {
     expect(accountQuotaFromReport(report)).toBeNull();
     expect(referenceQuotaFromReport(report)).toEqual({
       windows: [expect.objectContaining({
         id: "five_hour",
-        publishedLimitUsd: 12,
         observedSpendUsd: 1.25,
         coverage: "partial",
       })],
@@ -53,6 +52,44 @@ describe("OpenCode Go reference quota reports", () => {
         resetAt: 1_700_018_000_000,
       },
     });
+    expect(referenceQuotaFromReport(report)?.windows[0]).not.toHaveProperty("publishedLimitUsd");
+    expect(formatQuotaSourceLabel(report.source)).toBe("opencode-go · local observations");
+  });
+
+  test("accepts local observation rows without a published cap", () => {
+    const { publishedLimitUsd: _legacyCap, ...currentWindow } = report.quota.referenceWindows[0];
+    const parsed = referenceQuotaFromReport({
+      source: "opencode-go:local-observations",
+      aggregation: currentAggregation(),
+      quota: { referenceWindows: [currentWindow] },
+    });
+    expect(parsed?.windows[0]).toEqual(expect.objectContaining({
+      id: "five_hour",
+      observedSpendUsd: 1.25,
+      observedTokens: 42_000,
+      observedRequests: 3,
+    }));
+  });
+
+  test("adapts live Go usage windows to the same quota bars as Codex", () => {
+    const quota = accountQuotaFromReport({
+      source: "opencode-go:usage-api",
+      aggregation: null,
+      quota: {
+        fiveHourPercent: 12.5,
+        fiveHourResetAt: 1_780_000_000_000,
+        weeklyPercent: 40,
+        weeklyResetAt: 1_780_100_000_000,
+        monthlyPercent: 65,
+        monthlyResetAt: 1_780_200_000_000,
+        updatedAt: 1_779_900_000_000,
+      },
+    });
+    expect(quota).toEqual(expect.objectContaining({
+      fiveHourPercent: 12.5,
+      weeklyPercent: 40,
+      monthlyPercent: 65,
+    }));
   });
 
   test("drops malformed rows instead of inventing values", () => {
@@ -60,7 +97,6 @@ describe("OpenCode Go reference quota reports", () => {
       id: "five_hour",
       label: "5-hour",
       windowSeconds: 18_000,
-      publishedLimitUsd: -12,
       coverage: "complete",
     }] } })).toBeNull();
   });
diff --git a/package.json b/package.json
index 9a2000de813..068e0f6ded5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codexcommander",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": true,
   "description": "CodexCommander — universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
   "type": "module",
diff --git a/src/cli/catalog-activation.ts b/src/cli/catalog-activation.ts
index a86ee107e20..ef443275265 100644
--- a/src/cli/catalog-activation.ts
+++ b/src/cli/catalog-activation.ts
@@ -134,7 +134,13 @@ export async function syncCodexCatalogForCli(
   // the listener. Cross-process catalog serialization still protects a legacy
   // same-home proxy whose runtime record was lost.
   if (!live || live.source !== "runtime" || live.pid === null) {
-    return withNativeDiscoveryLogsSuppressed(() => deps.syncModelsToCodex());
+    return withNativeDiscoveryLogsSuppressed(() => deps.syncModelsToCodex(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      { forceNativeLive: true, forceRoutedLive: true },
+    ));
   }
   try {
     const headers = proxyLifecycleLockLeaseHeaders(lifecycleLease);
diff --git a/src/codex/model-cache.ts b/src/codex/model-cache.ts
index 24e38689778..43038c57b8d 100644
--- a/src/codex/model-cache.ts
+++ b/src/codex/model-cache.ts
@@ -17,6 +17,7 @@ export const DEFAULT_MODEL_CACHE_TTL_MS = 5 * 60 * 1000;
 interface CacheEntry {
   models: CatalogModel[];
   fetchedAt: number;
+  freshnessInvalidated?: boolean;
   sizeBytes: number;
 }
 
@@ -147,7 +148,7 @@ export function isModelsFetchCoolingDown(provider: string, cooldownMs = MODELS_F
 export function getFreshCached(provider: string, ttlMs: number, now = Date.now()): CatalogModel[] | null {
   const entry = cache.get(provider);
   if (!entry) return null;
-  return now - entry.fetchedAt < ttlMs ? entry.models : null;
+  return !entry.freshnessInvalidated && now - entry.fetchedAt < ttlMs ? entry.models : null;
 }
 
 /** Last-known-good models regardless of age — the fallback when a live fetch fails. */
@@ -168,7 +169,21 @@ export function setCached(provider: string, models: CatalogModel[], now = Date.n
   enforceAppOwnedMemoryBudget();
 }
 
-/** Drop one provider's cache (or all) so the next resolve forces a live re-fetch. */
+/** Force the next discovery attempt while preserving last-known-good rows and provenance.
+ * Keep fetchedAt intact: memory-budget eviction orders retained data by its actual age.
+ * Explicit refresh also bypasses a prior failure cooldown, including providers without rows. */
+export function invalidateModelCacheFreshness(provider?: string): void {
+  if (provider !== undefined) {
+    const entry = cache.get(provider);
+    if (entry) entry.freshnessInvalidated = true;
+    failureAt.delete(provider);
+  } else {
+    for (const entry of cache.values()) entry.freshnessInvalidated = true;
+    failureAt.clear();
+  }
+}
+
+/** Drop one provider's cache (or all), including discovery provenance and failure cooldown. */
 export function clearModelCache(provider?: string): void {
   if (provider) {
     deleteCachedProvider(provider);
diff --git a/src/codex/sync.ts b/src/codex/sync.ts
index fa1f104e586..cdc35a0085c 100644
--- a/src/codex/sync.ts
+++ b/src/codex/sync.ts
@@ -2,6 +2,8 @@ import { injectCodexConfig } from "./inject";
 import { currentExternalCodexModelProvider } from "./routing-transition";
 import { printProjectCodexConfigWarnings, groupProjectCodexConfigWarningsByPath, type ProjectCodexConfigWarning } from "./project-config-warnings";
 import { refreshCodexModelCatalog, type CodexCatalogRefreshResult } from "./refresh";
+import { refreshNativeLiveCatalog } from "./catalog/native-live";
+import { invalidateModelCacheFreshness } from "./model-cache";
 import { applyProxyEnv, loadConfig } from "../config";
 import type { CodexCommanderConfig } from "../types";
 import { collectOrcaCodexHomeDiagnostic } from "./home";
@@ -47,6 +49,10 @@ type CodexSyncAdmission = Extract<CodexAdmission, { kind: "refused" }> | { reado
 
 interface CodexSyncDeps {
   refreshCodexModelCatalog: typeof refreshCodexModelCatalog;
+  /** Native discovery seam; explicit syncs may bypass its five-minute memo. */
+  refreshNativeLiveCatalog?: typeof refreshNativeLiveCatalog;
+  /** Routed discovery seam; explicit syncs may bypass provider model caches. */
+  invalidateModelCacheFreshness?: typeof invalidateModelCacheFreshness;
   injectCodexConfig: typeof injectCodexConfig;
   /** The sync entry only needs this admission's service-home verdict. */
   admitCodexWrite?: () => CodexSyncAdmission;
@@ -103,6 +109,7 @@ export async function syncModelsToCodex(
   config: CodexCommanderConfig = loadConfig(),
   log: Pick<Console, "log" | "error"> | null = console,
   deps: CodexSyncDeps = defaultDeps,
+  options: Readonly<{ forceNativeLive?: boolean; forceRoutedLive?: boolean }> = {},
 ): Promise<CodexSyncResult> {
   // `config` can be the server's startup object. The decision, however, is a
   // durable user switch and must be read again at this production boundary: a
@@ -220,6 +227,12 @@ export async function syncModelsToCodex(
   let catalogConvergenceChanged = false;
 
   try {
+    if (options.forceNativeLive) {
+      await (deps.refreshNativeLiveCatalog ?? refreshNativeLiveCatalog)({ force: true });
+    }
+    if (options.forceRoutedLive) {
+      (deps.invalidateModelCacheFreshness ?? invalidateModelCacheFreshness)();
+    }
     const cat = await deps.refreshCodexModelCatalog(config);
     added = cat.added;
     catalogExists = cat.catalogExists;
diff --git a/src/providers/quota.ts b/src/providers/quota.ts
index 97f77fbbdf4..433a90a3af5 100644
--- a/src/providers/quota.ts
+++ b/src/providers/quota.ts
@@ -83,7 +83,8 @@ export interface ProviderQuotaReferenceWindow {
   id: "five_hour" | "weekly" | "monthly";
   label: string;
   windowSeconds: number;
-  publishedLimitUsd: number;
+  /** Legacy reference cap; new OpenCode Go observations omit it because limits vary by model and plan. */
+  publishedLimitUsd?: number;
   observedSpendUsd?: number;
   observedTokens: number;
   observedRequests: number;
@@ -107,7 +108,7 @@ export interface ProviderQuota {
   monthlyPercent?: number;
   monthlyResetAt?: number;
   customWindows?: ProviderQuotaWindow[];
-  /** Published caps plus local observations; never presented as provider remaining balance. */
+  /** Local observations when live quota is unavailable; never a provider remaining balance. */
   referenceWindows?: ProviderQuotaReferenceWindow[];
   /** Authoritative only because the upstream emitted this concrete limit event. */
   observedLimitEvent?: ProviderQuotaLimitEvent;
@@ -1425,11 +1426,11 @@ async function fetchAntigravityQuota(provider: string, config: CodexCommanderPro
 }
 
 const OPENCODE_GO_BASE_URL = "https://opencode.ai/zen/go/v1";
-const OPENCODE_GO_CAPS_VERIFIED_AT = "2026-08-05";
-const OPENCODE_GO_REFERENCE_WINDOWS = [
-  { id: "five_hour", label: "5-hour", windowSeconds: 5 * 60 * 60, publishedLimitUsd: 12 },
-  { id: "weekly", label: "7-day", windowSeconds: 7 * 24 * 60 * 60, publishedLimitUsd: 30 },
-  { id: "monthly", label: "30-day", windowSeconds: 30 * 24 * 60 * 60, publishedLimitUsd: 60 },
+const OPENCODE_GO_USAGE_URL = `${OPENCODE_GO_BASE_URL}/usage`;
+const OPENCODE_GO_OBSERVATION_WINDOWS = [
+  { id: "five_hour", label: "5-hour", windowSeconds: 5 * 60 * 60 },
+  { id: "weekly", label: "7-day", windowSeconds: 7 * 24 * 60 * 60 },
+  { id: "monthly", label: "30-day", windowSeconds: 30 * 24 * 60 * 60 },
 ] as const;
 const OPENCODE_GO_MAX_OBSERVATION_MS = 30 * 24 * 60 * 60 * 1000;
 
@@ -1484,7 +1485,7 @@ function localReferenceWindows(
   now: number,
   history: { truncated: boolean; oldestRetainedAt?: number },
 ): ProviderQuotaReferenceWindow[] {
-  return OPENCODE_GO_REFERENCE_WINDOWS.map(reference => {
+  return OPENCODE_GO_OBSERVATION_WINDOWS.map(reference => {
     const windowStart = now - reference.windowSeconds * 1000;
     const rows = observations.filter(row => row.timestamp >= windowStart);
     const priced = rows.filter(row => row.cost !== undefined);
@@ -1603,12 +1604,61 @@ async function fetchOpenCodeGoReferenceQuota(provider: string): Promise<Provider
   return {
     provider,
     label: providerLabel(provider),
-    source: `opencode-go:published-caps-${OPENCODE_GO_CAPS_VERIFIED_AT}+local-estimate`,
+    source: "opencode-go:local-observations",
     quota,
     updatedAt: now,
   };
 }
 
+/** OpenCode's Go endpoint reports account-wide used percentages and exact reset times. */
+async function fetchOpenCodeGoLiveQuota(
+  provider: string,
+  providerConfig: CodexCommanderProviderConfig,
+): Promise<ProviderQuotaReport | null> {
+  const key = typeof providerConfig.apiKey === "string"
+    ? resolveEnvValue(providerConfig.apiKey)?.trim()
+    : undefined;
+  if (!key || (providerConfig.authMode ?? "key") !== "key") return null;
+  const response = await fetch(OPENCODE_GO_USAGE_URL, {
+    headers: { Authorization: `Bearer ${key}`, Accept: "application/json" },
+    redirect: "error",
+    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+  });
+  if (!response.ok) {
+    await response.body?.cancel().catch(() => {});
+    return null;
+  }
+  const body: unknown = await response.json();
+  if (!body || typeof body !== "object" || Array.isArray(body)) return null;
+  const usage = (body as Record<string, unknown>).usage;
+  if (!usage || typeof usage !== "object" || Array.isArray(usage)) return null;
+  const windows = usage as Record<string, unknown>;
+  const readWindow = (name: string): { percent: number; resetAt?: number } | null => {
+    const raw = windows[name];
+    if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
+    const window = raw as Record<string, unknown>;
+    if (window.status !== "ok" && window.status !== "rate-limited") return null;
+    const percent = window.percent;
+    if (typeof percent !== "number" || !Number.isFinite(percent) || percent < 0 || percent > 100) return null;
+    const resetAt = typeof window.resetsAt === "string" ? Date.parse(window.resetsAt) : NaN;
+    return { percent, ...(Number.isFinite(resetAt) ? { resetAt } : {}) };
+  };
+  const rolling = readWindow("rolling");
+  const weekly = readWindow("weekly");
+  const monthly = readWindow("monthly");
+  if (!rolling || !weekly || !monthly) return null;
+  const updatedAt = Date.now();
+  return report(provider, "opencode-go:usage-api", {
+    fiveHourPercent: rolling.percent,
+    ...(rolling.resetAt !== undefined ? { fiveHourResetAt: rolling.resetAt } : {}),
+    weeklyPercent: weekly.percent,
+    ...(weekly.resetAt !== undefined ? { weeklyResetAt: weekly.resetAt } : {}),
+    monthlyPercent: monthly.percent,
+    ...(monthly.resetAt !== undefined ? { monthlyResetAt: monthly.resetAt } : {}),
+    updatedAt,
+  });
+}
+
 /**
  * Whether a provider shape has a concrete quota-reporting implementation.
  * Exposed through the safe provider summary so thin clients can distinguish a
@@ -1639,7 +1689,8 @@ async function maybeFetchProviderQuota(
   if (provider.disabled === true || !supportsProviderQuotaReporting(name, provider)) return null;
   try {
     if (name === "opencode-go" && isCanonicalOpenCodeGoBaseUrl(provider.baseUrl)) {
-      return fetchOpenCodeGoReferenceQuota(name);
+      const live = await fetchOpenCodeGoLiveQuota(name, provider).catch(() => null);
+      return live ?? fetchOpenCodeGoReferenceQuota(name);
     }
     if (isBuiltInChatGptForwardProvider(name, provider)) {
       return fetchChatGptForwardQuota(config, name, provider, forceRefresh, prefetchedCodexSnapshot);
diff --git a/src/providers/registry.ts b/src/providers/registry.ts
index 59a0875a692..1272e5386f3 100644
--- a/src/providers/registry.ts
+++ b/src/providers/registry.ts
@@ -359,8 +359,8 @@ const THINKING_BUDGET_MODELS = [
 ];
 const OPENCODE_GO_THINKING_BUDGET_MODELS = ["qwen3.5-plus", "qwen3.6-plus", "qwen3.7-max", "qwen3.7-plus", "qwen3.8-max"];
 /**
- * Pinned OpenCode Go lineup (28 ids): the 25-id snapshot from 2026-08-05 plus
- * DeepSeek V4.1 Flash, GLM-5.3 Flash, and Qwen3.8 Flash, verified 2026-09-27.
+ * Pinned OpenCode Go lineup (41 ids): the 28-id snapshot through 2026-09-27 plus
+ * 13 live, documented ids verified 2026-09-29.
  * `GET https://opencode.ai/zen/go/v1/models` is
  * existence-only — it returns ids without context/output/pricing metadata — so this list is
  * the catalog seed, and the registry-only discovery filter below admits exactly these ids:
@@ -371,28 +371,35 @@ const OPENCODE_GO_THINKING_BUDGET_MODELS = ["qwen3.5-plus", "qwen3.6-plus", "qwe
  * the trusted id set (its wire fact is honest) and out of pickers via the compatibility
  * exclusion in src/codex/catalog/parsing.ts.
  *
- * Transport split per the official endpoint table (https://opencode.ai/docs/go/#endpoints):
- * Qwen and MiniMax rows serve Anthropic Messages (`/zen/go/v1/messages`), GPT-5.6 Luna and
- * Grok 4.5 serve OpenAI Responses (`/zen/go/v1/responses`), and the remaining rows serve
- * OpenAI Chat Completions (`/zen/go/v1/chat/completions`). DeepSeek V4.1 Flash is included
- * on that Chat wire. The Anthropic subset is a hard
- * wire pin owned by types.ts (OPENCODE_GO_ANTHROPIC_WIRE_MODEL_IDS); the two OpenAI-shaped
- * wires are registry `modelWireDefaults` on the entry below.
+ * Transport split per the official endpoint table (https://opencode.ai/v2/docs/console/go#endpoints):
+ * Qwen and MiniMax rows serve Anthropic Messages (`/zen/go/v1/messages`); GPT-5.6 Luna,
+ * GPT 6 Luna, Grok 4.5/4.6/4.7, and Muse Spark contributor rows serve OpenAI Responses
+ * (`/zen/go/v1/responses`); the remaining rows serve OpenAI Chat Completions
+ * (`/zen/go/v1/chat/completions`). The Anthropic subset is a hard wire pin owned by
+ * types.ts (OPENCODE_GO_ANTHROPIC_WIRE_MODEL_IDS); Responses defaults live on the entry below.
  */
 const OPENCODE_GO_MODELS = [
   "minimax-m3", "minimax-m2.7", "minimax-m2.5",
   "kimi-k3", "kimi-k2.7-code", "kimi-k2.6", "kimi-k2.5",
-  "glm-5.3-flash", "glm-5.2", "glm-5.1", "glm-5",
+  "glm-5.3-flash", "glm-5.3", "glm-5.2", "glm-5.1", "glm-5",
   "deepseek-v4-pro", "deepseek-v4-flash", "deepseek-v4.1-flash",
+  "deepseek-v4-flash-vision-exp",
   "qwen3.8-max", "qwen3.8-flash", "qwen3.7-max", "qwen3.7-plus", "qwen3.6-plus", "qwen3.5-plus",
   "mimo-v2-pro", "mimo-v2-omni", "mimo-v2.5-pro", "mimo-v2.5",
-  "hy3", "hy3-preview",
-  "gpt-5.6-luna", "grok-4.5",
+  "mimo-v2.6-pro", "mimo-v2.6-flash",
+  "hy3", "hy3-preview", "hy4-preview",
+  "longcat-2.0", "longcat-2.5-preview-free", "space-bunny-free",
+  "gpt-5.6-luna", "gpt-6-luna", "grok-4.5", "grok-4.6", "grok-4.7",
+  "muse-spark-1.2-contributor", "muse-spark-1.3-contributor",
+];
+const OPENCODE_GO_RESPONSES_WIRE_MODELS = [
+  "gpt-5.6-luna", "gpt-6-luna", "grok-4.5", "grok-4.6", "grok-4.7",
+  "muse-spark-1.2-contributor", "muse-spark-1.3-contributor",
 ];
-const OPENCODE_GO_RESPONSES_WIRE_MODELS = ["gpt-5.6-luna", "grok-4.5"];
 // grok-4.5 reasoning is always-on with low/medium/high control (mirrors the verified xAI
 // ladder on the `xai` entry); GPT-5.6 Luna serves the OpenAI API GPT-5.6 ladder.
 const OPENCODE_GO_GROK45_REASONING_EFFORTS = ["low", "medium", "high"];
+const OPENCODE_GO_GROK46_47_REASONING_EFFORTS = ["low", "medium", "high", "xhigh"];
 const DEEPSEEK_THINKING_MODELS = ["deepseek-v4-pro", "deepseek-v4-flash"];
 const OPENCODE_GO_DEEPSEEK_THINKING_MODELS = [...DEEPSEEK_THINKING_MODELS, "deepseek-v4.1-flash"];
 const OPENCODE_FREE_DEEPSEEK_MODELS = ["deepseek-v4-flash-free"];
@@ -1159,7 +1166,7 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
   {
     id: "opencode-go", label: "OpenCode Go", adapter: "openai-chat", baseUrl: "https://opencode.ai/zen/go/v1",
     authKind: "key", featured: true, dashboardUrl: "https://opencode.ai/auth", defaultModel: "kimi-k2.7-code",
-    jawcodeBundle: "opencode-go", note: "GLM, DeepSeek, Kimi, Qwen, MiMo…",
+    jawcodeBundle: "opencode-go", note: "GLM, DeepSeek, Kimi, Qwen, MiMo… Muse Spark 1.2 and 1.3 Contributor may use your prompts and completions to train future Meta models. Details: https://dev.meta.ai/docs/pricing-rate-limits#contributor-tier",
     models: [...OPENCODE_GO_MODELS],
     // Live /v1/models is the authoritative lineup; the static list above is the last-good
     // fallback seed. The registry-only filter quarantines any id outside the trusted set, and
@@ -1170,7 +1177,10 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
     preserveCustomDestination: true,
     apiKeyValidation: "unknown",
     modelDiscovery: {
-      filter: { anyOf: [{ path: ["id"], equalsAny: OPENCODE_GO_MODELS }] },
+      filter: { anyOf: [
+        { path: ["id"], equalsAny: OPENCODE_GO_MODELS.slice(0, 32) },
+        { path: ["id"], equalsAny: OPENCODE_GO_MODELS.slice(32) },
+      ] },
     },
     // Per-model wire facts for the Responses-serving rows. The Anthropic-only rows are
     // hard-pinned in types.ts, and the remaining trusted rows keep the provider-wide
@@ -1184,7 +1194,8 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
     // https://opencode.ai/data/deepseek/deepseek-v4-1-flash,
     // https://stats.opencode.ai/data/zhipu/glm-5-3-flash, and
     // https://stats.opencode.ai/data/qwen/qwen3-8-flash (all 1M), plus the
-    // previously pinned Qwen3.8 Max and GPT-5.6 Luna values.
+    // previously pinned Qwen3.8 Max and GPT-5.6 Luna values. OpenCode's
+    // https://models.opencode.ai/api.json reports a 1,050,000-token context for GPT 6 Luna.
     modelContextWindows: {
       "kimi-k3": KIMI_K3_STANDARD_CONTEXT_WINDOW,
       "deepseek-v4.1-flash": 1_000_000,
@@ -1192,6 +1203,9 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
       "qwen3.8-max": 1_000_000,
       "qwen3.8-flash": 1_000_000,
       "gpt-5.6-luna": 1_050_000,
+      "gpt-6-luna": 1_050_000,
+      "grok-4.6": 500_000,
+      "grok-4.7": 500_000,
     },
     // qwen3.8-max (text/image/video) and gpt-5.6-luna (text/image/pdf) are multimodal upstream;
     // the jawcode type can only represent text+image, so video/pdf stay source facts.
@@ -1202,6 +1216,7 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
       "qwen3.8-max": ["text", "image"],
       "qwen3.8-flash": ["text", "image"],
       "gpt-5.6-luna": ["text", "image"],
+      "gpt-6-luna": ["text", "image"],
     },
     modelReasoningEfforts: {
       "glm-5.2": ZAI_GLM_52_REASONING_EFFORTS,
@@ -1209,7 +1224,12 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [
       "kimi-k2.7-code": [],
       "kimi-k2.7-code-highspeed": [],
       "grok-4.5": OPENCODE_GO_GROK45_REASONING_EFFORTS,
+      "grok-4.6": OPENCODE_GO_GROK46_47_REASONING_EFFORTS,
+      "grok-4.7": OPENCODE_GO_GROK46_47_REASONING_EFFORTS,
       "gpt-5.6-luna": OPENAI_API_GPT56_REASONING_EFFORTS,
+      // OpenCode lists none/low/medium/high/xhigh/max; `none` is outside Codex's
+      // selectable effort ladder, while max is a real upstream option.
+      "gpt-6-luna": OPENAI_API_GPT56_REASONING_EFFORTS,
       ...Object.fromEntries(OPENCODE_GO_THINKING_TOGGLE_MODELS.map(id => [id, THINKING_TOGGLE_EFFORTS])),
       ...Object.fromEntries(OPENCODE_GO_THINKING_BUDGET_MODELS.map(id => [id, THINKING_BUDGET_EFFORTS])),
       ...Object.fromEntries(OPENCODE_GO_DEEPSEEK_THINKING_MODELS.map(id => [id, deepseekThinkingEffortsFor(id)])),
diff --git a/src/server/management/config-routes.ts b/src/server/management/config-routes.ts
index 176cb5031fa..19df3ea3a10 100644
--- a/src/server/management/config-routes.ts
+++ b/src/server/management/config-routes.ts
@@ -288,7 +288,13 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
       // decision. A toggle may have persisted while this process was gathering.
       const runtime = (deps.readRuntimePort ?? readRuntimePort)(process.pid);
       const currentConfig = loadConfig();
-      const result = await (deps.syncModelsToCodex ?? syncModelsToCodex)(runtime?.port, currentConfig, null);
+      const result = await (deps.syncModelsToCodex ?? syncModelsToCodex)(
+        runtime?.port,
+        currentConfig,
+        null,
+        undefined,
+        { forceNativeLive: true, forceRoutedLive: true },
+      );
       // A read taken before this sync can be memoized for five seconds. Drop it
       // before classifying the just-written catalog so launch-time catalog
       // readiness cannot be masked by a pre-write `fresh` snapshot.
diff --git a/src/types.ts b/src/types.ts
index f7c47b176d7..a7a2902aaac 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1347,9 +1347,9 @@ export const MODEL_ADAPTER_OVERRIDE_ALLOWED: ReadonlySet<string> = new Set([
  * Anthropic for these models.
  *
  * OpenCode Go models that serve only Anthropic Messages (`/zen/go/v1/messages`) on the
- * canonical Zen Go gateway. Official endpoint table: https://opencode.ai/docs/go/#endpoints
- * (MiniMax M3/M2.7/M2.5 and every Qwen row are Anthropic Messages; GLM/Kimi/DeepSeek/MiMo/Hy3
- * are Chat Completions; GPT-5.6 Luna and Grok 4.5 are Responses). Kept next to the pin map so
+ * canonical Zen Go gateway. Official endpoint table: https://opencode.ai/v2/docs/console/go#endpoints
+ * (MiniMax M3/M2.7/M2.5 and every Qwen row are Anthropic Messages; new Go roster additions
+ * through 2026-09-29 use Chat Completions or Responses and add no Anthropic pins). Kept next to the pin map so
  * the config validator and the wire resolver share one source; the provider registry derives
  * its per-model transport table from the same list.
  */
diff --git a/tests/cli-catalog-activation.test.ts b/tests/cli-catalog-activation.test.ts
index 9769fd3c9a7..831d7d7cae5 100644
--- a/tests/cli-catalog-activation.test.ts
+++ b/tests/cli-catalog-activation.test.ts
@@ -160,10 +160,14 @@ describe("CLI catalog activation orchestration", () => {
 
   test("offline sync uses the canonical local sync facade", async () => {
     let localCalls = 0;
+    let forceNativeLive: boolean | undefined;
+    let forceRoutedLive: boolean | undefined;
     const events: string[] = [];
     const result = await syncCodexCatalogForCli(null, {
-      syncModelsToCodex: async () => {
+      syncModelsToCodex: async (_port, _config, _log, _deps, options) => {
         localCalls += 1;
+        forceNativeLive = options?.forceNativeLive;
+        forceRoutedLive = options?.forceRoutedLive;
         return syncResult();
       },
       runtimeRequest: async () => {
@@ -175,6 +179,8 @@ describe("CLI catalog activation orchestration", () => {
       },
     });
     expect(localCalls).toBe(1);
+    expect(forceNativeLive).toBe(true);
+    expect(forceRoutedLive).toBe(true);
     expect(result.ok).toBe(true);
     expect(events).toEqual(["acquire:true", "release"]);
   });
diff --git a/tests/cli-headless-parity.test.ts b/tests/cli-headless-parity.test.ts
index 6bdf3c00445..6342d4f926c 100644
--- a/tests/cli-headless-parity.test.ts
+++ b/tests/cli-headless-parity.test.ts
@@ -142,6 +142,9 @@ describe("headless GUI parity CLI", () => {
       ["/api/providers", "ccx provider"],
       ["/api/provider-", "ccx provider/models"],
       ["/api/selected-models", "ccx models"],
+      // Models compares discovered rows with this read-only published snapshot;
+      // `ccx system sync` refreshes it, but the CLI has no exact snapshot view.
+      ["/api/catalog", "(none — published Codex catalog snapshot)"],
       ["/api/custom-models", "ccx models"],
       ["/api/model", "ccx models"],
       ["/api/combos", "ccx combo"],
diff --git a/tests/codex-app-server-processes.test.ts b/tests/codex-app-server-processes.test.ts
index 3a6ffd6d559..755cc2b0556 100644
--- a/tests/codex-app-server-processes.test.ts
+++ b/tests/codex-app-server-processes.test.ts
@@ -525,7 +525,8 @@ describe("CLI /api sync wiring for stale app-servers (#476)", () => {
 
     expect(cliActivationSource).toContain('runtimeRequest<unknown>("/api/sync"');
     expect(cliActivationSource).toContain('live.source !== "runtime" || live.pid === null');
-    expect(cliActivationSource).toContain("return withNativeDiscoveryLogsSuppressed(() => deps.syncModelsToCodex())");
+    expect(cliActivationSource).toContain("return withNativeDiscoveryLogsSuppressed(() => deps.syncModelsToCodex(");
+    expect(cliActivationSource).toContain("{ forceNativeLive: true, forceRoutedLive: true }");
     expect(cliActivationSource).toContain("captureCodexCatalogDesiredSnapshot().revision === expected.desired.revision");
     expect(cliActivationSource).toContain("artifactFenceStillMatches: catalogApplyFenceArtifactsStillMatch");
     expect(cliActivationSource).toContain("applyCodexCatalogWorkers(");
diff --git a/tests/codex-sync-api.test.ts b/tests/codex-sync-api.test.ts
index aa9cfc94ec6..d8ed322d92d 100644
--- a/tests/codex-sync-api.test.ts
+++ b/tests/codex-sync-api.test.ts
@@ -4,6 +4,10 @@ import { existsSync, mkdirSync, mkdtempSync, readFileSync, realpathSync, rmSync,
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { syncModelsToCodex } from "../src/codex/sync";
+import { gatherRoutedModels } from "../src/codex/catalog";
+import { clearModelCache, getProviderDiscoveryStatus, getProviderLiveModelCount, getStaleCached, markModelsFetchFailure } from "../src/codex/model-cache";
+import { knownModelIdsForProvider, routeModel } from "../src/router";
+import { routedSlug } from "../src/providers/slug-codec";
 import { handleManagementAPI } from "../src/server/management-api";
 import { resolveCodexCoordinatorDatabasePath, resolveEffectiveUserIdentity } from "../src/codex/user-identity";
 import { MANAGED_AGENTS_TABLE_MARKER, MANAGED_SUBAGENT_DEFAULT_MARKER } from "../src/codex/subagent-defaults";
@@ -168,6 +172,107 @@ describe("GUI/CLI Codex sync backend", () => {
     expect(errors).toEqual([]);
   });
 
+  test("an explicit sync refreshes native and routed discovery before convergence", async () => {
+    const order: string[] = [];
+    const forced: boolean[] = [];
+    const result = await syncModelsToCodex(12345, config, null, {
+      admitCodexWrite: admittedSync,
+      prepareCodexTransitionState: preparedSync,
+      reconcileJournal: () => false,
+      refreshNativeLiveCatalog: async options => {
+        order.push("native");
+        forced.push(options.force === true);
+        return {} as never;
+      },
+      invalidateModelCacheFreshness: () => { order.push("routed"); },
+      refreshCodexModelCatalog: async () => {
+        order.push("catalog");
+        return {
+          added: 0,
+          path: "/tmp/codexcommander-catalog.json",
+          catalogExists: true,
+          catalogWritten: false,
+          cacheSynced: false,
+          comboOmissions: [],
+        };
+      },
+      injectCodexConfig: async () => {
+        order.push("inject");
+        return { success: true, message: "injected" };
+      },
+      currentExternalCodexModelProvider: () => null,
+    }, { forceNativeLive: true, forceRoutedLive: true });
+
+    expect(order).toEqual(["native", "routed", "catalog", "inject"]);
+    expect(forced).toEqual([true]);
+    expect(result.ok).toBe(true);
+  });
+
+  test("a forced routed refresh retains discovered rows and routing ids when discovery fails", async () => {
+    let fetchCalls = 0;
+    let failing = false;
+    const discoveryConfig: CodexCommanderConfig = {
+      ...config,
+      providers: {
+        fixture: {
+          ...config.providers.fixture!,
+          liveModels: true,
+          models: ["configured-fallback"],
+          fetch: (async () => {
+            fetchCalls += 1;
+            return failing
+              ? new Response("unavailable", { status: 503 })
+              : Response.json({ data: [{ id: "vendor/discovered-model" }, { id: "second-model" }] });
+          }) as typeof fetch,
+        },
+      },
+    };
+    clearModelCache("fixture");
+    try {
+      const gather = () => gatherRoutedModels(discoveryConfig, { nativeOpenAiSlugs: () => [] });
+      const warm = await gather();
+      expect(warm.map(model => model.id)).toContain("vendor/discovered-model");
+      expect(getProviderLiveModelCount("fixture")).toBe(2);
+      expect(getProviderDiscoveryStatus("fixture")).toEqual({ status: "ok" });
+      const stale = getStaleCached("fixture");
+      // Explicit force must bypass both a fresh cache and a prior failure cooldown.
+      markModelsFetchFailure("fixture");
+      failing = true;
+      let refreshed: typeof warm = [];
+      const result = await syncModelsToCodex(12345, discoveryConfig, null, {
+        admitCodexWrite: admittedSync,
+        prepareCodexTransitionState: preparedSync,
+        currentExternalCodexModelProvider: () => null,
+        refreshCodexModelCatalog: async () => {
+          refreshed = await gather();
+          return {
+            added: refreshed.length,
+            path: "/tmp/codexcommander-catalog.json",
+            catalogExists: true,
+            catalogWritten: false,
+            cacheSynced: false,
+            comboOmissions: [],
+          };
+        },
+        injectCodexConfig: async () => ({ success: true, message: "injected" }),
+      }, { forceRoutedLive: true });
+
+      expect(result.ok).toBe(true);
+      expect(fetchCalls).toBe(2);
+      expect(refreshed).toEqual(warm);
+      expect(getStaleCached("fixture")).toBe(stale);
+      expect(getProviderLiveModelCount("fixture")).toBe(2);
+      expect(getProviderDiscoveryStatus("fixture")).toEqual({ status: "failed", reason: "http", httpStatus: 503 });
+      expect(knownModelIdsForProvider("fixture", discoveryConfig.providers.fixture!)).toContain("vendor/discovered-model");
+      expect(routeModel(discoveryConfig, routedSlug("fixture", "vendor/discovered-model"))).toMatchObject({
+        providerName: "fixture",
+        modelId: "vendor/discovered-model",
+      });
+    } finally {
+      clearModelCache("fixture");
+    }
+  });
+
   test("refuses before catalog publication when the current coordinator is unavailable", async () => {
     let refreshed = false;
     let injected = false;
@@ -586,6 +691,7 @@ describe("GUI/CLI Codex sync backend", () => {
 
   test("POST /api/sync promotes failed readiness only after a clean full sync", async () => {
     let recovered = 0;
+    let syncOptions: Readonly<{ forceNativeLive?: boolean; forceRoutedLive?: boolean }> | undefined;
     const syncResult = {
       status: "applied" as const,
       ok: true,
@@ -600,7 +706,10 @@ describe("GUI/CLI Codex sync backend", () => {
     };
     const request = new Request("http://localhost/api/sync", { method: "POST" });
     const response = await handleManagementAPI(request, new URL(request.url), config, {
-      syncModelsToCodex: async () => syncResult,
+      syncModelsToCodex: async (_port, _current, _log, _deps, options) => {
+        syncOptions = options;
+        return syncResult;
+      },
       readRuntimePort: () => ({ pid: process.pid, port: 10100, hostname: "127.0.0.1", startedAt: new Date().toISOString() }),
       resetCodexAppServerCatalogStateCache: () => {},
       collectCodexAppServerCatalogState: () => ({ state: "not_running", processes: [], catalogMtimeMs: null }),
@@ -621,6 +730,7 @@ describe("GUI/CLI Codex sync backend", () => {
 
     expect(response?.status).toBe(200);
     expect(recovered).toBe(1);
+    expect(syncOptions).toEqual({ forceNativeLive: true, forceRoutedLive: true });
 
     const degradedRequest = new Request("http://localhost/api/sync", { method: "POST" });
     await handleManagementAPI(degradedRequest, new URL(degradedRequest.url), config, {
diff --git a/tests/native-discovery-guard.test.ts b/tests/native-discovery-guard.test.ts
index a4d959508f9..2b4b3da6764 100644
--- a/tests/native-discovery-guard.test.ts
+++ b/tests/native-discovery-guard.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, spyOn, test } from "bun:test";
+import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -37,6 +37,12 @@ const previousCli = process.env.CODEX_CLI_PATH;
 const previousPath = process.env.PATH;
 const dirs: string[] = [];
 
+beforeEach(() => {
+  // Each fixture selects its own runtime. An inherited app path must not
+  // invalidate retained-snapshot identities created with fixture runtimes.
+  delete process.env.CODEX_CLI_PATH;
+});
+
 afterEach(() => {
   if (previousHome === undefined) delete process.env.CODEX_HOME;
   else process.env.CODEX_HOME = previousHome;
diff --git a/tests/opencode-go-catalog.test.ts b/tests/opencode-go-catalog.test.ts
index 376c2378188..4ffc5b99b7c 100644
--- a/tests/opencode-go-catalog.test.ts
+++ b/tests/opencode-go-catalog.test.ts
@@ -1,15 +1,14 @@
 /**
  * OpenCode Go provider catalog + trusted transport registry drift guard.
  *
- * The registry pins the last-known-good Zen Go lineup (25 ids from
- * `GET https://opencode.ai/zen/go/v1/models`, verified 2026-08-05, plus DeepSeek V4.1 Flash,
- * GLM-5.3 Flash, and Qwen3.8 Flash, verified 2026-09-27)
+ * The registry pins the last-known-good Zen Go lineup (28 ids through 2026-09-27,
+ * plus 13 live ids documented in the 2026-09-29 Go endpoint table)
  * and every trusted id owns
  * an explicit wire fact from the official endpoint table
- * (https://opencode.ai/docs/go/#endpoints):
+ * (https://opencode.ai/v2/docs/console/go#endpoints):
  *
  * - Qwen 3.5/3.6/3.7/3.8 and MiniMax M2.5/M2.7/M3 -> Anthropic Messages (hard pin, types.ts)
- * - GPT-5.6 Luna and Grok 4.5                      -> OpenAI Responses (registry wire default)
+ * - GPT Luna, Grok, and Muse Spark contributor rows -> OpenAI Responses (registry wire default)
  * - the remaining known-compatible rows            -> OpenAI Chat Completions (wire default)
  *
  * The trust policy is registry-only and canonical-host-only: a same-named provider pointed at
@@ -41,24 +40,41 @@ const CANONICAL_MODELS_URL = "https://opencode.ai/zen/go/v1/models";
 const TRUSTED_MODEL_IDS = [
   "minimax-m3", "minimax-m2.7", "minimax-m2.5",
   "kimi-k3", "kimi-k2.7-code", "kimi-k2.6", "kimi-k2.5",
-  "glm-5.3-flash", "glm-5.2", "glm-5.1", "glm-5",
+  "glm-5.3-flash", "glm-5.3", "glm-5.2", "glm-5.1", "glm-5",
   "deepseek-v4-pro", "deepseek-v4-flash", "deepseek-v4.1-flash",
+  "deepseek-v4-flash-vision-exp",
   "qwen3.8-max", "qwen3.8-flash", "qwen3.7-max", "qwen3.7-plus", "qwen3.6-plus", "qwen3.5-plus",
   "mimo-v2-pro", "mimo-v2-omni", "mimo-v2.5-pro", "mimo-v2.5",
-  "hy3", "hy3-preview",
-  "gpt-5.6-luna", "grok-4.5",
+  "mimo-v2.6-pro", "mimo-v2.6-flash",
+  "hy3", "hy3-preview", "hy4-preview",
+  "longcat-2.0", "longcat-2.5-preview-free", "space-bunny-free",
+  "gpt-5.6-luna", "gpt-6-luna", "grok-4.5", "grok-4.6", "grok-4.7",
+  "muse-spark-1.2-contributor", "muse-spark-1.3-contributor",
 ];
+const NEW_DOCUMENTED_MODEL_IDS = [
+  "longcat-2.0", "glm-5.3", "deepseek-v4-flash-vision-exp",
+  "mimo-v2.6-pro", "mimo-v2.6-flash", "space-bunny-free", "longcat-2.5-preview-free",
+  "hy4-preview", "grok-4.7", "grok-4.6", "muse-spark-1.3-contributor",
+  "muse-spark-1.2-contributor", "gpt-6-luna",
+];
+const UNDOCUMENTED_LIVE_IDS = ["deepseek-flash", "omen-alpha"];
 const ANTHROPIC_WIRE_MODEL_IDS = [
   "minimax-m2.5", "minimax-m2.7", "minimax-m3",
   "qwen3.5-plus", "qwen3.6-plus", "qwen3.7-max", "qwen3.7-plus", "qwen3.8-max", "qwen3.8-flash",
 ];
-const RESPONSES_WIRE_MODEL_IDS = ["gpt-5.6-luna", "grok-4.5"];
+const RESPONSES_WIRE_MODEL_IDS = [
+  "gpt-5.6-luna", "gpt-6-luna", "grok-4.5", "grok-4.6", "grok-4.7",
+  "muse-spark-1.2-contributor", "muse-spark-1.3-contributor",
+];
 const CHAT_WIRE_MODEL_IDS = TRUSTED_MODEL_IDS.filter(id =>
   !ANTHROPIC_WIRE_MODEL_IDS.includes(id) && !RESPONSES_WIRE_MODEL_IDS.includes(id));
 /** Advertised but not Go-plan callable (issue #82): trusted id, compatibility-excluded from pickers. */
 const COMPATIBILITY_EXCLUDED_IDS = ["hy3-preview"];
-/** Trusted ids with no generated jawcode bundle row yet; the registry owns their metadata. */
-const REGISTRY_OWNED_METADATA_IDS = ["deepseek-v4.1-flash", "glm-5.3-flash", "gpt-5.6-luna", "hy3-preview", "qwen3.8-max", "qwen3.8-flash"];
+/** Trusted ids with no generated jawcode bundle row yet; only verified metadata is backfilled. */
+const NO_GENERATED_BUNDLE_IDS = [
+  "deepseek-v4.1-flash", "glm-5.3-flash", "gpt-5.6-luna", "hy3-preview", "qwen3.8-max", "qwen3.8-flash",
+  ...NEW_DOCUMENTED_MODEL_IDS,
+];
 
 const originalFetch = globalThis.fetch;
 
@@ -99,7 +115,7 @@ function liveCatalogPayload(extraIds: string[] = []): string {
 }
 
 describe("OpenCode Go trusted catalog", () => {
-  test("pins the canonical destination and the exact last-good 28 model ids", () => {
+  test("pins the canonical destination and the exact last-good 41 model ids", () => {
     const entry = registryEntry();
     expect(entry).toMatchObject({
       id: "opencode-go",
@@ -109,24 +125,33 @@ describe("OpenCode Go trusted catalog", () => {
       liveModels: true,
       preserveCustomDestination: true,
     });
-    expect(entry.models).toHaveLength(28);
+    expect(entry.models).toHaveLength(41);
     expect([...(entry.models ?? [])].sort()).toEqual([...TRUSTED_MODEL_IDS].sort());
-    expect(new Set(entry.models).size).toBe(28);
+    expect(new Set(entry.models).size).toBe(41);
     expect(entry.models).toContain(entry.defaultModel);
+    expect(entry.note).toContain("Muse Spark 1.2 and 1.3 Contributor");
+    expect(entry.note).toContain("prompts and completions to train future Meta models");
+    expect(entry.note).toContain("https://dev.meta.ai/docs/pricing-rate-limits#contributor-tier");
+    for (const id of NEW_DOCUMENTED_MODEL_IDS) expect(entry.models).toContain(id);
+    for (const id of UNDOCUMENTED_LIVE_IDS) expect(entry.models).not.toContain(id);
   });
 
   test("the live-discovery trust filter admits exactly the pinned ids", () => {
     const filter = registryEntry().modelDiscovery?.filter;
-    expect(filter).toEqual({
-      anyOf: [{ path: ["id"], equalsAny: expect.arrayContaining(TRUSTED_MODEL_IDS) }],
+    const predicates = filter?.anyOf ?? [];
+    expect(predicates).toHaveLength(2);
+    const ids = predicates.flatMap(predicate => {
+      expect(predicate).toHaveProperty("path", ["id"]);
+      const equalsAny = (predicate as { equalsAny: readonly string[] }).equalsAny;
+      expect(equalsAny.length).toBeLessThanOrEqual(32);
+      return [...equalsAny];
     });
-    const equalsAny = (filter?.anyOf?.[0] as { equalsAny: readonly string[] }).equalsAny;
-    expect([...equalsAny].sort()).toEqual([...TRUSTED_MODEL_IDS].sort());
+    expect(ids.sort()).toEqual([...TRUSTED_MODEL_IDS].sort());
   });
 
   test("config seeds and key-login derivations never persist the trust policy", () => {
     const seed = providerConfigSeed(registryEntry());
-    expect(seed.models).toHaveLength(28);
+    expect(seed.models).toHaveLength(41);
     expect(seed.liveModels).toBe(true);
     for (const forbidden of ["modelDiscovery", "modelWireDefaults", "preserveCustomDestination"]) {
       expect(seed).not.toHaveProperty(forbidden);
@@ -138,8 +163,8 @@ describe("OpenCode Go trusted catalog", () => {
 describe("OpenCode Go per-model transport registry", () => {
   test("every trusted id owns exactly one explicit wire fact", () => {
     expect(ANTHROPIC_WIRE_MODEL_IDS).toHaveLength(9);
-    expect(RESPONSES_WIRE_MODEL_IDS).toHaveLength(2);
-    expect(CHAT_WIRE_MODEL_IDS).toHaveLength(17);
+    expect(RESPONSES_WIRE_MODEL_IDS).toHaveLength(7);
+    expect(CHAT_WIRE_MODEL_IDS).toHaveLength(25);
     expect([
       ...ANTHROPIC_WIRE_MODEL_IDS,
       ...RESPONSES_WIRE_MODEL_IDS,
@@ -209,7 +234,7 @@ describe("OpenCode Go live-catalog quarantine", () => {
     let requestedUrl: string | undefined;
     globalThis.fetch = (async (input: RequestInfo | URL) => {
       requestedUrl = String(input);
-      return new Response(liveCatalogPayload(["future-live-model"]), {
+      return new Response(liveCatalogPayload(["future-live-model", ...UNDOCUMENTED_LIVE_IDS]), {
         status: 200,
         headers: { "content-type": "application/json" },
       });
@@ -223,6 +248,7 @@ describe("OpenCode Go live-catalog quarantine", () => {
       TRUSTED_MODEL_IDS.filter(id => !COMPATIBILITY_EXCLUDED_IDS.includes(id)).sort(),
     );
     expect(ids).not.toContain("future-live-model");
+    for (const id of UNDOCUMENTED_LIVE_IDS) expect(ids).not.toContain(id);
     expect(ids).not.toContain("hy3-preview");
 
     // Registry-owned metadata reaches rows the generated bundle does not cover yet.
@@ -242,6 +268,17 @@ describe("OpenCode Go live-catalog quarantine", () => {
       contextWindow: 1_050_000,
       inputModalities: ["text", "image"],
     });
+    expect(models.find(row => row.id === "gpt-6-luna")).toMatchObject({
+      contextWindow: 1_050_000,
+      inputModalities: ["text", "image"],
+      reasoningEfforts: ["low", "medium", "high", "xhigh", "max"],
+    });
+    for (const id of ["grok-4.6", "grok-4.7"]) {
+      expect(models.find(row => row.id === id)).toMatchObject({
+        contextWindow: 500_000,
+        reasoningEfforts: ["low", "medium", "high", "xhigh"],
+      });
+    }
     expect(models.find(row => row.id === "deepseek-v4.1-flash")).toMatchObject({
       contextWindow: 1_000_000,
       inputModalities: ["text", "image"],
@@ -270,7 +307,7 @@ describe("OpenCode Go live-catalog quarantine", () => {
     // If a regeneration adds or drops bundle rows, this exact gap flips and forces a conscious
     // review here instead of silently changing catalog metadata.
     expect(TRUSTED_MODEL_IDS.filter(id => !bundleIds.includes(id)).sort())
-      .toEqual([...REGISTRY_OWNED_METADATA_IDS].sort());
+      .toEqual([...NO_GENERATED_BUNDLE_IDS].sort());
     for (const id of COMPATIBILITY_EXCLUDED_IDS) expect(bundleIds).not.toContain(id);
   });
 });
diff --git a/tests/opencode-go-quota.test.ts b/tests/opencode-go-quota.test.ts
index d7ccadb67c5..af1c8600551 100644
--- a/tests/opencode-go-quota.test.ts
+++ b/tests/opencode-go-quota.test.ts
@@ -22,9 +22,10 @@ function config(baseUrl = "https://opencode.ai/zen/go/v1"): CodexCommanderConfig
   } as CodexCommanderConfig;
 }
 
-describe("OpenCode Go published caps and local observations", () => {
+describe("OpenCode Go live quota and local observations", () => {
   let root: string;
   let previousHome: string | undefined;
+  let originalFetch: typeof fetch;
 
   beforeEach(() => {
     root = mkdtempSync(join(tmpdir(), "ccx-go-quota-"));
@@ -32,31 +33,126 @@ describe("OpenCode Go published caps and local observations", () => {
     process.env.CODEXCOMMANDER_HOME = root;
     clearProviderQuotaCache();
     resetUsageReadCacheForTests();
+    originalFetch = globalThis.fetch;
+    globalThis.fetch = (async () => new Response(null, { status: 503 })) as typeof fetch;
   });
 
   afterEach(() => {
     clearProviderQuotaCache();
     resetUsageReadCacheForTests();
+    globalThis.fetch = originalFetch;
     if (previousHome === undefined) delete process.env.CODEXCOMMANDER_HOME;
     else process.env.CODEXCOMMANDER_HOME = previousHome;
     rmSync(root, { recursive: true, force: true });
   });
 
-  test("shows official reference caps without inventing remaining percentages", async () => {
+  test("shows local observations without inventing caps or remaining percentages", async () => {
     const response = await fetchProviderQuotaReports(config(), true);
     const report = response.reports.find(row => row.provider === "opencode-go");
     expect(report).toBeDefined();
     expect(report!.quota.fiveHourPercent).toBeUndefined();
     expect(report!.quota.weeklyPercent).toBeUndefined();
     expect(report!.quota.monthlyPercent).toBeUndefined();
-    expect(report!.quota.referenceWindows?.map(row => [row.id, row.publishedLimitUsd])).toEqual([
-      ["five_hour", 12],
-      ["weekly", 30],
-      ["monthly", 60],
-    ]);
+    expect(report!.source).toBe("opencode-go:local-observations");
+    expect(report!.quota.referenceWindows?.map(row => row.id)).toEqual(["five_hour", "weekly", "monthly"]);
+    expect(report!.quota.referenceWindows?.every(row => row.publishedLimitUsd === undefined)).toBe(true);
     expect(report!.quota.referenceWindows?.every(row => row.coverage === "none")).toBe(true);
   });
 
+  test("shows live account percentages and reset times from the Go usage endpoint", async () => {
+    let requestedUrl = "";
+    let authorization = "";
+    let redirect: RequestRedirect | undefined;
+    globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => {
+      requestedUrl = String(input);
+      authorization = new Headers(init?.headers).get("Authorization") ?? "";
+      redirect = init?.redirect;
+      return Response.json({ usage: {
+        rolling: { status: "ok", percent: 12.5, resetsAt: "2026-09-29T18:00:00.000Z" },
+        weekly: { status: "ok", percent: 40, resetsAt: "2026-10-05T00:00:00.000Z" },
+        monthly: { status: "ok", percent: 65, resetsAt: "2026-10-20T00:00:00.000Z" },
+      } });
+    }) as typeof fetch;
+    const response = await fetchProviderQuotaReports(config(), true);
+    const report = response.reports.find(row => row.provider === "opencode-go")!;
+    expect(requestedUrl).toBe("https://opencode.ai/zen/go/v1/usage");
+    expect(authorization).toBe("Bearer go-key");
+    expect(redirect).toBe("error");
+    expect(report.source).toBe("opencode-go:usage-api");
+    expect(report.quota.fiveHourPercent).toBe(12.5);
+    expect(report.quota.weeklyPercent).toBe(40);
+    expect(report.quota.monthlyPercent).toBe(65);
+    expect(report.quota.fiveHourResetAt).toBe(Date.parse("2026-09-29T18:00:00.000Z"));
+    expect(report.quota.weeklyResetAt).toBe(Date.parse("2026-10-05T00:00:00.000Z"));
+    expect(report.quota.monthlyResetAt).toBe(Date.parse("2026-10-20T00:00:00.000Z"));
+    expect(report.quota.referenceWindows).toBeUndefined();
+  });
+
+  test("rejects malformed live percentages and uses marked local observations", async () => {
+    globalThis.fetch = (async () => Response.json({ usage: {
+      rolling: { percent: 150 }, weekly: { percent: 0 }, monthly: { percent: 0 },
+    } })) as typeof fetch;
+    const report = (await fetchProviderQuotaReports(config(), true)).reports[0]!;
+    expect(report.source).toBe("opencode-go:local-observations");
+    expect(report.quota.fiveHourPercent).toBeUndefined();
+  });
+
+  test("does not present an unknown upstream status as authoritative usage", async () => {
+    globalThis.fetch = (async () => Response.json({ usage: {
+      rolling: { status: "unknown", percent: 10 },
+      weekly: { status: "ok", percent: 20 },
+      monthly: { status: "ok", percent: 30 },
+    } })) as typeof fetch;
+    const report = (await fetchProviderQuotaReports(config(), true)).reports[0]!;
+    expect(report.source).toBe("opencode-go:local-observations");
+  });
+
+  test.each([401, 403])("falls back to local observations after HTTP %i without authoritative percentages", async status => {
+    let fetchCalls = 0;
+    globalThis.fetch = (async () => {
+      fetchCalls += 1;
+      return new Response(null, { status });
+    }) as typeof fetch;
+    const report = (await fetchProviderQuotaReports(config(), true)).reports[0]!;
+    expect(fetchCalls).toBe(1);
+    expect(report.source).toBe("opencode-go:local-observations");
+    expect(report.quota.fiveHourPercent).toBeUndefined();
+    expect(report.quota.weeklyPercent).toBeUndefined();
+    expect(report.quota.monthlyPercent).toBeUndefined();
+    expect(report.quota.referenceWindows?.every(row => row.publishedLimitUsd === undefined)).toBe(true);
+  });
+
+  test.each([
+    ["invalid JSON", () => new Response("{invalid", { headers: { "Content-Type": "application/json" } })],
+    ["array root", () => Response.json([])],
+    ["missing usage", () => Response.json({})],
+    ["incomplete windows", () => Response.json({ usage: { rolling: { status: "ok", percent: 10 } } })],
+  ] as const)("falls back to local observations for a 2xx response containing %s", async (_label, response) => {
+    globalThis.fetch = (async () => response()) as typeof fetch;
+    const report = (await fetchProviderQuotaReports(config(), true)).reports[0]!;
+    expect(report.source).toBe("opencode-go:local-observations");
+    expect(report.quota.fiveHourPercent).toBeUndefined();
+    expect(report.quota.weeklyPercent).toBeUndefined();
+    expect(report.quota.monthlyPercent).toBeUndefined();
+    expect(report.quota.referenceWindows?.map(row => row.id)).toEqual(["five_hour", "weekly", "monthly"]);
+  });
+
+  test("OAuth mode never sends a configured key to the Go usage endpoint", async () => {
+    const oauthConfig = config();
+    oauthConfig.providers["opencode-go"]!.authMode = "oauth";
+    let fetchCalls = 0;
+    globalThis.fetch = (async () => {
+      fetchCalls += 1;
+      return new Response(null, { status: 503 });
+    }) as typeof fetch;
+
+    const report = (await fetchProviderQuotaReports(oauthConfig, true)).reports[0]!;
+
+    expect(fetchCalls).toBe(0);
+    expect(report.source).toBe("opencode-go:local-observations");
+    expect(report.quota.fiveHourPercent).toBeUndefined();
+  });
+
   test("labels locally measured spend as partial when any model is unpriced", async () => {
     const now = Date.now();
     appendUsageEntry({
@@ -102,7 +198,7 @@ describe("OpenCode Go published caps and local observations", () => {
     expect(fiveHour.coverage).toBe("partial");
   });
 
-  test("degrades windows whose retained usage history starts inside the cap period", () => {
+  test("degrades windows whose retained usage history starts inside the period", () => {
     const now = Date.now();
     const recent: Parameters<typeof openCodeGoReferenceWindowsForTest>[0] = [{
       requestId: "recent-only",
@@ -164,8 +260,20 @@ describe("OpenCode Go published caps and local observations", () => {
     expect(report.quota.observedLimitEvent).toBeUndefined();
   });
 
-  test("never attaches Go subscription facts to a lookalike destination", async () => {
-    const response = await fetchProviderQuotaReports(config("https://evil.example/zen/go/v1"), true);
+  test.each([
+    "https://evil.example/zen/go/v1",
+    "https://opencode.ai.evil.example/zen/go/v1",
+    "https://opencode.ai/custom/v1",
+    "https://opencode.ai:444/zen/go/v1",
+    "http://opencode.ai/zen/go/v1",
+  ])("never sends a configured key or attaches Go subscription facts for custom destination %s", async baseUrl => {
+    let fetchCalls = 0;
+    globalThis.fetch = (async () => {
+      fetchCalls += 1;
+      return new Response(null, { status: 503 });
+    }) as typeof fetch;
+    const response = await fetchProviderQuotaReports(config(baseUrl), true);
+    expect(fetchCalls).toBe(0);
     expect(response.reports.some(row => row.provider === "opencode-go")).toBe(false);
   });
 });
diff --git a/tests/provider-model-cache.test.ts b/tests/provider-model-cache.test.ts
new file mode 100644
index 00000000000..10a53f024c3
--- /dev/null
+++ b/tests/provider-model-cache.test.ts
@@ -0,0 +1,93 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import {
+  clearModelCache,
+  evictOldestModelCacheForBudget,
+  getFreshCached,
+  getProviderDiscoveryStatus,
+  getProviderLiveModelCount,
+  getStaleCached,
+  invalidateModelCacheFreshness,
+  isModelsFetchCoolingDown,
+  markModelsFetchFailure,
+  markProviderDiscoveryFailed,
+  markProviderDiscoveryOk,
+  modelCacheRetainedStoreSnapshot,
+  setCached,
+} from "../src/codex/model-cache";
+
+beforeEach(() => clearModelCache());
+afterEach(() => clearModelCache());
+
+describe("provider model cache explicit refresh", () => {
+  test("invalidates only the requested freshness and cooldown while preserving fallback provenance", () => {
+    const models = [{ provider: "first", id: "vendor/model-🙂" }];
+    setCached("first", models, 10);
+    setCached("second", [{ provider: "second", id: "other" }], 20);
+    markProviderDiscoveryOk("first", 1);
+    markProviderDiscoveryFailed("first", { reason: "network" });
+    markModelsFetchFailure("first", 25);
+    markModelsFetchFailure("second", 25);
+    const retainedBefore = modelCacheRetainedStoreSnapshot();
+
+    invalidateModelCacheFreshness("first");
+
+    expect(getFreshCached("first", 100, 30)).toBeNull();
+    expect(getStaleCached("first")).toBe(models);
+    expect(getProviderLiveModelCount("first")).toBe(1);
+    expect(getProviderDiscoveryStatus("first")).toEqual({ status: "failed", reason: "network" });
+    expect(isModelsFetchCoolingDown("first", 100, 30)).toBe(false);
+    expect(getFreshCached("second", 100, 30)).not.toBeNull();
+    expect(isModelsFetchCoolingDown("second", 100, 30)).toBe(true);
+    expect(modelCacheRetainedStoreSnapshot()).toEqual(retainedBefore);
+
+    setCached("first", models, 40);
+    expect(getFreshCached("first", 100, 50)).toBe(models);
+  });
+
+  test("global invalidation preserves byte accounting and original oldest eviction order", () => {
+    // Insert the newer entry first to catch accidental Map-order eviction after invalidation.
+    const newer = [{ provider: "newer", id: "new-model" }];
+    const older = [{ provider: "older", id: "old-model-🙂" }];
+    setCached("newer", newer, 20);
+    setCached("older", older, 10);
+    markProviderDiscoveryOk("older", 1);
+    markProviderDiscoveryOk("newer", 1);
+    markModelsFetchFailure("older", 25);
+    markModelsFetchFailure("uncached", 25);
+    const before = modelCacheRetainedStoreSnapshot();
+    const olderBytes = new TextEncoder().encode("older").byteLength
+      + new TextEncoder().encode(JSON.stringify(older)).byteLength;
+
+    invalidateModelCacheFreshness();
+
+    expect(getFreshCached("older", 100, 30)).toBeNull();
+    expect(getFreshCached("newer", 100, 30)).toBeNull();
+    expect(getStaleCached("older")).toBe(older);
+    expect(getStaleCached("newer")).toBe(newer);
+    expect(getProviderDiscoveryStatus("older")).toEqual({ status: "ok" });
+    expect(getProviderLiveModelCount("older")).toBe(1);
+    expect(getProviderLiveModelCount("newer")).toBe(1);
+    expect(isModelsFetchCoolingDown("older", 100, 30)).toBe(false);
+    expect(isModelsFetchCoolingDown("uncached", 100, 30)).toBe(false);
+    expect(modelCacheRetainedStoreSnapshot()).toEqual(before);
+    expect(evictOldestModelCacheForBudget()).toBe(olderBytes);
+    expect(getStaleCached("older")).toBeNull();
+    expect(getStaleCached("newer")).toBe(newer);
+    expect(modelCacheRetainedStoreSnapshot()).toMatchObject({ count: 1, bytes: before.bytes - olderBytes, oldestAt: 20 });
+  });
+
+  test("actual cache removal still clears rows, provenance, and failure cooldown", () => {
+    setCached("removed", [{ provider: "removed", id: "model" }], 10);
+    markProviderDiscoveryOk("removed", 1);
+    markModelsFetchFailure("removed", 25);
+    invalidateModelCacheFreshness("removed");
+
+    clearModelCache("removed");
+
+    expect(getStaleCached("removed")).toBeNull();
+    expect(getProviderLiveModelCount("removed")).toBeUndefined();
+    expect(getProviderDiscoveryStatus("removed")).toBeUndefined();
+    expect(isModelsFetchCoolingDown("removed", 100, 30)).toBe(false);
+    expect(modelCacheRetainedStoreSnapshot()).toMatchObject({ count: 0, bytes: 0, oldestAt: null });
+  });
+});
diff --git a/tests/reasoning-effort.test.ts b/tests/reasoning-effort.test.ts
index 3afc15c444e..0abe9f01569 100644
--- a/tests/reasoning-effort.test.ts
+++ b/tests/reasoning-effort.test.ts
@@ -728,6 +728,18 @@ describe("ultra reasoning effort (upstream codex-rs parity)", () => {
     expect(mapReasoningEffort(route.provider, "grok-build-0.1", "max")).toBeUndefined();
   });
 
+  test("OpenCode Go Grok 4.7 clamps max to its documented xhigh ceiling", () => {
+    const config = {
+      defaultProvider: "opencode-go",
+      providers: {
+        "opencode-go": { adapter: "openai-chat", baseUrl: "https://opencode.ai/zen/go/v1", authMode: "key" },
+      },
+    } as unknown as CodexCommanderConfig;
+    const route = routeModel(config, "opencode-go/grok-4.7");
+    expect(route.provider.modelReasoningEfforts?.["grok-4.7"]).toEqual(["low", "medium", "high", "xhigh"]);
+    expect(mapReasoningEffort(route.provider, "grok-4.7", "max")).toBe("xhigh");
+  });
+
   test("enrichProviderFromRegistry merges new ladder keys into a partially saved map", () => {
     // A config saved when the registry only knew grok-4.5 must pick up the grok-4.6 xhigh
     // tier from the current registry for catalog advertisement, without overwriting the