diff --git a/tools/gemini-cli-bot/metrics/scripts/open_issues.ts b/tools/gemini-cli-bot/metrics/scripts/open_issues.ts
index 4996ec7ce4..dd04f3f227 100644
--- a/tools/gemini-cli-bot/metrics/scripts/open_issues.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/open_issues.ts
@@ -5,16 +5,27 @@
  */
 
 import { execSync } from 'node:child_process';
+import { GITHUB_OWNER, GITHUB_REPO } from '../types.js';
 
 try {
   const count = execSync(
-    'gh issue list --state open --limit 1000 --json number --jq length',
+    `gh api "search/issues?q=repo:${GITHUB_OWNER}/${GITHUB_REPO}+is:issue+is:open" --jq .total_count`,
     {
       encoding: 'utf-8',
     },
   ).trim();
   console.log(`open_issues,${count}`);
 } catch {
-  // Fallback if gh fails or no issues found
-  console.log('open_issues,0');
+  // Fallback if search fails
+  try {
+    const count = execSync(
+      `gh issue list -R ${GITHUB_OWNER}/${GITHUB_REPO} --state open --limit 5000 --json number --jq length`,
+      {
+        encoding: 'utf-8',
+      },
+    ).trim();
+    console.log(`open_issues,${count}`);
+  } catch {
+    console.log('open_issues,0');
+  }
 }
diff --git a/tools/gemini-cli-bot/metrics/scripts/open_prs.ts b/tools/gemini-cli-bot/metrics/scripts/open_prs.ts
index 35819ef0f9..0618ce93d4 100644
--- a/tools/gemini-cli-bot/metrics/scripts/open_prs.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/open_prs.ts
@@ -5,16 +5,27 @@
  */
 
 import { execSync } from 'node:child_process';
+import { GITHUB_OWNER, GITHUB_REPO } from '../types.js';
 
 try {
   const count = execSync(
-    'gh pr list --state open --limit 1000 --json number --jq length',
+    `gh api "search/issues?q=repo:${GITHUB_OWNER}/${GITHUB_REPO}+is:pr+is:open" --jq .total_count`,
     {
       encoding: 'utf-8',
     },
   ).trim();
   console.log(`open_prs,${count}`);
 } catch {
-  // Fallback if gh fails or no PRs found
-  console.log('open_prs,0');
+  // Fallback if search fails
+  try {
+    const count = execSync(
+      `gh pr list -R ${GITHUB_OWNER}/${GITHUB_REPO} --state open --limit 5000 --json number --jq length`,
+      {
+        encoding: 'utf-8',
+      },
+    ).trim();
+    console.log(`open_prs,${count}`);
+  } catch {
+    console.log('open_prs,0');
+  }
 }