try different error handling

This reverts commit 06542e382a.

agents/claude.ts

@@ -16,7 +16,6 @@ export class ClaudeAgent implements Agent {
     startTime: 0,
   };
 
-
   constructor(config: AgentConfig) {
     if (!config.apiKey) {
       throw new Error("Claude agent requires an API key");
@@ -50,7 +49,10 @@ export class ClaudeAgent implements Agent {
     try {
       const result = await spawn({
         cmd: "bash",
-        args: ["-c", "curl -fsSL https://claude.ai/install.sh | bash -s 1.0.93"],
+        args: [
+          "-c",
+          "curl -fsSL https://claude.ai/install.sh | bash -s 1.0.93",
+        ],
         env: { ANTHROPIC_API_KEY: this.apiKey },
         timeout: 120000, // 2 minute timeout
         onStdout: () => {},
@@ -58,7 +60,9 @@ export class ClaudeAgent implements Agent {
       });
 
       if (result.exitCode !== 0) {
-        throw new Error(`Installation failed with exit code ${result.exitCode}: ${result.stderr}`);
+        throw new Error(
+          `Installation failed with exit code ${result.exitCode}: ${result.stderr}`
+        );
       }
 
       core.info("Claude Code installed successfully");
@@ -74,7 +78,6 @@ export class ClaudeAgent implements Agent {
     core.info("Running Claude Code...");
 
     try {
-
       const claudePath = `${process.env.HOME}/.local/bin/claude`;
       console.log(boxString(prompt, { title: "Prompt" }));
       const args = [
@@ -82,12 +85,15 @@ export class ClaudeAgent implements Agent {
         "--output-format",
         "stream-json",
         "--verbose",
+        "--debug",
         "--permission-mode",
         "bypassPermissions",
       ];
 
       if (!process.env.GITHUB_INSTALLATION_TOKEN) {
-        throw new Error("GITHUB_INSTALLATION_TOKEN is required for GitHub integration");
+        throw new Error(
+          "GITHUB_INSTALLATION_TOKEN is required for GitHub integration"
+        );
       }
 
       const mcpConfig = createMcpConfig(process.env.GITHUB_INSTALLATION_TOKEN);
@@ -152,9 +158,9 @@ export class ClaudeAgent implements Agent {
     } catch (error: any) {
       try {
         core.endGroup();
-      } catch {
-      }
-      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      } catch {}
+      const errorMessage =
+        error instanceof Error ? error.message : "Unknown error";
       return {
         success: false,
         error: `Failed to execute Claude Code: ${errorMessage}`,
@@ -180,7 +186,12 @@ function processJSONChunk(chunk: string, agent?: ClaudeAgent): void {
               ["model", parsedChunk.model],
               ["cwd", parsedChunk.cwd],
               ["permission_mode", parsedChunk.permissionMode],
-              ["tools", parsedChunk.tools?.length ? `${parsedChunk.tools.length} tools` : "none"],
+              [
+                "tools",
+                parsedChunk.tools?.length
+                  ? `${parsedChunk.tools.length} tools`
+                  : "none",
+              ],
               [
                 "mcp_servers",
                 parsedChunk.mcp_servers?.length
@@ -207,7 +218,9 @@ function processJSONChunk(chunk: string, agent?: ClaudeAgent): void {
           for (const content of parsedChunk.message.content) {
             if (content.type === "text") {
               if (content.text.trim()) {
-                core.info(boxString(content.text.trim(), { title: "Claude Code" }));
+                core.info(
+                  boxString(content.text.trim(), { title: "Claude Code" })
+                );
               }
             } else if (content.type === "tool_use") {
               if (agent) {
@@ -270,7 +283,6 @@ function processJSONChunk(chunk: string, agent?: ClaudeAgent): void {
                   core.info(`   └─ bash_command: ${input.bash_command}`);
                 }
               }
-
             }
           }
         }
@@ -291,10 +303,12 @@ function processJSONChunk(chunk: string, agent?: ClaudeAgent): void {
 
       case "result":
         if (parsedChunk.subtype === "success") {
-
           core.info(
             tableString([
-              ["Cost", `$${parsedChunk.total_cost_usd?.toFixed(4) || "0.0000"}`],
+              [
+                "Cost",
+                `$${parsedChunk.total_cost_usd?.toFixed(4) || "0.0000"}`,
+              ],
               ["Input Tokens", parsedChunk.usage?.input_tokens || 0],
               ["Output Tokens", parsedChunk.usage?.output_tokens || 0],
               ["Duration", `${parsedChunk.duration_ms}ms`],

entry.cjs

@@ -25506,6 +25506,12 @@ var core = __toESM(require_core(), 1);
 // mcp/config.ts
 var actionPath = process.env.GITHUB_ACTION_PATH || process.cwd();
 function createMcpConfig(githubInstallationToken) {
+  const githubRepository = process.env.GITHUB_REPOSITORY;
+  if (!githubRepository) {
+    throw new Error(
+      "GITHUB_REPOSITORY environment variable is required for MCP GitHub integration"
+    );
+  }
   return JSON.stringify(
     {
       mcpServers: {
@@ -25513,7 +25519,9 @@ function createMcpConfig(githubInstallationToken) {
           command: "node",
           args: [`${actionPath}/mcp/server.ts`],
           env: {
-            GITHUB_INSTALLATION_TOKEN: githubInstallationToken
+            GITHUB_INSTALLATION_TOKEN: githubInstallationToken,
+            GITHUB_REPOSITORY: githubRepository,
+            LOG_LEVEL: "debug"
           }
         }
       }
@@ -25726,7 +25734,10 @@ var ClaudeAgent = class {
     try {
       const result = await spawn({
         cmd: "bash",
-        args: ["-c", "curl -fsSL https://claude.ai/install.sh | bash -s 1.0.93"],
+        args: [
+          "-c",
+          "curl -fsSL https://claude.ai/install.sh | bash -s 1.0.93"
+        ],
         env: { ANTHROPIC_API_KEY: this.apiKey },
         timeout: 12e4,
         // 2 minute timeout
@@ -25735,7 +25746,9 @@ var ClaudeAgent = class {
         onStderr: (chunk) => process.stderr.write(chunk)
       });
       if (result.exitCode !== 0) {
-        throw new Error(`Installation failed with exit code ${result.exitCode}: ${result.stderr}`);
+        throw new Error(
+          `Installation failed with exit code ${result.exitCode}: ${result.stderr}`
+        );
       }
       core.info("Claude Code installed successfully");
     } catch (error2) {
@@ -25755,11 +25768,14 @@ var ClaudeAgent = class {
         "--output-format",
         "stream-json",
         "--verbose",
+        "--debug",
         "--permission-mode",
         "bypassPermissions"
       ];
       if (!process.env.GITHUB_INSTALLATION_TOKEN) {
-        throw new Error("GITHUB_INSTALLATION_TOKEN is required for GitHub integration");
+        throw new Error(
+          "GITHUB_INSTALLATION_TOKEN is required for GitHub integration"
+        );
       }
       const mcpConfig = createMcpConfig(process.env.GITHUB_INSTALLATION_TOKEN);
       console.log("\u{1F4CB} MCP Config:", mcpConfig);
@@ -25842,7 +25858,10 @@ function processJSONChunk(chunk, agent) {
               ["model", parsedChunk.model],
               ["cwd", parsedChunk.cwd],
               ["permission_mode", parsedChunk.permissionMode],
-              ["tools", parsedChunk.tools?.length ? `${parsedChunk.tools.length} tools` : "none"],
+              [
+                "tools",
+                parsedChunk.tools?.length ? `${parsedChunk.tools.length} tools` : "none"
+              ],
               [
                 "mcp_servers",
                 parsedChunk.mcp_servers?.length ? `${parsedChunk.mcp_servers.length} servers` : "none"
@@ -25863,7 +25882,9 @@ function processJSONChunk(chunk, agent) {
           for (const content of parsedChunk.message.content) {
             if (content.type === "text") {
               if (content.text.trim()) {
-                core.info(boxString(content.text.trim(), { title: "Claude Code" }));
+                core.info(
+                  boxString(content.text.trim(), { title: "Claude Code" })
+                );
               }
             } else if (content.type === "tool_use") {
               if (agent) {
@@ -25930,7 +25951,10 @@ function processJSONChunk(chunk, agent) {
         if (parsedChunk.subtype === "success") {
           core.info(
             tableString([
-              ["Cost", `$${parsedChunk.total_cost_usd?.toFixed(4) || "0.0000"}`],
+              [
+                "Cost",
+                `$${parsedChunk.total_cost_usd?.toFixed(4) || "0.0000"}`
+              ],
               ["Input Tokens", parsedChunk.usage?.input_tokens || 0],
               ["Output Tokens", parsedChunk.usage?.output_tokens || 0],
               ["Duration", `${parsedChunk.duration_ms}ms`],
@@ -25984,45 +26008,167 @@ async function main(params) {
 }
 
 // utils/github.ts
+var import_node_crypto = require("node:crypto");
 var core3 = __toESM(require_core(), 1);
-async function setupGitHubInstallationToken() {
+
+// utils/repo-context.ts
+function resolveRepoContext() {
+  const githubRepo = process.env.GITHUB_REPOSITORY;
+  if (!githubRepo) {
+    throw new Error("GITHUB_REPOSITORY environment variable is required");
+  }
+  const [owner, name] = githubRepo.split("/");
+  if (!owner || !name) {
+    throw new Error(`Invalid GITHUB_REPOSITORY format: ${githubRepo}. Expected 'owner/repo'`);
+  }
+  return { owner, name };
+}
+
+// utils/github.ts
+function checkExistingToken() {
   const inputToken = core3.getInput("github_installation_token");
   const envToken = process.env.GITHUB_INSTALLATION_TOKEN;
-  const existingToken = inputToken || envToken;
+  return inputToken || envToken || null;
+}
+function isGitHubActionsEnvironment() {
+  return Boolean(process.env.GITHUB_ACTIONS);
+}
+async function acquireTokenViaOIDC() {
+  core3.info("Generating OIDC token...");
+  const oidcToken = await core3.getIDToken("pullfrog-api");
+  core3.info("OIDC token generated successfully");
+  const apiUrl = process.env.API_URL || "https://pullfrog.ai";
+  core3.info("Exchanging OIDC token for installation token...");
+  const tokenResponse = await fetch(`${apiUrl}/api/github/installation-token`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${oidcToken}`,
+      "Content-Type": "application/json"
+    }
+  });
+  if (!tokenResponse.ok) {
+    const errorText = await tokenResponse.text();
+    throw new Error(
+      `Token exchange failed: ${tokenResponse.status} ${tokenResponse.statusText} - ${errorText}`
+    );
+  }
+  const tokenData = await tokenResponse.json();
+  core3.info(`Installation token obtained for ${tokenData.repository || "all repositories"}`);
+  return tokenData.token;
+}
+var base64UrlEncode = (str) => {
+  return Buffer.from(str).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+};
+var generateJWT = (appId, privateKey) => {
+  const now = Math.floor(Date.now() / 1e3);
+  const payload = {
+    iat: now - 60,
+    exp: now + 5 * 60,
+    iss: appId
+  };
+  const header = {
+    alg: "RS256",
+    typ: "JWT"
+  };
+  const encodedHeader = base64UrlEncode(JSON.stringify(header));
+  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
+  const signaturePart = `${encodedHeader}.${encodedPayload}`;
+  const signature = (0, import_node_crypto.createSign)("RSA-SHA256").update(signaturePart).sign(privateKey, "base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  return `${signaturePart}.${signature}`;
+};
+var githubRequest = async (path, options = {}) => {
+  const { method = "GET", headers = {}, body } = options;
+  const url = `https://api.github.com${path}`;
+  const requestHeaders = {
+    Accept: "application/vnd.github.v3+json",
+    "User-Agent": "Pullfrog-Installation-Token-Generator/1.0",
+    ...headers
+  };
+  const response = await fetch(url, {
+    method,
+    headers: requestHeaders,
+    ...body && { body }
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(
+      `GitHub API request failed: ${response.status} ${response.statusText}
+${errorText}`
+    );
+  }
+  return response.json();
+};
+var checkRepositoryAccess = async (token, repoOwner, repoName) => {
+  try {
+    const response = await githubRequest("/installation/repositories", {
+      headers: { Authorization: `token ${token}` }
+    });
+    return response.repositories.some(
+      (repo) => repo.owner.login === repoOwner && repo.name === repoName
+    );
+  } catch {
+    return false;
+  }
+};
+var createInstallationToken = async (jwt, installationId) => {
+  const response = await githubRequest(
+    `/app/installations/${installationId}/access_tokens`,
+    {
+      method: "POST",
+      headers: { Authorization: `Bearer ${jwt}` }
+    }
+  );
+  return response.token;
+};
+var findInstallationId = async (jwt, repoOwner, repoName) => {
+  const installations = await githubRequest("/app/installations", {
+    headers: { Authorization: `Bearer ${jwt}` }
+  });
+  for (const installation of installations) {
+    try {
+      const tempToken = await createInstallationToken(jwt, installation.id);
+      const hasAccess = await checkRepositoryAccess(tempToken, repoOwner, repoName);
+      if (hasAccess) {
+        return installation.id;
+      }
+    } catch {
+    }
+  }
+  throw new Error(
+    `No installation found with access to ${repoOwner}/${repoName}. Ensure the GitHub App is installed on the target repository.`
+  );
+};
+async function acquireTokenViaGitHubApp() {
+  const repoContext = resolveRepoContext();
+  const config = {
+    appId: process.env.GITHUB_APP_ID,
+    privateKey: process.env.GITHUB_PRIVATE_KEY?.replace(/\\n/g, "\n"),
+    repoOwner: repoContext.owner,
+    repoName: repoContext.name
+  };
+  const jwt = generateJWT(config.appId, config.privateKey);
+  const installationId = await findInstallationId(jwt, config.repoOwner, config.repoName);
+  const token = await createInstallationToken(jwt, installationId);
+  return token;
+}
+async function acquireNewToken() {
+  if (isGitHubActionsEnvironment()) {
+    return await acquireTokenViaOIDC();
+  } else {
+    return await acquireTokenViaGitHubApp();
+  }
+}
+async function setupGitHubInstallationToken() {
+  const existingToken = checkExistingToken();
   if (existingToken) {
     core3.setSecret(existingToken);
     core3.info("Using provided GitHub installation token");
     return existingToken;
   }
-  core3.info("Generating OIDC token...");
-  try {
-    const oidcToken = await core3.getIDToken("pullfrog-api");
-    core3.info("OIDC token generated successfully");
-    const apiUrl = process.env.API_URL || "https://pullfrog.ai";
-    core3.info("Exchanging OIDC token for installation token...");
-    const tokenResponse = await fetch(`${apiUrl}/api/github/installation-token`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${oidcToken}`,
-        "Content-Type": "application/json"
-      }
-    });
-    if (!tokenResponse.ok) {
-      const errorText = await tokenResponse.text();
-      throw new Error(
-        `Token exchange failed: ${tokenResponse.status} ${tokenResponse.statusText} - ${errorText}`
-      );
-    }
-    const tokenData = await tokenResponse.json();
-    core3.info(`Installation token obtained for ${tokenData.repository || "all repositories"}`);
-    core3.setSecret(tokenData.token);
-    process.env.GITHUB_INSTALLATION_TOKEN = tokenData.token;
-    return tokenData.token;
-  } catch (error2) {
-    throw new Error(
-      `Failed to setup GitHub installation token: ${error2 instanceof Error ? error2.message : "Unknown error"}`
-    );
-  }
+  const token = await acquireNewToken();
+  core3.setSecret(token);
+  process.env.GITHUB_INSTALLATION_TOKEN = token;
+  return token;
 }
 
 // entry.ts

mcp/config.ts

@@ -4,6 +4,13 @@
 const actionPath = process.env.GITHUB_ACTION_PATH || process.cwd();
 
 export function createMcpConfig(githubInstallationToken: string) {
+  const githubRepository = process.env.GITHUB_REPOSITORY;
+  if (!githubRepository) {
+    throw new Error(
+      "GITHUB_REPOSITORY environment variable is required for MCP GitHub integration"
+    );
+  }
+
   return JSON.stringify(
     {
       mcpServers: {
@@ -12,6 +19,8 @@ export function createMcpConfig(githubInstallationToken: string) {
           args: [`${actionPath}/mcp/server.ts`],
           env: {
             GITHUB_INSTALLATION_TOKEN: githubInstallationToken,
+            GITHUB_REPOSITORY: githubRepository,
+            LOG_LEVEL: "debug",
           },
         },
       },

mcp/server.ts

@@ -6,6 +6,7 @@ import { Octokit } from "@octokit/rest";
 import { type } from "arktype";
 import { z } from "zod";
 import { resolveRepoContext } from "../utils/repo-context.ts";
+import { writeFileSync } from "fs";
 
 const server = new McpServer({
   name: "Minimal GitHub Issue Comment Server",
@@ -31,7 +32,9 @@ server.tool(
 
       const githubInstallationToken = process.env.GITHUB_INSTALLATION_TOKEN;
       if (!githubInstallationToken) {
-        throw new Error("GITHUB_INSTALLATION_TOKEN environment variable is required");
+        throw new Error(
+          "GITHUB_INSTALLATION_TOKEN environment variable is required"
+        );
       }
 
       // Resolve repository context from environment
@@ -66,7 +69,8 @@ server.tool(
         ],
       };
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
       return {
         content: [
           {
@@ -89,4 +93,11 @@ async function runServer() {
   });
 }
 
-runServer().catch(console.error);
+runServer().catch((error) => {
+  // Write error to file for GitHub Actions visibility
+  try {
+    writeFileSync('/tmp/mcp-error.log', `${new Date().toISOString()} MCP Server Error: ${error.message}\nStack: ${error.stack}\n`, { flag: 'a' });
+  } catch {}
+  console.error('MCP Server Error:', error);
+  process.exit(1);
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pullfrog/action",
-  "version": "0.0.14",
+  "version": "0.0.24",
   "type": "module",
   "files": [
     "index.js",

play.ts

@@ -5,7 +5,7 @@ import arg from "arg";
 import { config } from "dotenv";
 import { main } from "./main.ts";
 import { runAct } from "./utils/act.ts";
-import { generateInstallationToken } from "./utils/generate-installation-token.ts";
+import { setupGitHubInstallationToken } from "./utils/github.ts";
 import { setupTestRepo } from "./utils/setup.ts";
 
 config();
@@ -53,10 +53,10 @@ export async function run(
       inputs.github_token = process.env.GITHUB_TOKEN;
     }
 
-    console.log("🔑 Generating GitHub installation token...");
-    const installationToken = await generateInstallationToken();
+    console.log("🔑 Setting up GitHub installation token...");
+    const installationToken = await setupGitHubInstallationToken();
     inputs.github_installation_token = installationToken;
-    console.log("✅ GitHub installation token generated successfully");
+    console.log("✅ GitHub installation token setup successfully");
 
     const envWithToken = {
       ...process.env,

utils/generate-installation-token.ts

@@ -1,177 +0,0 @@
-import { createSign } from "node:crypto";
-import { config } from "dotenv";
-import { resolveRepoContext } from "./repo-context.ts";
-
-config();
-
-interface GitHubAppConfig {
-  appId: string;
-  privateKey: string;
-  repoOwner: string;
-  repoName: string;
-}
-
-interface Installation {
-  id: number;
-  account: {
-    login: string;
-    type: string;
-  };
-}
-
-interface Repository {
-  owner: {
-    login: string;
-  };
-  name: string;
-}
-
-interface InstallationTokenResponse {
-  token: string;
-  expires_at: string;
-}
-
-interface RepositoriesResponse {
-  repositories: Repository[];
-}
-
-const base64UrlEncode = (str: string): string => {
-  return Buffer.from(str)
-    .toString("base64")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=/g, "");
-};
-
-const generateJWT = (appId: string, privateKey: string): string => {
-  const now = Math.floor(Date.now() / 1000);
-  const payload = {
-    iat: now - 60,
-    exp: now + 5 * 60,
-    iss: appId,
-  };
-
-  const header = {
-    alg: "RS256",
-    typ: "JWT",
-  };
-
-  const encodedHeader = base64UrlEncode(JSON.stringify(header));
-  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
-  const signaturePart = `${encodedHeader}.${encodedPayload}`;
-
-  const signature = createSign("RSA-SHA256")
-    .update(signaturePart)
-    .sign(privateKey, "base64")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=/g, "");
-
-  return `${signaturePart}.${signature}`;
-};
-
-const githubRequest = async <T>(
-  path: string,
-  options: {
-    method?: string;
-    headers?: Record<string, string>;
-    body?: string;
-  } = {}
-): Promise<T> => {
-  const { method = "GET", headers = {}, body } = options;
-
-  const url = `https://api.github.com${path}`;
-  const requestHeaders = {
-    Accept: "application/vnd.github.v3+json",
-    "User-Agent": "Pullfrog-Installation-Token-Generator/1.0",
-    ...headers,
-  };
-
-  const response = await fetch(url, {
-    method,
-    headers: requestHeaders,
-    ...(body && { body }),
-  });
-
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(
-      `GitHub API request failed: ${response.status} ${response.statusText}\n${errorText}`
-    );
-  }
-
-  return response.json() as T;
-};
-
-const checkRepositoryAccess = async (
-  token: string,
-  repoOwner: string,
-  repoName: string
-): Promise<boolean> => {
-  try {
-    const response = await githubRequest<RepositoriesResponse>("/installation/repositories", {
-      headers: { Authorization: `token ${token}` },
-    });
-
-    return response.repositories.some(
-      (repo) => repo.owner.login === repoOwner && repo.name === repoName
-    );
-  } catch {
-    return false;
-  }
-};
-
-const createInstallationToken = async (jwt: string, installationId: number): Promise<string> => {
-  const response = await githubRequest<InstallationTokenResponse>(
-    `/app/installations/${installationId}/access_tokens`,
-    {
-      method: "POST",
-      headers: { Authorization: `Bearer ${jwt}` },
-    }
-  );
-
-  return response.token;
-};
-
-const findInstallationId = async (
-  jwt: string,
-  repoOwner: string,
-  repoName: string
-): Promise<number> => {
-  const installations = await githubRequest<Installation[]>("/app/installations", {
-    headers: { Authorization: `Bearer ${jwt}` },
-  });
-
-  for (const installation of installations) {
-    try {
-      const tempToken = await createInstallationToken(jwt, installation.id);
-      const hasAccess = await checkRepositoryAccess(tempToken, repoOwner, repoName);
-
-      if (hasAccess) {
-        return installation.id;
-      }
-    } catch {}
-  }
-
-  throw new Error(
-    `No installation found with access to ${repoOwner}/${repoName}. ` +
-      "Ensure the GitHub App is installed on the target repository."
-  );
-};
-
-export const generateInstallationToken = async (): Promise<string> => {
-  const repoContext = resolveRepoContext();
-
-  const config: GitHubAppConfig = {
-    appId: process.env.GITHUB_APP_ID!,
-    privateKey: process.env.GITHUB_PRIVATE_KEY?.replace(/\\n/g, "\n")!,
-    repoOwner: repoContext.owner,
-    repoName: repoContext.name,
-  };
-
-  const jwt = generateJWT(config.appId, config.privateKey);
-  const installationId = await findInstallationId(jwt, config.repoOwner, config.repoName);
-  const token = await createInstallationToken(jwt, installationId);
-
-  return token;
-};

utils/github.ts

@@ -1,4 +1,6 @@
+import { createSign } from "node:crypto";
 import * as core from "@actions/core";
+import { resolveRepoContext } from "./repo-context.ts";
 
 export interface InstallationToken {
   token: string;
@@ -10,55 +12,241 @@ export interface InstallationToken {
   owner?: string;
 }
 
+interface GitHubAppConfig {
+  appId: string;
+  privateKey: string;
+  repoOwner: string;
+  repoName: string;
+}
+
+interface Installation {
+  id: number;
+  account: {
+    login: string;
+    type: string;
+  };
+}
+
+interface Repository {
+  owner: {
+    login: string;
+  };
+  name: string;
+}
+
+interface InstallationTokenResponse {
+  token: string;
+  expires_at: string;
+}
+
+interface RepositoriesResponse {
+  repositories: Repository[];
+}
+
+function checkExistingToken(): string | null {
+  const inputToken = core.getInput("github_installation_token");
+  const envToken = process.env.GITHUB_INSTALLATION_TOKEN;
+  return inputToken || envToken || null;
+}
+
+function isGitHubActionsEnvironment(): boolean {
+  return Boolean(process.env.GITHUB_ACTIONS);
+}
+
+async function acquireTokenViaOIDC(): Promise<string> {
+  core.info("Generating OIDC token...");
+  
+  const oidcToken = await core.getIDToken("pullfrog-api");
+  core.info("OIDC token generated successfully");
+
+  const apiUrl = process.env.API_URL || "https://pullfrog.ai";
+
+  core.info("Exchanging OIDC token for installation token...");
+  const tokenResponse = await fetch(`${apiUrl}/api/github/installation-token`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${oidcToken}`,
+      "Content-Type": "application/json",
+    },
+  });
+
+  if (!tokenResponse.ok) {
+    const errorText = await tokenResponse.text();
+    throw new Error(
+      `Token exchange failed: ${tokenResponse.status} ${tokenResponse.statusText} - ${errorText}`
+    );
+  }
+
+  const tokenData = (await tokenResponse.json()) as InstallationToken;
+  core.info(`Installation token obtained for ${tokenData.repository || "all repositories"}`);
+
+  return tokenData.token;
+}
+
+const base64UrlEncode = (str: string): string => {
+  return Buffer.from(str)
+    .toString("base64")
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=/g, "");
+};
+
+const generateJWT = (appId: string, privateKey: string): string => {
+  const now = Math.floor(Date.now() / 1000);
+  const payload = {
+    iat: now - 60,
+    exp: now + 5 * 60,
+    iss: appId,
+  };
+
+  const header = {
+    alg: "RS256",
+    typ: "JWT",
+  };
+
+  const encodedHeader = base64UrlEncode(JSON.stringify(header));
+  const encodedPayload = base64UrlEncode(JSON.stringify(payload));
+  const signaturePart = `${encodedHeader}.${encodedPayload}`;
+
+  const signature = createSign("RSA-SHA256")
+    .update(signaturePart)
+    .sign(privateKey, "base64")
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=/g, "");
+
+  return `${signaturePart}.${signature}`;
+};
+
+const githubRequest = async <T>(
+  path: string,
+  options: {
+    method?: string;
+    headers?: Record<string, string>;
+    body?: string;
+  } = {}
+): Promise<T> => {
+  const { method = "GET", headers = {}, body } = options;
+
+  const url = `https://api.github.com${path}`;
+  const requestHeaders = {
+    Accept: "application/vnd.github.v3+json",
+    "User-Agent": "Pullfrog-Installation-Token-Generator/1.0",
+    ...headers,
+  };
+
+  const response = await fetch(url, {
+    method,
+    headers: requestHeaders,
+    ...(body && { body }),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(
+      `GitHub API request failed: ${response.status} ${response.statusText}\n${errorText}`
+    );
+  }
+
+  return response.json() as T;
+};
+
+const checkRepositoryAccess = async (
+  token: string,
+  repoOwner: string,
+  repoName: string
+): Promise<boolean> => {
+  try {
+    const response = await githubRequest<RepositoriesResponse>("/installation/repositories", {
+      headers: { Authorization: `token ${token}` },
+    });
+
+    return response.repositories.some(
+      (repo) => repo.owner.login === repoOwner && repo.name === repoName
+    );
+  } catch {
+    return false;
+  }
+};
+
+const createInstallationToken = async (jwt: string, installationId: number): Promise<string> => {
+  const response = await githubRequest<InstallationTokenResponse>(
+    `/app/installations/${installationId}/access_tokens`,
+    {
+      method: "POST",
+      headers: { Authorization: `Bearer ${jwt}` },
+    }
+  );
+
+  return response.token;
+};
+
+const findInstallationId = async (
+  jwt: string,
+  repoOwner: string,
+  repoName: string
+): Promise<number> => {
+  const installations = await githubRequest<Installation[]>("/app/installations", {
+    headers: { Authorization: `Bearer ${jwt}` },
+  });
+
+  for (const installation of installations) {
+    try {
+      const tempToken = await createInstallationToken(jwt, installation.id);
+      const hasAccess = await checkRepositoryAccess(tempToken, repoOwner, repoName);
+
+      if (hasAccess) {
+        return installation.id;
+      }
+    } catch {}
+  }
+
+  throw new Error(
+    `No installation found with access to ${repoOwner}/${repoName}. ` +
+      "Ensure the GitHub App is installed on the target repository."
+  );
+};
+
+async function acquireTokenViaGitHubApp(): Promise<string> {
+  const repoContext = resolveRepoContext();
+
+  const config: GitHubAppConfig = {
+    appId: process.env.GITHUB_APP_ID!,
+    privateKey: process.env.GITHUB_PRIVATE_KEY?.replace(/\\n/g, "\n")!,
+    repoOwner: repoContext.owner,
+    repoName: repoContext.name,
+  };
+
+  const jwt = generateJWT(config.appId, config.privateKey);
+  const installationId = await findInstallationId(jwt, config.repoOwner, config.repoName);
+  const token = await createInstallationToken(jwt, installationId);
+
+  return token;
+}
+
+async function acquireNewToken(): Promise<string> {
+  if (isGitHubActionsEnvironment()) {
+    return await acquireTokenViaOIDC();
+  } else {
+    return await acquireTokenViaGitHubApp();
+  }
+}
+
 /**
  * Setup GitHub installation token for the action
  */
 export async function setupGitHubInstallationToken(): Promise<string> {
-  const inputToken = core.getInput("github_installation_token");
-  const envToken = process.env.GITHUB_INSTALLATION_TOKEN;
-
-  const existingToken = inputToken || envToken;
+  const existingToken = checkExistingToken();
   if (existingToken) {
     core.setSecret(existingToken);
     core.info("Using provided GitHub installation token");
     return existingToken;
   }
 
-  core.info("Generating OIDC token...");
-
-  try {
-    const oidcToken = await core.getIDToken("pullfrog-api");
-    core.info("OIDC token generated successfully");
-
-    const apiUrl = process.env.API_URL || "https://pullfrog.ai";
-
-    core.info("Exchanging OIDC token for installation token...");
-    const tokenResponse = await fetch(`${apiUrl}/api/github/installation-token`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${oidcToken}`,
-        "Content-Type": "application/json",
-      },
-    });
-
-    if (!tokenResponse.ok) {
-      const errorText = await tokenResponse.text();
-      throw new Error(
-        `Token exchange failed: ${tokenResponse.status} ${tokenResponse.statusText} - ${errorText}`
-      );
-    }
-
-    const tokenData = (await tokenResponse.json()) as InstallationToken;
-    core.info(`Installation token obtained for ${tokenData.repository || "all repositories"}`);
-
-    core.setSecret(tokenData.token);
-
-    process.env.GITHUB_INSTALLATION_TOKEN = tokenData.token;
-
-    return tokenData.token;
-  } catch (error) {
-    throw new Error(
-      `Failed to setup GitHub installation token: ${error instanceof Error ? error.message : "Unknown error"}`
-    );
-  }
+  const token = await acquireNewToken();
+  
+  core.setSecret(token);
+  process.env.GITHUB_INSTALLATION_TOKEN = token;
+  
+  return token;
 }