fix: pass target_repo as explicit param instead of overriding context.repo, add comment on continue-on-error

Author: Hweinstock

.github/scripts/javascript/process-inputs.cjs

@@ -4,48 +4,48 @@
 
 const fs = require('fs');
 
-async function getIssueInfo(github, context, inputs) {
+async function getIssueInfo(github, repo, inputs, eventName, payload) {
   let issueId;
 
-  if (context.eventName === 'workflow_dispatch') {
+  if (eventName === 'workflow_dispatch') {
     issueId = inputs.issue_id;
   } else {
     // Handle both issue comments and PR comments
-    issueId = (context.payload.issue?.number || context.payload.pull_request?.number)?.toString();
+    issueId = (payload.issue?.number || payload.pull_request?.number)?.toString();
   }
 
   const command =
-    context.eventName === 'workflow_dispatch'
+    eventName === 'workflow_dispatch'
       ? inputs.command
-      : context.payload.comment.body.match(/^\/strands\s*(.*)$/)?.[1]?.trim() || '';
+      : payload.comment.body.match(/^\/strands\s*(.*)$/)?.[1]?.trim() || '';
 
-  console.log(`Event: ${context.eventName}, Issue ID: ${issueId}, Command: "${command}"`);
+  console.log(`Event: ${eventName}, Issue ID: ${issueId}, Command: "${command}"`);
 
   const issue = await github.rest.issues.get({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
+    owner: repo.owner,
+    repo: repo.repo,
     issue_number: issueId,
   });
 
   return { issueId, command, issue };
 }
 
-async function determineBranch(github, context, issueId, mode, isPullRequest) {
+async function determineBranch(github, repo, issueId, mode, isPullRequest) {
   let branchName = 'main';
 
   if (mode === 'implementer' && !isPullRequest) {
     branchName = `agent-tasks/${issueId}`;
 
     const mainRef = await github.rest.git.getRef({
-      owner: context.repo.owner,
-      repo: context.repo.repo,
+      owner: repo.owner,
+      repo: repo.repo,
       ref: 'heads/main',
     });
 
     try {
       await github.rest.git.createRef({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
+        owner: repo.owner,
+        repo: repo.repo,
         ref: `refs/heads/${branchName}`,
         sha: mainRef.data.object.sha,
       });
@@ -59,8 +59,8 @@ async function determineBranch(github, context, issueId, mode, isPullRequest) {
     }
   } else if (isPullRequest) {
     const pr = await github.rest.pulls.get({
-      owner: context.repo.owner,
-      repo: context.repo.repo,
+      owner: repo.owner,
+      repo: repo.repo,
       pull_number: issueId,
     });
     branchName = pr.data.head.ref;
@@ -69,7 +69,7 @@ async function determineBranch(github, context, issueId, mode, isPullRequest) {
   return branchName;
 }
 
-function buildPrompts(mode, issueId, isPullRequest, command, branchName, inputs) {
+function buildPrompts(mode, issueId, isPullRequest, command, branchName, inputs, repo) {
   const sessionId =
     inputs.session_id ||
     (mode === 'implementer' ? `${mode}-${branchName}`.replace(/[\/\\]/g, '-') : `${mode}-${issueId}`);
@@ -86,7 +86,7 @@ function buildPrompts(mode, issueId, isPullRequest, command, branchName, inputs)
 
   let prompt = isPullRequest ? 'The pull request id is:' : 'The issue id is:';
   prompt += `${issueId}\n`;
-  prompt += `The repository is: aws/agentcore-cli\n`;
+  prompt += `The repository is: ${repo.owner}/${repo.repo}\n`;
 
   if (mode === 'tester') {
     const flowDescription = command.replace(/^test\s*/, '').trim();
@@ -105,7 +105,9 @@ function buildPrompts(mode, issueId, isPullRequest, command, branchName, inputs)
 
 module.exports = async (context, github, core, inputs) => {
   try {
-    const { issueId, command, issue } = await getIssueInfo(github, context, inputs);
+    const repo = inputs.target_repo || { owner: context.repo.owner, repo: context.repo.repo };
+
+    const { issueId, command, issue } = await getIssueInfo(github, repo, inputs, context.eventName, context.payload);
 
     const isPullRequest = !!issue.data.pull_request;
 
@@ -115,10 +117,18 @@ module.exports = async (context, github, core, inputs) => {
       (isPullRequest ? 'implementer' : 'refiner');
     console.log(`Is PR: ${isPullRequest}, Mode: ${mode}`);
 
-    const branchName = await determineBranch(github, context, issueId, mode, isPullRequest);
+    const branchName = await determineBranch(github, repo, issueId, mode, isPullRequest);
     console.log(`Building prompts - mode: ${mode}, issue: ${issueId}, is PR: ${isPullRequest}`);
 
-    const { sessionId, systemPrompt, prompt } = buildPrompts(mode, issueId, isPullRequest, command, branchName, inputs);
+    const { sessionId, systemPrompt, prompt } = buildPrompts(
+      mode,
+      issueId,
+      isPullRequest,
+      command,
+      branchName,
+      inputs,
+      repo
+    );
 
     console.log(`Session ID: ${sessionId}`);
     console.log(`Task prompt: "${prompt}"`);

.github/workflows/strands-command.yml

@@ -70,6 +70,8 @@ jobs:
           fetch-depth: 0
 
       - name: Add strands-running label
+        # continue-on-error: workflow_dispatch from a fork targets the fork repo
+        # where the upstream issue/PR doesn't exist, causing a 404.
         continue-on-error: true
         uses: actions/github-script@v8
         with:
@@ -87,17 +89,15 @@ jobs:
         uses: actions/github-script@v8
         with:
           script: |
-            // When dispatched from a fork, override the repo getter to point at upstream
-            if (context.eventName === 'workflow_dispatch' && context.repo.owner !== 'aws') {
-              Object.defineProperty(context, 'repo', {
-                get: () => ({ owner: 'aws', repo: 'agentcore-cli' })
-              });
-            }
             const processInputs = require('./.github/scripts/javascript/process-inputs.cjs');
             const inputs = {
               issue_id: '${{ inputs.issue_id }}',
               command: '${{ inputs.command }}',
-              session_id: '${{ inputs.session_id }}'
+              session_id: '${{ inputs.session_id }}',
+              // When dispatched from a fork, target the upstream repo for API calls
+              ...(context.eventName === 'workflow_dispatch' && context.repo.owner !== 'aws'
+                ? { target_repo: { owner: 'aws', repo: 'agentcore-cli' } }
+                : {}),
             };
             await processInputs(context, github, core, inputs);