prettier

src/create-prompt/index.ts

@@ -434,27 +434,9 @@ ${
   eventData.eventName === "pull_request_review_comment"
     ? `<comment_tool_info>
 IMPORTANT: For this inline PR review comment, you have been provided with ONLY the mcp__github__update_pull_request_comment tool to update this specific review comment.
-
-Tool usage example for mcp__github__update_pull_request_comment:
-{
-  "owner": "${context.repository.split("/")[0]}",
-  "repo": "${context.repository.split("/")[1]}",
-  "commentId": ${eventData.commentId || context.claudeCommentId},
-  "body": "Your comment text here"
-}
-All four parameters (owner, repo, commentId, body) are required.
 </comment_tool_info>`
     : `<comment_tool_info>
 IMPORTANT: For this event type, you have been provided with ONLY the mcp__github__update_issue_comment tool to update comments.
-
-Tool usage example for mcp__github__update_issue_comment:
-{
-  "owner": "${context.repository.split("/")[0]}",
-  "repo": "${context.repository.split("/")[1]}",
-  "commentId": ${context.claudeCommentId},
-  "body": "Your comment text here"
-}
-All four parameters (owner, repo, commentId, body) are required.
 </comment_tool_info>`
 }
 
@@ -565,9 +547,6 @@ Important Notes:
 - Use this spinner HTML when work is in progress: <img src="https://github.com/user-attachments/assets/5ac382c7-e004-429b-8e35-7feb3e8f9c6f" width="14px" height="14px" style="vertical-align: middle; margin-left: 4px;" />
 ${eventData.isPR && !eventData.claudeBranch ? `- Always push to the existing branch when triggered on a PR.` : `- IMPORTANT: You are already on the correct branch (${eventData.claudeBranch || "the created branch"}). Never create new branches when triggered on issues or closed/merged PRs.`}
 - Use mcp__github_file_ops__commit_files for making commits (works for both new and existing files, single or multiple). Use mcp__github_file_ops__delete_files for deleting files (supports deleting single or multiple files atomically), or mcp__github__delete_file for deleting a single file. Edit files locally, and the tool will read the content from the same path on disk.
-  Tool usage examples:
-  - mcp__github_file_ops__commit_files: {"files": ["path/to/file1.js", "path/to/file2.py"], "message": "feat: add new feature"}
-  - mcp__github_file_ops__delete_files: {"files": ["path/to/old.js"], "message": "chore: remove deprecated file"}
 - Display the todo list as a checklist in the GitHub comment and mark things off as you go.
 - REPOSITORY SETUP INSTRUCTIONS: The repository's CLAUDE.md file(s) contain critical repo-specific setup instructions, development guidelines, and preferences. Always read and follow these files, particularly the root CLAUDE.md, as they provide essential context for working with the codebase effectively.
 - Use h3 headers (###) for section titles in your comments, not h1 headers (#).

src/github/token.ts

@@ -39,19 +39,25 @@ async function retryWithBackoff<T>(
     }
   }
 
-  console.error(`Operation failed after ${maxAttempts} attempts`);
-  throw lastError;
+  throw new Error(
+    `Operation failed after ${maxAttempts} attempts. Last error: ${
+      lastError?.message ?? "Unknown error"
+    }`,
+  );
 }
 
 async function getOidcToken(): Promise<string> {
   try {
     const oidcToken = await core.getIDToken("claude-code-github-action");
 
+    if (!oidcToken) {
+      throw new Error("OIDC token not found");
+    }
+
     return oidcToken;
   } catch (error) {
-    console.error("Failed to get OIDC token:", error);
     throw new Error(
-      "Could not fetch an OIDC token. Did you remember to add `id-token: write` to your workflow permissions?",
+      `Failed to get OIDC token: ${error instanceof Error ? error.message : String(error)}`,
     );
   }
 }
@@ -68,15 +74,9 @@ async function exchangeForAppToken(oidcToken: string): Promise<string> {
   );
 
   if (!response.ok) {
-    const responseJson = (await response.json()) as {
-      error?: {
-        message?: string;
-      };
-    };
-    console.error(
-      `App token exchange failed: ${response.status} ${response.statusText} - ${responseJson?.error?.message ?? "Unknown error"}`,
+    throw new Error(
+      `App token exchange failed: ${response.status} ${response.statusText}`,
     );
-    throw new Error(`${responseJson?.error?.message ?? "Unknown error"}`);
   }
 
   const appTokenData = (await response.json()) as {
@@ -117,9 +117,7 @@ export async function setupGitHubToken(): Promise<string> {
     core.setOutput("GITHUB_TOKEN", appToken);
     return appToken;
   } catch (error) {
-    core.setFailed(
-      `Failed to setup GitHub token: ${error}.\n\nIf you instead wish to use this action with a custom GitHub token or custom GitHub app, provide a \`github_token\` in the \`uses\` section of the app in your workflow yml file.`,
-    );
+    core.setFailed(`Failed to setup GitHub token: ${error}`);
     process.exit(1);
   }
 }

src/mcp/github-file-ops-server.ts

@@ -4,7 +4,6 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
 import { readFile } from "fs/promises";
-import { join } from "path";
 import fetch from "node-fetch";
 import { GITHUB_API_URL } from "../github/api/config";
 
@@ -37,7 +36,6 @@ type GitHubNewCommit = {
 const REPO_OWNER = process.env.REPO_OWNER;
 const REPO_NAME = process.env.REPO_NAME;
 const BRANCH_NAME = process.env.BRANCH_NAME;
-const REPO_DIR = process.env.REPO_DIR || process.cwd();
 
 if (!REPO_OWNER || !REPO_NAME || !BRANCH_NAME) {
   console.error(
@@ -73,9 +71,18 @@ server.tool(
         throw new Error("GITHUB_TOKEN environment variable is required");
       }
 
+      // Convert absolute paths to relative if they match CWD
+      const cwd = process.cwd();
       const processedFiles = files.map((filePath) => {
         if (filePath.startsWith("/")) {
-          return filePath.slice(1);
+          if (filePath.startsWith(cwd)) {
+            // Strip CWD from absolute path
+            return filePath.slice(cwd.length + 1);
+          } else {
+            throw new Error(
+              `Path '${filePath}' must be relative to repository root or within current working directory`,
+            );
+          }
         }
         return filePath;
       });
@@ -119,11 +126,7 @@ server.tool(
       // 3. Create tree entries for all files
       const treeEntries = await Promise.all(
         processedFiles.map(async (filePath) => {
-          const fullPath = filePath.startsWith("/")
-            ? filePath
-            : join(REPO_DIR, filePath);
-
-          const content = await readFile(fullPath, "utf-8");
+          const content = await readFile(filePath, "utf-8");
           return {
             path: filePath,
             mode: "100644",
@@ -229,16 +232,13 @@ server.tool(
         ],
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
       return {
         content: [
           {
             type: "text",
-            text: `Error: ${errorMessage}`,
+            text: `Error: ${error instanceof Error ? error.message : String(error)}`,
           },
         ],
-        error: errorMessage,
         isError: true,
       };
     }
@@ -423,16 +423,13 @@ server.tool(
         ],
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
       return {
         content: [
           {
             type: "text",
-            text: `Error: ${errorMessage}`,
+            text: `Error: ${error instanceof Error ? error.message : String(error)}`,
           },
         ],
-        error: errorMessage,
         isError: true,
       };
     }

src/mcp/install-mcp-server.ts

@@ -34,7 +34,6 @@ export async function prepareMcpConfig(
             REPO_OWNER: owner,
             REPO_NAME: repo,
             BRANCH_NAME: branch,
-            REPO_DIR: process.env.GITHUB_WORKSPACE || process.cwd(),
           },
         },
       },