diff --git a/.github/workflows/ai-moderator.lock.yml b/.github/workflows/ai-moderator.lock.yml
index a6e22128ab..d717a32e33 100644
--- a/.github/workflows/ai-moderator.lock.yml
+++ b/.github/workflows/ai-moderator.lock.yml
@@ -93,7 +93,8 @@ jobs:
             global.context = context;
             global.exec = exec;
             global.io = io;
-            require('/tmp/gh-aw/actions/lock-issue.cjs');
+            const { main } = require('/tmp/gh-aw/actions/lock-issue.cjs');
+            await main();
 
   agent:
     needs: activation
diff --git a/.github/workflows/campaign-generator.lock.yml b/.github/workflows/campaign-generator.lock.yml
index 3dc9aae039..1dd97e4223 100644
--- a/.github/workflows/campaign-generator.lock.yml
+++ b/.github/workflows/campaign-generator.lock.yml
@@ -81,7 +81,8 @@ jobs:
             global.context = context;
             global.exec = exec;
             global.io = io;
-            require('/tmp/gh-aw/actions/lock-issue.cjs');
+            const { main } = require('/tmp/gh-aw/actions/lock-issue.cjs');
+            await main();
 
   agent:
     needs: activation
diff --git a/.github/workflows/workflow-generator.lock.yml b/.github/workflows/workflow-generator.lock.yml
index e1aabcff8e..9e6151ad38 100644
--- a/.github/workflows/workflow-generator.lock.yml
+++ b/.github/workflows/workflow-generator.lock.yml
@@ -81,7 +81,8 @@ jobs:
             global.context = context;
             global.exec = exec;
             global.io = io;
-            require('/tmp/gh-aw/actions/lock-issue.cjs');
+            const { main } = require('/tmp/gh-aw/actions/lock-issue.cjs');
+            await main();
 
   agent:
     needs: activation
diff --git a/actions/setup/js/add_comment.cjs b/actions/setup/js/add_comment.cjs
index 9a8f567a15..80cc9399e6 100644
--- a/actions/setup/js/add_comment.cjs
+++ b/actions/setup/js/add_comment.cjs
@@ -1,11 +1,11 @@
 // @ts-check
 /// <reference types="@actions/github-script" />
 
-const { loadAgentOutput } = require("/tmp/gh-aw/actions/load_agent_output.cjs");
-const { generateFooterWithMessages } = require("/tmp/gh-aw/actions/messages_footer.cjs");
-const { getRepositoryUrl } = require("/tmp/gh-aw/actions/get_repository_url.cjs");
-const { replaceTemporaryIdReferences, loadTemporaryIdMap } = require("/tmp/gh-aw/actions/temporary_id.cjs");
-const { getTrackerID } = require("/tmp/gh-aw/actions/get_tracker_id.cjs");
+const { loadAgentOutput } = require("./load_agent_output.cjs");
+const { generateFooterWithMessages } = require("./messages_footer.cjs");
+const { getRepositoryUrl } = require("./get_repository_url.cjs");
+const { replaceTemporaryIdReferences, loadTemporaryIdMap } = require("./temporary_id.cjs");
+const { getTrackerID } = require("./get_tracker_id.cjs");
 
 /**
  * Hide/minimize a comment using the GraphQL API
diff --git a/actions/setup/js/lock-issue.cjs b/actions/setup/js/lock-issue.cjs
index 780bb3321b..0e26b67b8e 100644
--- a/actions/setup/js/lock-issue.cjs
+++ b/actions/setup/js/lock-issue.cjs
@@ -66,4 +66,4 @@ async function main() {
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/actions/setup/js/noop.cjs b/actions/setup/js/noop.cjs
index e643e1e03d..6bcba542d2 100644
--- a/actions/setup/js/noop.cjs
+++ b/actions/setup/js/noop.cjs
@@ -1,7 +1,7 @@
 // @ts-check
 /// <reference types="@actions/github-script" />
 
-const { loadAgentOutput } = require("/tmp/gh-aw/actions/load_agent_output.cjs");
+const { loadAgentOutput } = require("./load_agent_output.cjs");
 
 /**
  * Main function to handle noop safe output
diff --git a/pkg/workflow/compiler_activation_jobs.go b/pkg/workflow/compiler_activation_jobs.go
index 7ea8be975f..e25db2cdba 100644
--- a/pkg/workflow/compiler_activation_jobs.go
+++ b/pkg/workflow/compiler_activation_jobs.go
@@ -495,7 +495,8 @@ func (c *Compiler) buildActivationJob(data *WorkflowData, preActivationJobCreate
 			steps = append(steps, "            global.context = context;\n")
 			steps = append(steps, "            global.exec = exec;\n")
 			steps = append(steps, "            global.io = io;\n")
-			steps = append(steps, "            require('"+SetupActionDestination+"/lock-issue.cjs');\n")
+			steps = append(steps, "            const { main } = require('"+SetupActionDestination+"/lock-issue.cjs');\n")
+			steps = append(steps, "            await main();\n")
 		} else {
 			// Add the lock-issue script
 			formattedScript := FormatJavaScriptForYAML(lockIssueScript)
diff --git a/pkg/workflow/js/lock-issue.cjs b/pkg/workflow/js/lock-issue.cjs
index 780bb3321b..0e26b67b8e 100644
--- a/pkg/workflow/js/lock-issue.cjs
+++ b/pkg/workflow/js/lock-issue.cjs
@@ -66,4 +66,4 @@ async function main() {
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/lock_for_agent_test.go b/pkg/workflow/lock_for_agent_test.go
index 3501bcf1dd..54ccf89a62 100644
--- a/pkg/workflow/lock_for_agent_test.go
+++ b/pkg/workflow/lock_for_agent_test.go
@@ -59,8 +59,8 @@ Test workflow with lock-for-agent enabled.
 		"Lock issue for agent workflow",
 		"Unlock issue after agent workflow",
 		"GH_AW_LOCK_FOR_AGENT: \"true\"",
-		"lockForAgent && (eventName === \"issues\" || eventName === \"issue_comment\")",
-		"This issue has been locked while the workflow is running",
+		"lock-issue.cjs",   // Check for require() call to lock-issue script
+		"unlock-issue.cjs", // Check for require() call to unlock-issue script
 	}
 
 	for _, expected := range expectedStrings {
@@ -378,8 +378,8 @@ Test workflow with lock-for-agent enabled for issue_comment events.
 		"Lock issue for agent workflow",
 		"Unlock issue after agent workflow",
 		"GH_AW_LOCK_FOR_AGENT: \"true\"",
-		"lockForAgent && (eventName === \"issues\" || eventName === \"issue_comment\")",
-		"This issue has been locked while the workflow is running",
+		"lock-issue.cjs",   // Check for require() call to lock-issue script
+		"unlock-issue.cjs", // Check for require() call to unlock-issue script
 	}
 
 	for _, expected := range expectedStrings {