diff --git a/tools/gemini-cli-bot/metrics/scripts/domain_expertise.ts b/tools/gemini-cli-bot/metrics/scripts/domain_expertise.ts
index e4b72099ee..0a66635f30 100644
--- a/tools/gemini-cli-bot/metrics/scripts/domain_expertise.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/domain_expertise.ts
@@ -35,10 +35,19 @@ try {
   }
   `;
   const output = execSync(
-    `gh api graphql -F owner=${GITHUB_OWNER} -F repo=${GITHUB_REPO} -f query='${query}'`,
-    { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] },
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
+    {
+      encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
+      stdio: ['pipe', 'pipe', 'ignore'],
+    },
   );
-  const data = JSON.parse(output).data.repository;
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const data = response.data.repository;
 
   // 2. Map PR numbers to local commits using git log
   const logOutput = execSync('git log -n 5000 --format="%H|%s"', {
@@ -97,7 +106,7 @@ try {
     const reviewersOnPR = new Map<string, { name?: string }>();
     for (const review of pr.reviews.nodes) {
       if (
-        ['MEMBER', 'OWNER'].includes(review.authorAssociation) &&
+        ['MEMBER', 'OWNER', 'COLLABORATOR'].includes(review.authorAssociation) &&
         review.author?.login
       ) {
         const login = review.author.login.toLowerCase();
diff --git a/tools/gemini-cli-bot/metrics/scripts/latency.ts b/tools/gemini-cli-bot/metrics/scripts/latency.ts
index b96201a51d..aa7704d04e 100644
--- a/tools/gemini-cli-bot/metrics/scripts/latency.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/latency.ts
@@ -31,10 +31,18 @@ try {
   }
   `;
   const output = execSync(
-    `gh api graphql -F owner=${GITHUB_OWNER} -F repo=${GITHUB_REPO} -f query='${query}'`,
-    { encoding: 'utf-8' },
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
+    {
+      encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
+    },
   );
-  const data = JSON.parse(output).data.repository;
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const data = response.data.repository;
 
   const prs = data.pullRequests.nodes.map(
     (p: {
diff --git a/tools/gemini-cli-bot/metrics/scripts/open_issues.ts b/tools/gemini-cli-bot/metrics/scripts/open_issues.ts
index 4996ec7ce4..2a659f2ebd 100644
--- a/tools/gemini-cli-bot/metrics/scripts/open_issues.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/open_issues.ts
@@ -4,17 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { GITHUB_OWNER, GITHUB_REPO } from '../types.js';
 import { execSync } from 'node:child_process';
 
 try {
-  const count = execSync(
-    'gh issue list --state open --limit 1000 --json number --jq length',
+  const query = `
+  query($owner: String!, $repo: String!) {
+    repository(owner: $owner, name: $repo) {
+      issues(states: OPEN) {
+        totalCount
+      }
+    }
+  }
+  `;
+  const output = execSync(
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
     {
       encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
     },
-  ).trim();
+  );
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const count = response.data.repository.issues.totalCount;
   console.log(`open_issues,${count}`);
-} catch {
-  // Fallback if gh fails or no issues found
-  console.log('open_issues,0');
+} catch (err) {
+  process.stderr.write(err instanceof Error ? err.message : String(err));
+  process.exit(1);
 }
diff --git a/tools/gemini-cli-bot/metrics/scripts/open_prs.ts b/tools/gemini-cli-bot/metrics/scripts/open_prs.ts
index 35819ef0f9..f6f2e2f62a 100644
--- a/tools/gemini-cli-bot/metrics/scripts/open_prs.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/open_prs.ts
@@ -4,17 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { GITHUB_OWNER, GITHUB_REPO } from '../types.js';
 import { execSync } from 'node:child_process';
 
 try {
-  const count = execSync(
-    'gh pr list --state open --limit 1000 --json number --jq length',
+  const query = `
+  query($owner: String!, $repo: String!) {
+    repository(owner: $owner, name: $repo) {
+      pullRequests(states: OPEN) {
+        totalCount
+      }
+    }
+  }
+  `;
+  const output = execSync(
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
     {
       encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
     },
-  ).trim();
+  );
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const count = response.data.repository.pullRequests.totalCount;
   console.log(`open_prs,${count}`);
-} catch {
-  // Fallback if gh fails or no PRs found
-  console.log('open_prs,0');
+} catch (err) {
+  process.stderr.write(err instanceof Error ? err.message : String(err));
+  process.exit(1);
 }
diff --git a/tools/gemini-cli-bot/metrics/scripts/review_distribution.ts b/tools/gemini-cli-bot/metrics/scripts/review_distribution.ts
index 05f6b71740..77bbc96a30 100644
--- a/tools/gemini-cli-bot/metrics/scripts/review_distribution.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/review_distribution.ts
@@ -27,10 +27,18 @@ try {
   }
   `;
   const output = execSync(
-    `gh api graphql -F owner=${GITHUB_OWNER} -F repo=${GITHUB_REPO} -f query='${query}'`,
-    { encoding: 'utf-8' },
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
+    {
+      encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
+    },
   );
-  const data = JSON.parse(output).data.repository;
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const data = response.data.repository;
 
   const reviewCounts: Record<string, number> = {};
 
@@ -41,7 +49,7 @@ try {
 
     for (const review of pr.reviews.nodes) {
       if (
-        ['MEMBER', 'OWNER'].includes(review.authorAssociation) &&
+        ['MEMBER', 'OWNER', 'COLLABORATOR'].includes(review.authorAssociation) &&
         review.author?.login
       ) {
         const login = review.author.login.toLowerCase();
diff --git a/tools/gemini-cli-bot/metrics/scripts/throughput.ts b/tools/gemini-cli-bot/metrics/scripts/throughput.ts
index 3a259aaefb..88ea5c24d7 100644
--- a/tools/gemini-cli-bot/metrics/scripts/throughput.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/throughput.ts
@@ -29,10 +29,18 @@ try {
   }
   `;
   const output = execSync(
-    `gh api graphql -F owner=${GITHUB_OWNER} -F repo=${GITHUB_REPO} -f query='${query}'`,
-    { encoding: 'utf-8' },
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
+    {
+      encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
+    },
   );
-  const data = JSON.parse(output).data.repository;
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const data = response.data.repository;
 
   const prs = data.pullRequests.nodes
     .map((p: { authorAssociation: string; mergedAt: string }) => ({
diff --git a/tools/gemini-cli-bot/metrics/scripts/time_to_first_response.ts b/tools/gemini-cli-bot/metrics/scripts/time_to_first_response.ts
index fde2a6346b..9339a6aef9 100644
--- a/tools/gemini-cli-bot/metrics/scripts/time_to_first_response.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/time_to_first_response.ts
@@ -49,10 +49,18 @@ try {
   }
   `;
   const output = execSync(
-    `gh api graphql -F owner=${GITHUB_OWNER} -F repo=${GITHUB_REPO} -f query='${query}'`,
-    { encoding: 'utf-8' },
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
+    {
+      encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
+    },
   );
-  const data = JSON.parse(output).data.repository;
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const data = response.data.repository;
 
   const getFirstResponseTime = (item: {
     createdAt: string;
diff --git a/tools/gemini-cli-bot/metrics/scripts/user_touches.ts b/tools/gemini-cli-bot/metrics/scripts/user_touches.ts
index 192897479b..386911ce8d 100644
--- a/tools/gemini-cli-bot/metrics/scripts/user_touches.ts
+++ b/tools/gemini-cli-bot/metrics/scripts/user_touches.ts
@@ -30,10 +30,18 @@ try {
   }
   `;
   const output = execSync(
-    `gh api graphql -F owner=${GITHUB_OWNER} -F repo=${GITHUB_REPO} -f query='${query}'`,
-    { encoding: 'utf-8' },
+    'gh api graphql -F owner=$OWNER -F repo=$REPO -f query=@-',
+    {
+      encoding: 'utf-8',
+      input: query,
+      env: { ...process.env, OWNER: GITHUB_OWNER, REPO: GITHUB_REPO },
+    },
   );
-  const data = JSON.parse(output).data.repository;
+  const response = JSON.parse(output);
+  if (response.errors) {
+    throw new Error(response.errors.map((e: any) => e.message).join(', '));
+  }
+  const data = response.data.repository;
 
   const prs = data.pullRequests.nodes;
   const issues = data.issues.nodes;