diff --git a/src/pagination.ts b/src/pagination.ts
index 1db21e1b7..d5bb83e29 100644
--- a/src/pagination.ts
+++ b/src/pagination.ts
@@ -7,7 +7,7 @@ export interface BlueprintsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface BlueprintsCursorIDPageParams {
@@ -24,7 +24,7 @@ export class BlueprintsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -36,7 +36,7 @@ export class BlueprintsCursorIDPage<Item extends { id: string }>
 
     this.blueprints = body.blueprints || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -81,7 +81,7 @@ export interface DevboxesCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface DevboxesCursorIDPageParams {
@@ -98,7 +98,7 @@ export class DevboxesCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -110,7 +110,7 @@ export class DevboxesCursorIDPage<Item extends { id: string }>
 
     this.devboxes = body.devboxes || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -155,7 +155,7 @@ export interface RepositoriesCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface RepositoriesCursorIDPageParams {
@@ -172,7 +172,7 @@ export class RepositoriesCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -184,7 +184,7 @@ export class RepositoriesCursorIDPage<Item extends { id: string }>
 
     this.repositories = body.repositories || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -229,7 +229,7 @@ export interface DiskSnapshotsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface DiskSnapshotsCursorIDPageParams {
@@ -246,7 +246,7 @@ export class DiskSnapshotsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -258,7 +258,7 @@ export class DiskSnapshotsCursorIDPage<Item extends { id: string }>
 
     this.snapshots = body.snapshots || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -303,7 +303,7 @@ export interface BenchmarksCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface BenchmarksCursorIDPageParams {
@@ -320,7 +320,7 @@ export class BenchmarksCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -332,7 +332,7 @@ export class BenchmarksCursorIDPage<Item extends { id: string }>
 
     this.benchmarks = body.benchmarks || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -377,7 +377,7 @@ export interface AgentsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface AgentsCursorIDPageParams {
@@ -394,7 +394,7 @@ export class AgentsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -406,7 +406,7 @@ export class AgentsCursorIDPage<Item extends { id: string }>
 
     this.agents = body.agents || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -451,7 +451,7 @@ export interface BenchmarkRunsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface BenchmarkRunsCursorIDPageParams {
@@ -468,7 +468,7 @@ export class BenchmarkRunsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -480,7 +480,7 @@ export class BenchmarkRunsCursorIDPage<Item extends { id: string }>
 
     this.runs = body.runs || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -525,7 +525,7 @@ export interface ScenariosCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface ScenariosCursorIDPageParams {
@@ -542,7 +542,7 @@ export class ScenariosCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -554,7 +554,7 @@ export class ScenariosCursorIDPage<Item extends { id: string }>
 
     this.scenarios = body.scenarios || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -599,7 +599,7 @@ export interface ScenarioRunsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface ScenarioRunsCursorIDPageParams {
@@ -616,7 +616,7 @@ export class ScenarioRunsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -628,7 +628,7 @@ export class ScenarioRunsCursorIDPage<Item extends { id: string }>
 
     this.runs = body.runs || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -673,7 +673,7 @@ export interface ScenarioScorersCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface ScenarioScorersCursorIDPageParams {
@@ -690,7 +690,7 @@ export class ScenarioScorersCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -702,7 +702,7 @@ export class ScenarioScorersCursorIDPage<Item extends { id: string }>
 
     this.scorers = body.scorers || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -747,7 +747,7 @@ export interface ObjectsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface ObjectsCursorIDPageParams {
@@ -764,7 +764,7 @@ export class ObjectsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -776,7 +776,7 @@ export class ObjectsCursorIDPage<Item extends { id: string }>
 
     this.objects = body.objects || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -821,7 +821,7 @@ export interface NetworkPoliciesCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface NetworkPoliciesCursorIDPageParams {
@@ -838,7 +838,7 @@ export class NetworkPoliciesCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -850,7 +850,7 @@ export class NetworkPoliciesCursorIDPage<Item extends { id: string }>
 
     this.network_policies = body.network_policies || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -895,7 +895,7 @@ export interface GatewayConfigsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface GatewayConfigsCursorIDPageParams {
@@ -912,7 +912,7 @@ export class GatewayConfigsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -924,7 +924,7 @@ export class GatewayConfigsCursorIDPage<Item extends { id: string }>
 
     this.gateway_configs = body.gateway_configs || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
@@ -969,7 +969,7 @@ export interface McpConfigsCursorIDPageResponse<Item> {
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface McpConfigsCursorIDPageParams {
@@ -986,7 +986,7 @@ export class McpConfigsCursorIDPage<Item extends { id: string }>
 
   has_more: boolean;
 
-  total_count: number;
+  total_count: number | null;
 
   constructor(
     client: APIClient,
@@ -998,7 +998,7 @@ export class McpConfigsCursorIDPage<Item extends { id: string }>
 
     this.mcp_configs = body.mcp_configs || [];
     this.has_more = body.has_more || false;
-    this.total_count = body.total_count || 0;
+    this.total_count = body.total_count ?? null;
   }
 
   getPaginatedItems(): Item[] {
diff --git a/src/resources/agents.ts b/src/resources/agents.ts
index 0f7931a70..555701a54 100644
--- a/src/resources/agents.ts
+++ b/src/resources/agents.ts
@@ -78,14 +78,14 @@ export interface AgentListView {
   has_more: boolean;
 
   /**
-   * The count of remaining Agents.
+   * The count of remaining Agents. Deprecated: always returns null.
    */
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
-   * The total count of Agents.
+   * The total count of Agents. Deprecated: always returns null.
    */
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/benchmark-jobs.ts b/src/resources/benchmark-jobs.ts
index e58a0992b..44473cf38 100644
--- a/src/resources/benchmark-jobs.ts
+++ b/src/resources/benchmark-jobs.ts
@@ -308,9 +308,9 @@ export interface BenchmarkJobListView {
    */
   jobs: Array<BenchmarkJobView>;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/benchmark-runs.ts b/src/resources/benchmark-runs.ts
index 7d51c5195..35f317d83 100644
--- a/src/resources/benchmark-runs.ts
+++ b/src/resources/benchmark-runs.ts
@@ -85,14 +85,14 @@ export class BenchmarkRunViewsBenchmarkRunsCursorIDPage extends BenchmarkRunsCur
 export interface BenchmarkRunListView {
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
    * List of BenchmarkRuns matching filter.
    */
   runs: Array<BenchmarkRunView>;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/benchmarks.ts b/src/resources/benchmarks.ts
index c0d264c9d..af0787051 100644
--- a/src/resources/benchmarks.ts
+++ b/src/resources/benchmarks.ts
@@ -299,14 +299,14 @@ export interface BenchmarkView {
 export interface ScenarioDefinitionListView {
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
    * List of Scenarios matching filter.
    */
   scenarios: Array<ScenariosAPI.ScenarioView>;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface StartBenchmarkRunParameters {
diff --git a/src/resources/blueprints.ts b/src/resources/blueprints.ts
index 61cc4e5de..9ca01c158 100644
--- a/src/resources/blueprints.ts
+++ b/src/resources/blueprints.ts
@@ -456,9 +456,9 @@ export interface BlueprintListView {
 
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface BlueprintPreviewView {
diff --git a/src/resources/devboxes/devboxes.ts b/src/resources/devboxes/devboxes.ts
index f1ff6f9b4..a436b9e4f 100644
--- a/src/resources/devboxes/devboxes.ts
+++ b/src/resources/devboxes/devboxes.ts
@@ -674,9 +674,9 @@ export interface DevboxListView {
 
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 export interface DevboxResourceUsageView {
@@ -762,14 +762,14 @@ export interface DevboxSendStdInResult {
 export interface DevboxSnapshotListView {
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
    * List of snapshots matching filter.
    */
   snapshots: Array<DevboxSnapshotView>;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/objects.ts b/src/resources/objects.ts
index 63bbcfd37..cd732cc43 100644
--- a/src/resources/objects.ts
+++ b/src/resources/objects.ts
@@ -159,14 +159,14 @@ export interface ObjectListView {
   objects: Array<ObjectView>;
 
   /**
-   * Number of Objects remaining after this page.
+   * Number of Objects remaining after this page. Deprecated: always returns null.
    */
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
-   * Total number of Objects across all pages.
+   * Total number of Objects across all pages. Deprecated: always returns null.
    */
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/repositories.ts b/src/resources/repositories.ts
index 57adcc05b..b15b0182d 100644
--- a/src/resources/repositories.ts
+++ b/src/resources/repositories.ts
@@ -128,14 +128,14 @@ export class RepositoryConnectionViewsRepositoriesCursorIDPage extends Repositor
 export interface RepositoryConnectionListView {
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
    * List of repositories matching filter.
    */
   repositories: Array<RepositoryConnectionView>;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/scenarios/scenarios.ts b/src/resources/scenarios/scenarios.ts
index 142543f38..ab8942327 100644
--- a/src/resources/scenarios/scenarios.ts
+++ b/src/resources/scenarios/scenarios.ts
@@ -251,14 +251,14 @@ export interface ScenarioEnvironment {
 export interface ScenarioRunListView {
   has_more: boolean;
 
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
    * List of ScenarioRuns matching filter.
    */
   runs: Array<ScenarioRunView>;
 
-  total_count: number;
+  total_count: number | null;
 }
 
 /**
diff --git a/src/resources/secrets.ts b/src/resources/secrets.ts
index 305b61dd3..cc635566c 100644
--- a/src/resources/secrets.ts
+++ b/src/resources/secrets.ts
@@ -77,9 +77,9 @@ export interface SecretListView {
   has_more: boolean;
 
   /**
-   * Number of Secrets remaining after this page.
+   * Number of Secrets remaining after this page. Deprecated: always returns null.
    */
-  remaining_count: number;
+  remaining_count: number | null;
 
   /**
    * List of Secret objects. Values are omitted for security.
@@ -87,9 +87,9 @@ export interface SecretListView {
   secrets: Array<SecretView>;
 
   /**
-   * Total number of Secrets across all pages.
+   * Total number of Secrets across all pages. Deprecated: always returns null.
    */
-  total_count: number;
+  total_count: number | null;
 }
 
 /**