diff --git a/.github/workflows/issue-classifier.lock.yml b/.github/workflows/issue-classifier.lock.yml
index 4f4a69a3e5..3be5ab9acd 100644
--- a/.github/workflows/issue-classifier.lock.yml
+++ b/.github/workflows/issue-classifier.lock.yml
@@ -2241,7 +2241,7 @@ jobs:
           path: /tmp/gh-aw/aw_info.json
           if-no-files-found: warn
       - name: Run AI Inference
-        uses: actions/ai-inference@334892bb203895caaed82ec52d23c1ed9385151e # v1
+        uses: actions/ai-inference@334892bb203895caaed82ec52d23c1ed9385151e # v2.0.4
         env:
           GH_AW_MCP_CONFIG: /tmp/gh-aw/mcp-config/mcp-servers.json
           GH_AW_PROMPT: /tmp/gh-aw/aw-prompts/prompt.txt
diff --git a/.github/workflows/release.lock.yml b/.github/workflows/release.lock.yml
index 8433f151f1..ce61da11ec 100644
--- a/.github/workflows/release.lock.yml
+++ b/.github/workflows/release.lock.yml
@@ -6056,13 +6056,13 @@ jobs:
       - name: Download Go modules
         run: go mod download
       - name: Generate SBOM (SPDX format)
-        uses: anchore/sbom-action@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.10
+        uses: anchore/sbom-action@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.11
         with:
           artifact-name: sbom.spdx.json
           format: spdx-json
           output-file: sbom.spdx.json
       - name: Generate SBOM (CycloneDX format)
-        uses: anchore/sbom-action@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.10
+        uses: anchore/sbom-action@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.11
         with:
           artifact-name: sbom.cdx.json
           format: cyclonedx-json
@@ -6261,7 +6261,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Release with gh-extension-precompile
-        uses: cli/gh-extension-precompile@9e2237c30f869ad3bcaed6a4be2cd43564dd421b # v2
+        uses: cli/gh-extension-precompile@9e2237c30f869ad3bcaed6a4be2cd43564dd421b # v2.1.0
         with:
           build_script_override: scripts/build-release.sh
           go_version_file: go.mod
diff --git a/.github/workflows/stale-repo-identifier.lock.yml b/.github/workflows/stale-repo-identifier.lock.yml
index a8cd91dcd0..21caadf429 100644
--- a/.github/workflows/stale-repo-identifier.lock.yml
+++ b/.github/workflows/stale-repo-identifier.lock.yml
@@ -176,7 +176,7 @@ jobs:
           ORGANIZATION: ${{ env.ORGANIZATION }}
         id: stale-repos
         name: Run stale_repos tool
-        uses: github/stale-repos@a21e55567b83cf3c3f3f9085d3038dc6cee02598 # v3
+        uses: github/stale-repos@a21e55567b83cf3c3f3f9085d3038dc6cee02598 # v3.0.2
       - env:
           INACTIVE_REPOS: ${{ steps.stale-repos.outputs.inactiveRepos }}
         name: Save stale repos output
diff --git a/.github/workflows/super-linter.lock.yml b/.github/workflows/super-linter.lock.yml
index b15660af2f..4c2fde522c 100644
--- a/.github/workflows/super-linter.lock.yml
+++ b/.github/workflows/super-linter.lock.yml
@@ -6189,7 +6189,7 @@ jobs:
           persist-credentials: false
       - name: Super-linter
         id: super-linter
-        uses: super-linter/super-linter@47984f49b4e87383eed97890fe2dca6063bbd9c3 # v8.2.1
+        uses: super-linter/super-linter@47984f49b4e87383eed97890fe2dca6063bbd9c3 # v8.3.1
         env:
           CREATE_LOG_FILE: "true"
           DEFAULT_BRANCH: main
diff --git a/pkg/workflow/compiler_safe_outputs_core.go b/pkg/workflow/compiler_safe_outputs_core.go
index a5e8cb383c..bfb5adf9fb 100644
--- a/pkg/workflow/compiler_safe_outputs_core.go
+++ b/pkg/workflow/compiler_safe_outputs_core.go
@@ -387,7 +387,7 @@ func (c *Compiler) buildConsolidatedSafeOutputsJob(data *WorkflowData, mainJobNa
 		appTokenSteps := c.buildGitHubAppTokenMintStep(data.SafeOutputs.App, permissions)
 		// Calculate insertion index: after setup action (if present) and artifact downloads, but before safe output steps
 		insertIndex := 0
-		
+
 		// Count setup action steps (checkout + setup if in dev mode, or just setup)
 		setupActionRef := c.resolveActionReference("./actions/setup", data)
 		if setupActionRef != "" {
@@ -396,10 +396,10 @@ func (c *Compiler) buildConsolidatedSafeOutputsJob(data *WorkflowData, mainJobNa
 			}
 			insertIndex += 4 // Setup step (4 lines: name, uses, with, destination)
 		}
-		
+
 		// Add artifact download steps count
 		insertIndex += len(buildAgentOutputDownloadSteps())
-		
+
 		// Add patch download steps if present
 		if data.SafeOutputs.CreatePullRequests != nil || data.SafeOutputs.PushToPullRequestBranch != nil {
 			patchDownloadSteps := buildArtifactDownloadSteps(ArtifactDownloadConfig{
@@ -410,7 +410,7 @@ func (c *Compiler) buildConsolidatedSafeOutputsJob(data *WorkflowData, mainJobNa
 			})
 			insertIndex += len(patchDownloadSteps)
 		}
-		
+
 		// Insert app token steps
 		newSteps := make([]string, 0)
 		newSteps = append(newSteps, steps[:insertIndex]...)
diff --git a/pkg/workflow/js/add_comment.cjs b/pkg/workflow/js/add_comment.cjs
index bfb7e51177..80cc9399e6 100644
--- a/pkg/workflow/js/add_comment.cjs
+++ b/pkg/workflow/js/add_comment.cjs
@@ -565,4 +565,5 @@ async function main() {
   core.info(`Successfully created ${createdComments.length} comment(s)`);
   return createdComments;
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/add_comment.test.cjs b/pkg/workflow/js/add_comment.test.cjs
index 4c350de591..da0f7934ad 100644
--- a/pkg/workflow/js/add_comment.test.cjs
+++ b/pkg/workflow/js/add_comment.test.cjs
@@ -50,17 +50,20 @@ const mockCore = {
       }),
       it("should skip when no agent output is provided", async () => {
         (delete process.env.GH_AW_AGENT_OUTPUT,
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"),
           expect(mockGithub.rest.issues.createComment).not.toHaveBeenCalled());
       }),
       it("should skip when agent output is empty", async () => {
-        (setAgentOutput(""), await eval(`(async () => { ${createCommentScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"), expect(mockGithub.rest.issues.createComment).not.toHaveBeenCalled());
+        (setAgentOutput(""),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
+          expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"),
+          expect(mockGithub.rest.issues.createComment).not.toHaveBeenCalled());
       }),
       it("should skip when not in issue or PR context", async () => {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Test comment content" }] }),
           (global.context.eventName = "push"),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in issue, pull request, or discussion context, skipping comment creation'),
           expect(mockGithub.rest.issues.createComment).not.toHaveBeenCalled());
       }),
@@ -68,7 +71,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Test comment content" }] }), (global.context.eventName = "issues"));
         const mockComment = { id: 456, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-456" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, body: expect.stringContaining("Test comment content") }),
           expect(mockCore.setOutput).toHaveBeenCalledWith("comment_id", 456),
           expect(mockCore.setOutput).toHaveBeenCalledWith("comment_url", mockComment.html_url),
@@ -79,14 +82,14 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Test PR comment content" }] }), (global.context.eventName = "pull_request"), (global.context.payload.pull_request = { number: 789 }), delete global.context.payload.issue);
         const mockComment = { id: 789, html_url: "https://github.com/testowner/testrepo/issues/789#issuecomment-789" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 789, body: expect.stringContaining("Test PR comment content") }));
       }),
       it("should include run information in comment body", async () => {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Test content" }] }), (global.context.eventName = "issues"), (global.context.payload.issue = { number: 123 }));
         const mockComment = { id: 456, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-456" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalled(),
           expect(mockGithub.rest.issues.createComment.mock.calls).toHaveLength(1));
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
@@ -100,7 +103,7 @@ const mockCore = {
           (global.context.eventName = "issues"),
           (global.context.payload.issue = { number: 123 }));
         const mockComment = { id: 456, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-456" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test content with source"),
           expect(callArgs.body).toContain("[🏴‍☠️ Test Workflow]"),
@@ -114,7 +117,7 @@ const mockCore = {
           (global.context.eventName = "issues"),
           (global.context.payload.issue = { number: 123 }));
         const mockComment = { id: 456, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-456" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test content without source"), expect(callArgs.body).toContain("[🏴‍☠️ Test Workflow]"), expect(callArgs.body).not.toContain("gh aw add"));
       }),
@@ -125,7 +128,7 @@ const mockCore = {
           (global.context.payload.issue = { number: 123 }),
           delete global.context.payload.repository);
         const mockComment = { id: 456, html_url: "https://github.enterprise.com/testowner/testrepo/issues/123#issuecomment-456" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test content with custom server"),
           expect(callArgs.body).toContain("https://github.enterprise.com/testowner/testrepo/actions/runs/12345"),
@@ -139,14 +142,14 @@ const mockCore = {
           (global.context.payload.issue = { number: 123 }),
           delete global.context.payload.repository);
         const mockComment = { id: 456, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-456" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`), expect(mockGithub.rest.issues.createComment).toHaveBeenCalled());
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test content with fallback"), expect(callArgs.body).toContain("https://github.com/testowner/testrepo/actions/runs/12345"));
       }),
       it("should include triggering issue number in footer when in issue context", async () => {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Comment from issue context" }] }), (process.env.GH_AW_WORKFLOW_NAME = "Test Workflow"), (global.context.eventName = "issues"), (global.context.payload.issue = { number: 42 }));
         const mockComment = { id: 789, html_url: "https://github.com/testowner/testrepo/issues/42#issuecomment-789" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`));
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Comment from issue context"), expect(callArgs.body).toContain("[🏴‍☠️ Test Workflow]"), expect(callArgs.body).toContain("#42"));
       }),
@@ -157,7 +160,7 @@ const mockCore = {
           delete global.context.payload.issue,
           (global.context.payload.pull_request = { number: 123 }));
         const mockComment = { id: 890, html_url: "https://github.com/testowner/testrepo/pull/123#issuecomment-890" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`));
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Comment from PR context"), expect(callArgs.body).toContain("[🏴‍☠️ Test Workflow]"), expect(callArgs.body).toContain("#123"), delete global.context.payload.pull_request);
       }),
@@ -172,7 +175,7 @@ const mockCore = {
           (process.env.GH_AW_CREATED_PULL_REQUEST_URL = "https://github.com/testowner/testrepo/pull/101"),
           (process.env.GH_AW_CREATED_PULL_REQUEST_NUMBER = "101"));
         const mockComment = { id: 890, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-890" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`));
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("#### Related Items"),
           expect(callArgs.body).toMatch(/####\s+Related Items/),
@@ -199,7 +202,7 @@ const mockCore = {
           (process.env.GH_AW_CREATED_DISCUSSION_NUMBER = "789"),
           (process.env.GH_AW_CREATED_PULL_REQUEST_URL = "https://github.com/testowner/testrepo/pull/101"),
           (process.env.GH_AW_CREATED_PULL_REQUEST_NUMBER = "101"),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockCore.summary.addRaw).toHaveBeenCalled());
         const summaryContent = mockCore.summary.addRaw.mock.calls[0][0];
         (expect(summaryContent).toContain("#### Related Items"),
@@ -229,7 +232,7 @@ const mockCore = {
           addDiscussionComment: { comment: { id: "DC_kwDOPc1QR84BpqRt", body: "Test discussion comment", createdAt: "2025-10-19T22:00:00Z", url: "https://github.com/testowner/testrepo/discussions/1993#discussioncomment-123" } },
         }),
           (global.github.graphql = mockGraphqlResponse),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGraphqlResponse).toHaveBeenCalledTimes(2),
           expect(mockGraphqlResponse.mock.calls[0][0]).toContain("query"),
           expect(mockGraphqlResponse.mock.calls[0][0]).toContain("discussion(number: $num)"),
@@ -259,7 +262,7 @@ const mockCore = {
           addDiscussionComment: { comment: { id: "DC_kwDOPc1QR84BpqRv", body: "Test explicit discussion comment", createdAt: "2025-10-22T12:00:00Z", url: "https://github.com/testowner/testrepo/discussions/2001#discussioncomment-456" } },
         }),
           (global.github.graphql = mockGraphqlResponse),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGraphqlResponse).toHaveBeenCalledTimes(2),
           expect(mockGraphqlResponse.mock.calls[0][0]).toContain("query"),
           expect(mockGraphqlResponse.mock.calls[0][0]).toContain("discussion(number: $num)"),
@@ -280,7 +283,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "add_comment", body: "This comment references issue #aw_aabbccdd1122 which was created earlier." }] }),
           (process.env.GH_AW_TEMPORARY_ID_MAP = JSON.stringify({ aw_aabbccdd1122: 456 })),
           mockGithub.rest.issues.createComment.mockResolvedValue({ data: { id: 99999, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-99999" } }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalledWith(expect.objectContaining({ body: expect.stringContaining("#456") })),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalledWith(expect.objectContaining({ body: expect.not.stringContaining("#aw_aabbccdd1122") })),
           delete process.env.GH_AW_TEMPORARY_ID_MAP);
@@ -289,7 +292,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Test comment" }] }),
           (process.env.GH_AW_TEMPORARY_ID_MAP = JSON.stringify({ aw_abc123: 100, aw_def456: 200 })),
           mockGithub.rest.issues.createComment.mockResolvedValue({ data: { id: 99999, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-99999" } }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Loaded temporary ID map with 2 entries"),
           delete process.env.GH_AW_TEMPORARY_ID_MAP);
       }),
@@ -297,7 +300,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "add_comment", body: "Comment with #aw_000000000000 that won't be resolved" }] }),
           (process.env.GH_AW_TEMPORARY_ID_MAP = "{}"),
           mockGithub.rest.issues.createComment.mockResolvedValue({ data: { id: 99999, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-99999" } }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalledWith(expect.objectContaining({ body: expect.stringContaining("#aw_000000000000") })),
           delete process.env.GH_AW_TEMPORARY_ID_MAP);
       }),
@@ -308,7 +311,7 @@ const mockCore = {
           (global.context.eventName = "issues"),
           (global.context.payload.issue = { number: 456 }));
         const mockComment = { id: 999, html_url: "https://github.com/testowner/testrepo/issues/456#issuecomment-999" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`));
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test comment with custom footer"),
           expect(callArgs.body).toContain("Custom AI footer by [Custom Workflow]"),
@@ -326,7 +329,7 @@ const mockCore = {
           (global.context.eventName = "issues"),
           (global.context.payload.issue = { number: 789 }));
         const mockComment = { id: 1001, html_url: "https://github.com/testowner/testrepo/issues/789#issuecomment-1001" };
-        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript} })()`));
+        (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createCommentScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.createComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test comment with custom footer and install"),
           expect(callArgs.body).toContain("Generated by [Custom Workflow]"),
@@ -353,7 +356,7 @@ const mockCore = {
           (mockGithub.graphql = vi.fn().mockResolvedValue({ minimizeComment: { minimizedComment: { isMinimized: !0 } } })));
         const mockNewComment = { id: 4, html_url: "https://github.com/testowner/testrepo/issues/100#issuecomment-4" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockNewComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.listComments).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 100, per_page: 100, page: 1 }),
           expect(mockGithub.graphql).toHaveBeenCalledTimes(2),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("minimizeComment"), expect.objectContaining({ nodeId: "IC_oldcomment1", classifier: "OUTDATED" })),
@@ -371,7 +374,7 @@ const mockCore = {
           (mockGithub.graphql = vi.fn()));
         const mockNewComment = { id: 5, html_url: "https://github.com/testowner/testrepo/issues/200#issuecomment-5" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockNewComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.listComments).not.toHaveBeenCalled(),
           expect(mockGithub.graphql).not.toHaveBeenCalled(),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalled(),
@@ -386,7 +389,7 @@ const mockCore = {
           (mockGithub.graphql = vi.fn()));
         const mockNewComment = { id: 6, html_url: "https://github.com/testowner/testrepo/issues/300#issuecomment-6" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockNewComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.listComments).not.toHaveBeenCalled(),
           expect(mockGithub.graphql).not.toHaveBeenCalled(),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalled(),
@@ -403,7 +406,7 @@ const mockCore = {
           (mockGithub.graphql = vi.fn().mockResolvedValue({ minimizeComment: { minimizedComment: { isMinimized: !0 } } })));
         const mockNewComment = { id: 2, html_url: "https://github.com/testowner/testrepo/issues/400#issuecomment-2" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockNewComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("minimizeComment"), expect.objectContaining({ nodeId: "IC_oldcomment1", classifier: "OUTDATED" })),
           delete process.env.GITHUB_WORKFLOW,
           delete process.env.GH_AW_HIDE_OLDER_COMMENTS,
@@ -420,7 +423,7 @@ const mockCore = {
           (mockGithub.graphql = vi.fn()));
         const mockNewComment = { id: 3, html_url: "https://github.com/testowner/testrepo/issues/500#issuecomment-3" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockNewComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.rest.issues.listComments).not.toHaveBeenCalled(),
           expect(mockGithub.graphql).not.toHaveBeenCalled(),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalled(),
@@ -439,7 +442,7 @@ const mockCore = {
           (mockGithub.graphql = vi.fn().mockResolvedValue({ minimizeComment: { minimizedComment: { isMinimized: !0 } } })));
         const mockNewComment = { id: 4, html_url: "https://github.com/testowner/testrepo/issues/600#issuecomment-4" };
         (mockGithub.rest.issues.createComment.mockResolvedValue({ data: mockNewComment }),
-          await eval(`(async () => { ${createCommentScript} })()`),
+          await eval(`(async () => { ${createCommentScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("minimizeComment"), expect.objectContaining({ nodeId: "IC_oldcomment1", classifier: "OUTDATED" })),
           delete process.env.GITHUB_WORKFLOW,
           delete process.env.GH_AW_HIDE_OLDER_COMMENTS,
diff --git a/pkg/workflow/js/add_labels.cjs b/pkg/workflow/js/add_labels.cjs
index 48f20ec479..cd76c83a5a 100644
--- a/pkg/workflow/js/add_labels.cjs
+++ b/pkg/workflow/js/add_labels.cjs
@@ -122,4 +122,5 @@ ${labelsListMarkdown}
     core.setFailed(`Failed to add labels: ${errorMessage}`);
   }
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/add_labels.test.cjs b/pkg/workflow/js/add_labels.test.cjs
index f750206e14..60a649629f 100644
--- a/pkg/workflow/js/add_labels.test.cjs
+++ b/pkg/workflow/js/add_labels.test.cjs
@@ -58,14 +58,14 @@ const mockCore = {
         (it("should skip when no agent output is provided", async () => {
           ((process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
             delete process.env.GH_AW_AGENT_OUTPUT,
-            await eval(`(async () => { ${addLabelsScript} })()`),
+            await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"),
             expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
         }),
           it("should skip when agent output is empty", async () => {
             (setAgentOutput(""),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
@@ -74,7 +74,7 @@ const mockCore = {
               delete process.env.GH_AW_LABELS_ALLOWED,
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("No label addition restrictions - any label additions are allowed"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement", "custom-label"] }));
           }),
@@ -83,7 +83,7 @@ const mockCore = {
               (process.env.GH_AW_LABELS_ALLOWED = "   "),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("No label addition restrictions - any label additions are allowed"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement", "custom-label"] }));
           }),
@@ -92,7 +92,7 @@ const mockCore = {
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(`Allowed label additions: ${JSON.stringify(["bug", "enhancement"])}`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }));
           }),
@@ -100,7 +100,7 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "invalid"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Invalid max value: invalid. Must be a positive integer"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
@@ -108,7 +108,7 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "0"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Invalid max value: 0. Must be a positive integer"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
@@ -116,7 +116,7 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement", "feature", "documentation"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement,feature,documentation"),
               delete process.env.GH_AW_LABELS_MAX_COUNT,
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Max count: 1"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug"] }));
           }));
@@ -126,7 +126,7 @@ const mockCore = {
           (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
             (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
             (global.context.eventName = "push"),
-            await eval(`(async () => { ${addLabelsScript} })()`),
+            await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in issue or pull request context, skipping label addition'),
             expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
         }),
@@ -134,7 +134,7 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (global.context.eventName = "issue_comment"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalled());
           }),
           it("should work with pull_request event", async () => {
@@ -143,7 +143,7 @@ const mockCore = {
               (global.context.eventName = "pull_request"),
               (global.context.payload.pull_request = { number: 456 }),
               delete global.context.payload.issue,
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 456, labels: ["bug"] }));
           }),
           it("should work with pull_request_review event", async () => {
@@ -152,7 +152,7 @@ const mockCore = {
               (global.context.eventName = "pull_request_review"),
               (global.context.payload.pull_request = { number: 789 }),
               delete global.context.payload.issue,
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 789, labels: ["bug"] }));
           }),
           it("should fail when issue context detected but no issue in payload", async () => {
@@ -160,7 +160,7 @@ const mockCore = {
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (global.context.eventName = "issues"),
               delete global.context.payload.issue,
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Issue context detected but no issue found in payload"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
@@ -170,7 +170,7 @@ const mockCore = {
               (global.context.eventName = "pull_request"),
               delete global.context.payload.issue,
               delete global.context.payload.pull_request,
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Pull request context detected but no pull request found in payload"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }));
@@ -180,7 +180,7 @@ const mockCore = {
           (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement", "documentation"] }] }),
             (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement,feature"),
             (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
-            await eval(`(async () => { ${addLabelsScript} })()`),
+            await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
             expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }),
             expect(mockCore.setOutput).toHaveBeenCalledWith("labels_added", "bug\nenhancement"),
             expect(mockCore.summary.addRaw).toHaveBeenCalled(),
@@ -190,13 +190,13 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }));
           }),
           it("should fail when line starts with dash (removal indication)", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "-enhancement"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Label removal is not permitted. Found line starting with '-': -enhancement"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
@@ -204,21 +204,21 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement", "bug", "enhancement"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }));
           }),
           it("should enforce max count limit", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement", "feature", "documentation", "question"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement,feature,documentation,question"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "2"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Too many labels (5), limiting to 2"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }));
           }),
           it("should skip when no valid labels found", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["invalid", "another-invalid"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("No labels to add"),
               expect(mockCore.setOutput).toHaveBeenCalledWith("labels_added", ""),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("No labels were added")),
@@ -231,7 +231,7 @@ const mockCore = {
             (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement,feature"),
             (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
             mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-            await eval(`(async () => { ${addLabelsScript} })()`),
+            await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
             expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }),
             expect(mockCore.info).toHaveBeenCalledWith("Successfully added 2 labels to issue #123"),
             expect(mockCore.setOutput).toHaveBeenCalledWith("labels_added", "bug\nenhancement"));
@@ -245,7 +245,7 @@ const mockCore = {
               (global.context.payload.pull_request = { number: 456 }),
               delete global.context.payload.issue,
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Successfully added 1 labels to pull request #456"));
             const summaryCall = mockCore.summary.addRaw.mock.calls.find(call => call[0].includes("Successfully added 1 label(s) to pull request #456"));
             expect(summaryCall).toBeDefined();
@@ -255,7 +255,7 @@ const mockCore = {
             const apiError = new Error("Label does not exist");
             mockGithub.rest.issues.addLabels.mockRejectedValue(apiError);
             const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
-            (await eval(`(async () => { ${addLabelsScript} })()`),
+            (await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.error).toHaveBeenCalledWith("Failed to add labels: Label does not exist"),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to add labels: Label does not exist"));
           }),
@@ -264,7 +264,7 @@ const mockCore = {
             const stringError = "Something went wrong";
             mockGithub.rest.issues.addLabels.mockRejectedValue(stringError);
             const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
-            (await eval(`(async () => { ${addLabelsScript} })()`),
+            (await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.error).toHaveBeenCalledWith("Failed to add labels: Something went wrong"),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to add labels: Something went wrong"));
           }));
@@ -273,28 +273,28 @@ const mockCore = {
         (it("should log agent output content length", async () => {
           (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
             (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
-            await eval(`(async () => { ${addLabelsScript} })()`),
+            await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith("Agent output content length: 64"));
         }),
           it("should log allowed labels and max count", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement,feature"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "5"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(`Allowed label additions: ${JSON.stringify(["bug", "enhancement", "feature"])}`),
               expect(mockCore.info).toHaveBeenCalledWith("Max count: 5"));
           }),
           it("should log requested labels", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement", "invalid"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(`Requested labels: ${JSON.stringify(["bug", "enhancement", "invalid"])}`));
           }),
           it("should log final labels being added", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(`Adding 2 labels to issue #123: ${JSON.stringify(["bug", "enhancement"])}`));
           }));
       }),
@@ -303,21 +303,21 @@ const mockCore = {
           (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement"] }] }),
             (process.env.GH_AW_LABELS_ALLOWED = " bug , enhancement , feature "),
             (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
-            await eval(`(async () => { ${addLabelsScript} })()`),
+            await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith(`Allowed label additions: ${JSON.stringify(["bug", "enhancement", "feature"])}`),
             expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }));
         }),
           it("should handle empty entries in allowed labels", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,,enhancement,"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(`Allowed label additions: ${JSON.stringify(["bug", "enhancement"])}`));
           }),
           it("should handle single label output", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"] }] }),
               (process.env.GH_AW_LABELS_ALLOWED = "bug,enhancement"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug"] }),
               expect(mockCore.setOutput).toHaveBeenCalledWith("labels_added", "bug"));
           }),
@@ -325,14 +325,14 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "enhancement", "bug", "automation", "enhancement"] }] }),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement", "automation"] }));
           }),
           it("should sanitize labels by removing problematic characters", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug<script>", "enhancement@user", "automation&test", "normal-label"] }] }),
               (process.env.GH_AW_LABELS_MAX_COUNT = "5"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`));
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`));
             const callArgs = mockGithub.rest.issues.addLabels.mock.calls[0][0];
             (expect(callArgs.labels).toContain("bugscript"),
               expect(callArgs.labels).toContain("enhancement@user"),
@@ -345,7 +345,7 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: [longLabel, "short"] }] }),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`));
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`));
             const callArgs = mockGithub.rest.issues.addLabels.mock.calls[0][0];
             (expect(callArgs.labels[0]).toHaveLength(64), expect(callArgs.labels[0]).toBe("a".repeat(64)), expect(callArgs.labels[1]).toBe("short"));
           }),
@@ -353,7 +353,7 @@ const mockCore = {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug", "", "   ", "enhancement", null, void 0, 0, !1] }] }),
               (process.env.GH_AW_LABELS_MAX_COUNT = "10"),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, labels: ["bug", "enhancement"] }));
           }));
       }),
@@ -366,7 +366,7 @@ const mockCore = {
               (global.context.eventName = "issues"),
               (global.context.payload.issue = { number: 456 }),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Labels target configuration: triggering"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 456, labels: ["bug"] }));
           }),
@@ -376,7 +376,7 @@ const mockCore = {
               (global.context.eventName = "issues"),
               (global.context.payload.issue = { number: 789 }),
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Labels target configuration: triggering"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 789, labels: ["enhancement"] }));
           }),
@@ -386,7 +386,7 @@ const mockCore = {
               (global.context.eventName = "push"),
               delete global.context.payload.issue,
               delete global.context.payload.pull_request,
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in issue or pull request context, skipping label addition'),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
@@ -397,7 +397,7 @@ const mockCore = {
               (global.context.eventName = "push"),
               delete global.context.payload.issue,
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Labels target configuration: 999"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 999, labels: ["bug", "urgent"] }));
           }),
@@ -407,28 +407,28 @@ const mockCore = {
               (global.context.eventName = "push"),
               delete global.context.payload.issue,
               mockGithub.rest.issues.addLabels.mockResolvedValue({}),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Labels target configuration: *"),
               expect(mockGithub.rest.issues.addLabels).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 555, labels: ["documentation"] }));
           }),
           it("should fail when target is '*' but no item_number in labels item", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"] }] }),
               (process.env.GH_AW_LABELS_TARGET = "*"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith('Target is "*" but no item_number/issue_number specified in label addition item'),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
           it("should fail when target has invalid issue number", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"] }] }),
               (process.env.GH_AW_LABELS_TARGET = "invalid"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Invalid issue number in target configuration: invalid"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }),
           it("should fail when target is '*' and issue_number in item is invalid", async () => {
             (setAgentOutput({ items: [{ type: "add_labels", labels: ["bug"], item_number: -5 }] }),
               (process.env.GH_AW_LABELS_TARGET = "*"),
-              await eval(`(async () => { ${addLabelsScript} })()`),
+              await eval(`(async () => { ${addLabelsScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Invalid item_number/issue_number/pull_request_number specified: -5"),
               expect(mockGithub.rest.issues.addLabels).not.toHaveBeenCalled());
           }));
diff --git a/pkg/workflow/js/add_reaction_and_edit_comment.cjs b/pkg/workflow/js/add_reaction_and_edit_comment.cjs
index 8be362426e..a787b02789 100644
--- a/pkg/workflow/js/add_reaction_and_edit_comment.cjs
+++ b/pkg/workflow/js/add_reaction_and_edit_comment.cjs
@@ -462,4 +462,4 @@ async function addCommentWithWorkflowLink(endpoint, runUrl, eventName) {
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/add_reaction_and_edit_comment.test.cjs b/pkg/workflow/js/add_reaction_and_edit_comment.test.cjs
index 8b73e8fc6c..650bd1e48a 100644
--- a/pkg/workflow/js/add_reaction_and_edit_comment.test.cjs
+++ b/pkg/workflow/js/add_reaction_and_edit_comment.test.cjs
@@ -51,7 +51,7 @@ const mockCore = {
             (global.context.eventName = "issues"),
             (global.context.payload.issue = { number: 123 }),
             mockGithub.request.mockResolvedValue({ data: { id: 456 } }),
-            await eval(`(async () => { ${reactionScript} })()`),
+            await eval(`(async () => { ${reactionScript}; await main(); })()`),
             expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/123/reactions", expect.objectContaining({ content: "eyes" })),
             expect(mockCore.setOutput).toHaveBeenCalledWith("reaction-id", "456"));
         }),
@@ -59,7 +59,7 @@ const mockCore = {
             ((process.env.GH_AW_REACTION = "invalid"),
               (global.context.eventName = "issues"),
               (global.context.payload.issue = { number: 123 }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Invalid reaction type: invalid")),
               expect(mockGithub.request).not.toHaveBeenCalled());
           }));
@@ -71,7 +71,7 @@ const mockCore = {
             (global.context.eventName = "pull_request"),
             (global.context.payload = { pull_request: { number: 456 }, repository: { html_url: "https://github.com/testowner/testrepo" } }),
             mockGithub.request.mockResolvedValueOnce({ data: { id: 789 } }).mockResolvedValueOnce({ data: { id: 999, html_url: "https://github.com/testowner/testrepo/pull/456#issuecomment-999" } }),
-            await eval(`(async () => { ${reactionScript} })()`),
+            await eval(`(async () => { ${reactionScript}; await main(); })()`),
             expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/456/reactions", expect.objectContaining({ content: "heart" })),
             expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/456/comments", expect.objectContaining({ body: expect.stringContaining("be settin' sail on this pull request") })),
             expect(mockCore.setOutput).toHaveBeenCalledWith("reaction-id", "789"),
@@ -87,7 +87,7 @@ const mockCore = {
             mockGithub.graphql
               .mockResolvedValueOnce({ repository: { discussion: { id: "D_kwDOABcD1M4AaBbC", url: "https://github.com/testowner/testrepo/discussions/10" } } })
               .mockResolvedValueOnce({ addReaction: { reaction: { id: "MDg6UmVhY3Rpb24xMjM0NTY3ODk=", content: "ROCKET" } } }),
-            await eval(`(async () => { ${reactionScript} })()`),
+            await eval(`(async () => { ${reactionScript}; await main(); })()`),
             expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("query"), expect.objectContaining({ owner: "testowner", repo: "testrepo", num: 10 })),
             expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation"), expect.objectContaining({ subjectId: "D_kwDOABcD1M4AaBbC", content: "ROCKET" })),
             expect(mockCore.setOutput).toHaveBeenCalledWith("reaction-id", "MDg6UmVhY3Rpb24xMjM0NTY3ODk="));
@@ -111,7 +111,7 @@ const mockCore = {
                 mockGithub.graphql
                   .mockResolvedValueOnce({ repository: { discussion: { id: "D_kwDOABcD1M4AaBbC", url: "https://github.com/testowner/testrepo/discussions/10" } } })
                   .mockResolvedValueOnce({ addReaction: { reaction: { id: "MDg6UmVhY3Rpb24xMjM0NTY3ODk=", content: test.expected } } }),
-                await eval(`(async () => { ${reactionScript} })()`),
+                await eval(`(async () => { ${reactionScript}; await main(); })()`),
                 expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation"), expect.objectContaining({ content: test.expected })));
           }));
       }),
@@ -125,7 +125,7 @@ const mockCore = {
               repository: { html_url: "https://github.com/testowner/testrepo" },
             }),
             mockGithub.graphql.mockResolvedValueOnce({ addReaction: { reaction: { id: "MDg6UmVhY3Rpb24xMjM0NTY3ODk=", content: "HEART" } } }),
-            await eval(`(async () => { ${reactionScript} })()`),
+            await eval(`(async () => { ${reactionScript}; await main(); })()`),
             expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation"), expect.objectContaining({ subjectId: "DC_kwDOABcD1M4AaBbC", content: "HEART" })),
             expect(mockCore.setOutput).toHaveBeenCalledWith("reaction-id", "MDg6UmVhY3Rpb24xMjM0NTY3ODk="));
         }),
@@ -133,7 +133,7 @@ const mockCore = {
             ((process.env.GH_AW_REACTION = "eyes"),
               (global.context.eventName = "discussion_comment"),
               (global.context.payload = { discussion: { number: 10 }, comment: { id: 123 }, repository: { html_url: "https://github.com/testowner/testrepo" } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Discussion comment node ID not found in event payload"),
               expect(mockGithub.graphql).not.toHaveBeenCalled());
           }));
@@ -145,7 +145,7 @@ const mockCore = {
             (global.context.eventName = "issues"),
             (global.context.payload = { issue: { number: 123 }, repository: { html_url: "https://github.com/testowner/testrepo" } }),
             mockGithub.request.mockResolvedValueOnce({ data: { id: 456 } }).mockResolvedValueOnce({ data: { id: 789, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-789" } }),
-            await eval(`(async () => { ${reactionScript} })()`),
+            await eval(`(async () => { ${reactionScript}; await main(); })()`),
             expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/123/reactions", expect.objectContaining({ content: "eyes" })),
             expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/123/comments", expect.objectContaining({ body: expect.stringContaining("be settin' sail on this issue") })),
             expect(mockCore.setOutput).toHaveBeenCalledWith("reaction-id", "456"),
@@ -158,7 +158,7 @@ const mockCore = {
               (global.context.eventName = "issue_comment"),
               (global.context.payload = { issue: { number: 123 }, comment: { id: 456 }, repository: { html_url: "https://github.com/testowner/testrepo" } }),
               mockGithub.request.mockResolvedValueOnce({ data: { id: 111 } }).mockResolvedValueOnce({ data: { id: 789, html_url: "https://github.com/testowner/testrepo/issues/123#issuecomment-789" } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/123/comments", expect.objectContaining({ body: expect.stringContaining("be settin' sail on this issue comment") })),
               expect(mockGithub.request).not.toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/comments/456", expect.anything()),
               expect(mockCore.setOutput).toHaveBeenCalledWith("comment-id", "789"),
@@ -171,7 +171,7 @@ const mockCore = {
               (global.context.eventName = "pull_request_review_comment"),
               (global.context.payload = { pull_request: { number: 456 }, comment: { id: 789 }, repository: { html_url: "https://github.com/testowner/testrepo" } }),
               mockGithub.request.mockResolvedValueOnce({ data: { id: 222 } }).mockResolvedValueOnce({ data: { id: 999, html_url: "https://github.com/testowner/testrepo/pull/456#discussion_r999" } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith("POST /repos/testowner/testrepo/issues/456/comments", expect.objectContaining({ body: expect.stringContaining("be settin' sail on this pull request review comment") })),
               expect(mockGithub.request).not.toHaveBeenCalledWith("POST /repos/testowner/testrepo/pulls/comments/789", expect.anything()),
               expect(mockCore.setOutput).toHaveBeenCalledWith("comment-id", "999"),
@@ -188,7 +188,7 @@ const mockCore = {
                 .mockResolvedValueOnce({ addReaction: { reaction: { id: "MDg6UmVhY3Rpb24xMjM0NTY3ODk=", content: "EYES" } } })
                 .mockResolvedValueOnce({ repository: { discussion: { id: "D_kwDOABcD1M4AaBbC" } } })
                 .mockResolvedValueOnce({ addDiscussionComment: { comment: { id: "DC_kwDOABcD1M4AaBbE", url: "https://github.com/testowner/testrepo/discussions/10#discussioncomment-999" } } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockGithub.graphql).toHaveBeenCalledTimes(4),
               expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("addDiscussionComment"), expect.objectContaining({ dId: "D_kwDOABcD1M4AaBbC", body: expect.stringContaining("be settin' sail on this discussion") })),
               expect(mockCore.setOutput).toHaveBeenCalledWith("reaction-id", "MDg6UmVhY3Rpb24xMjM0NTY3ODk="),
@@ -204,7 +204,7 @@ const mockCore = {
                 .mockResolvedValueOnce({ addReaction: { reaction: { id: "MDg6UmVhY3Rpb24xMjM0NTY3ODk=", content: "EYES" } } })
                 .mockResolvedValueOnce({ repository: { discussion: { id: "D_kwDOABcD1M4AaBbC" } } })
                 .mockResolvedValueOnce({ addDiscussionComment: { comment: { id: "DC_kwDOABcD1M4AaBbE", url: "https://github.com/testowner/testrepo/discussions/10#discussioncomment-789" } } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockGithub.graphql).toHaveBeenCalledWith(
                 expect.stringContaining("addDiscussionComment"),
                 expect.objectContaining({ dId: "D_kwDOABcD1M4AaBbC", body: expect.stringContaining("be settin' sail on this discussion comment"), replyToId: "DC_kwDOABcD1M4AaBbC" })
@@ -219,21 +219,21 @@ const mockCore = {
           ((process.env.GH_AW_REACTION = "eyes"),
             (global.context.eventName = "discussion"),
             (global.context.payload = { repository: { html_url: "https://github.com/testowner/testrepo" } }),
-            await eval(`(async () => { ${reactionScript} })()`),
+            await eval(`(async () => { ${reactionScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith("Discussion number not found in event payload"));
         }),
           it("should handle missing discussion or comment info for discussion_comment", async () => {
             ((process.env.GH_AW_REACTION = "eyes"),
               (global.context.eventName = "discussion_comment"),
               (global.context.payload = { discussion: { number: 10 }, repository: { html_url: "https://github.com/testowner/testrepo" } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Discussion or comment information not found in event payload"));
           }),
           it("should handle unsupported event types", async () => {
             ((process.env.GH_AW_REACTION = "eyes"),
               (global.context.eventName = "push"),
               (global.context.payload = { repository: { html_url: "https://github.com/testowner/testrepo" } }),
-              await eval(`(async () => { ${reactionScript} })()`),
+              await eval(`(async () => { ${reactionScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Unsupported event type: push"));
           }));
       }));
diff --git a/pkg/workflow/js/add_reviewer.cjs b/pkg/workflow/js/add_reviewer.cjs
index f140ca8c75..9ecaaf7af9 100644
--- a/pkg/workflow/js/add_reviewer.cjs
+++ b/pkg/workflow/js/add_reviewer.cjs
@@ -129,4 +129,4 @@ ${reviewersListMarkdown}
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/add_reviewer.test.cjs b/pkg/workflow/js/add_reviewer.test.cjs
index d2ecfcb8a8..6cceec7e9e 100644
--- a/pkg/workflow/js/add_reviewer.test.cjs
+++ b/pkg/workflow/js/add_reviewer.test.cjs
@@ -88,7 +88,8 @@ describe("add_reviewer", () => {
   it("should handle missing GH_AW_AGENT_OUTPUT", async () => {
     delete process.env.GH_AW_AGENT_OUTPUT;
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found");
   });
@@ -100,7 +101,8 @@ describe("add_reviewer", () => {
     fs.writeFileSync(outputFile, JSON.stringify(agentOutput));
     process.env.GH_AW_AGENT_OUTPUT = outputFile;
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockCore.warning).toHaveBeenCalledWith("No add-reviewer item found in agent output");
   });
@@ -119,7 +121,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_REVIEWERS_MAX_COUNT = "3";
     process.env.GH_AW_REVIEWERS_TARGET = "triggering";
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockGithub.rest.pulls.requestReviewers).toHaveBeenCalledWith({
       owner: "testowner",
@@ -144,7 +147,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_AGENT_OUTPUT = outputFile;
     process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true";
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockCore.summary.addRaw).toHaveBeenCalled();
     expect(mockCore.summary.write).toHaveBeenCalled();
@@ -165,7 +169,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_REVIEWERS_ALLOWED = "octocat,github";
     process.env.GH_AW_REVIEWERS_MAX_COUNT = "3";
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockGithub.rest.pulls.requestReviewers).toHaveBeenCalledWith({
       owner: "testowner",
@@ -188,7 +193,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_AGENT_OUTPUT = outputFile;
     process.env.GH_AW_REVIEWERS_MAX_COUNT = "2";
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockGithub.rest.pulls.requestReviewers).toHaveBeenCalledWith({
       owner: "testowner",
@@ -219,7 +225,8 @@ describe("add_reviewer", () => {
       },
     };
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining('Target is "triggering" but not running in pull request context'));
     expect(mockGithub.rest.pulls.requestReviewers).not.toHaveBeenCalled();
@@ -239,7 +246,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_AGENT_OUTPUT = outputFile;
     process.env.GH_AW_REVIEWERS_TARGET = "*";
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockGithub.rest.pulls.requestReviewers).toHaveBeenCalledWith({
       owner: "testowner",
@@ -262,7 +270,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_AGENT_OUTPUT = outputFile;
     mockGithub.rest.pulls.requestReviewers.mockRejectedValueOnce(new Error("API Error"));
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Failed to add reviewers"));
     expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Failed to add reviewers"));
@@ -281,7 +290,8 @@ describe("add_reviewer", () => {
     process.env.GH_AW_AGENT_OUTPUT = outputFile;
     process.env.GH_AW_REVIEWERS_MAX_COUNT = "10"; // Set high max to test deduplication
 
-    await import("./add_reviewer.cjs");
+    const { main } = await import("./add_reviewer.cjs");
+    await main();
 
     expect(mockGithub.rest.pulls.requestReviewers).toHaveBeenCalledWith({
       owner: "testowner",
diff --git a/pkg/workflow/js/assign_issue.test.cjs b/pkg/workflow/js/assign_issue.test.cjs
index 4bb070d5e7..a3aa656443 100644
--- a/pkg/workflow/js/assign_issue.test.cjs
+++ b/pkg/workflow/js/assign_issue.test.cjs
@@ -47,7 +47,7 @@ const mockCore = {
           ((process.env.ASSIGNEE = "test-user"),
             (process.env.ISSUE_NUMBER = "123"),
             delete process.env.GH_TOKEN,
-            await eval(`(async () => { ${assignIssueScript} })()`),
+            await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_TOKEN environment variable is required but not set")),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("https://githubnext.github.io/gh-aw/reference/safe-outputs/#assigning-issues-to-copilot")),
             expect(mockExec.exec).not.toHaveBeenCalled());
@@ -56,7 +56,7 @@ const mockCore = {
             ((process.env.GH_TOKEN = "   "),
               (process.env.ASSIGNEE = "test-user"),
               (process.env.ISSUE_NUMBER = "123"),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_TOKEN environment variable is required but not set")),
               expect(mockExec.exec).not.toHaveBeenCalled());
           }),
@@ -64,7 +64,7 @@ const mockCore = {
             ((process.env.GH_TOKEN = "ghp_test123"),
               (process.env.ISSUE_NUMBER = "123"),
               delete process.env.ASSIGNEE,
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("ASSIGNEE environment variable is required but not set"),
               expect(mockExec.exec).not.toHaveBeenCalled());
           }),
@@ -72,7 +72,7 @@ const mockCore = {
             ((process.env.GH_TOKEN = "ghp_test123"),
               (process.env.ASSIGNEE = "   "),
               (process.env.ISSUE_NUMBER = "123"),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("ASSIGNEE environment variable is required but not set"),
               expect(mockExec.exec).not.toHaveBeenCalled());
           }),
@@ -80,7 +80,7 @@ const mockCore = {
             ((process.env.GH_TOKEN = "ghp_test123"),
               (process.env.ASSIGNEE = "test-user"),
               delete process.env.ISSUE_NUMBER,
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("ISSUE_NUMBER environment variable is required but not set"),
               expect(mockExec.exec).not.toHaveBeenCalled());
           }),
@@ -88,7 +88,7 @@ const mockCore = {
             ((process.env.GH_TOKEN = "ghp_test123"),
               (process.env.ASSIGNEE = "test-user"),
               (process.env.ISSUE_NUMBER = "   "),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith("ISSUE_NUMBER environment variable is required but not set"),
               expect(mockExec.exec).not.toHaveBeenCalled());
           }));
@@ -99,7 +99,7 @@ const mockCore = {
             (process.env.ASSIGNEE = "test-user"),
             (process.env.ISSUE_NUMBER = "456"),
             mockExec.exec.mockResolvedValue(0),
-            await eval(`(async () => { ${assignIssueScript} })()`),
+            await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith("Assigning issue #456 to test-user"),
             expect(mockExec.exec).toHaveBeenCalledWith("gh", ["issue", "edit", "456", "--add-assignee", "test-user"], expect.objectContaining({ env: expect.objectContaining({ GH_TOKEN: "ghp_test123" }) })),
             expect(mockCore.info).toHaveBeenCalledWith("✅ Successfully assigned issue #456 to test-user"),
@@ -112,7 +112,7 @@ const mockCore = {
               (process.env.ASSIGNEE = "  test-user  "),
               (process.env.ISSUE_NUMBER = "  123  "),
               mockExec.exec.mockResolvedValue(0),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Assigning issue #123 to test-user"),
               expect(mockExec.exec).toHaveBeenCalledWith("gh", ["issue", "edit", "123", "--add-assignee", "test-user"], expect.any(Object)),
               expect(mockCore.setFailed).not.toHaveBeenCalled());
@@ -122,7 +122,7 @@ const mockCore = {
               (process.env.ASSIGNEE = "test-user"),
               (process.env.ISSUE_NUMBER = "123"),
               mockExec.exec.mockResolvedValue(0),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("## Issue Assignment")),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("Successfully assigned issue #123 to `test-user`")),
               expect(mockCore.summary.write).toHaveBeenCalled());
@@ -133,7 +133,7 @@ const mockCore = {
           ((process.env.GH_TOKEN = "ghp_test123"), (process.env.ASSIGNEE = "test-user"), (process.env.ISSUE_NUMBER = "999"));
           const testError = new Error("User not found");
           (mockExec.exec.mockRejectedValue(testError),
-            await eval(`(async () => { ${assignIssueScript} })()`),
+            await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
             expect(mockCore.error).toHaveBeenCalledWith("Failed to assign issue: User not found"),
             expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to assign issue #999 to test-user: User not found"));
         }),
@@ -141,14 +141,14 @@ const mockCore = {
             ((process.env.GH_TOKEN = "ghp_test123"), (process.env.ASSIGNEE = "test-user"), (process.env.ISSUE_NUMBER = "999"));
             const stringError = "Command failed";
             (mockExec.exec.mockRejectedValue(stringError),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockCore.error).toHaveBeenCalledWith("Failed to assign issue: Command failed"),
               expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to assign issue #999 to test-user: Command failed"));
           }),
           it("should handle top-level errors with catch handler", async () => {
             ((process.env.GH_TOKEN = "ghp_test123"), (process.env.ASSIGNEE = "test-user"), (process.env.ISSUE_NUMBER = "123"));
             const uncaughtError = new Error("Uncaught error");
-            (mockExec.exec.mockRejectedValue(uncaughtError), await eval(`(async () => { ${assignIssueScript} })()`), expect(mockCore.setFailed).toHaveBeenCalled());
+            (mockExec.exec.mockRejectedValue(uncaughtError), await eval(`(async () => { ${assignIssueScript}; await main(); })()`), expect(mockCore.setFailed).toHaveBeenCalled());
           }));
       }),
       describe("Edge cases for regular users", () => {
@@ -157,7 +157,7 @@ const mockCore = {
             (process.env.ASSIGNEE = "test-user"),
             (process.env.ISSUE_NUMBER = "123"),
             mockExec.exec.mockResolvedValue(0),
-            await eval(`(async () => { ${assignIssueScript} })()`),
+            await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
             expect(mockExec.exec).toHaveBeenCalledWith("gh", ["issue", "edit", "123", "--add-assignee", "test-user"], expect.any(Object)));
         }),
           it("should pass through GH_TOKEN in exec environment", async () => {
@@ -166,7 +166,7 @@ const mockCore = {
               (process.env.ISSUE_NUMBER = "123"),
               (process.env.OTHER_VAR = "other_value"),
               mockExec.exec.mockResolvedValue(0),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockExec.exec).toHaveBeenCalledWith("gh", ["issue", "edit", "123", "--add-assignee", "test-user"], { env: expect.objectContaining({ GH_TOKEN: "ghp_test123", OTHER_VAR: "other_value" }) }));
           }),
           it("should handle special characters in assignee name", async () => {
@@ -174,12 +174,12 @@ const mockCore = {
               (process.env.ASSIGNEE = "user-with-dash"),
               (process.env.ISSUE_NUMBER = "123"),
               mockExec.exec.mockResolvedValue(0),
-              await eval(`(async () => { ${assignIssueScript} })()`),
+              await eval(`(async () => { ${assignIssueScript}; await main(); })()`),
               expect(mockExec.exec).toHaveBeenCalledWith("gh", ["issue", "edit", "123", "--add-assignee", "user-with-dash"], expect.any(Object)),
               expect(mockCore.setFailed).not.toHaveBeenCalled());
           }),
           it("should include documentation link in error message", async () => {
-            (delete process.env.GH_TOKEN, (process.env.ASSIGNEE = "test-user"), (process.env.ISSUE_NUMBER = "123"), await eval(`(async () => { ${assignIssueScript} })()`));
+            (delete process.env.GH_TOKEN, (process.env.ASSIGNEE = "test-user"), (process.env.ISSUE_NUMBER = "123"), await eval(`(async () => { ${assignIssueScript}; await main(); })()`));
             const failedCall = mockCore.setFailed.mock.calls[0][0];
             expect(failedCall).toContain("https://githubnext.github.io/gh-aw/reference/safe-outputs/#assigning-issues-to-copilot");
           }));
diff --git a/pkg/workflow/js/assign_milestone.cjs b/pkg/workflow/js/assign_milestone.cjs
index 1853922cf0..0b9c88cba6 100644
--- a/pkg/workflow/js/assign_milestone.cjs
+++ b/pkg/workflow/js/assign_milestone.cjs
@@ -166,4 +166,4 @@ async function main() {
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/assign_milestone.test.cjs b/pkg/workflow/js/assign_milestone.test.cjs
index ac09bc1eee..a084fca50b 100644
--- a/pkg/workflow/js/assign_milestone.test.cjs
+++ b/pkg/workflow/js/assign_milestone.test.cjs
@@ -23,15 +23,15 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         tempFilePath && fs.existsSync(tempFilePath) && fs.unlinkSync(tempFilePath);
       }),
       it("should handle empty agent output", async () => {
-        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${assignMilestoneScript} })()`), expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No assign_milestone items found")));
+        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No assign_milestone items found")));
       }),
       it("should handle missing agent output", async () => {
-        (delete process.env.GH_AW_AGENT_OUTPUT, await eval(`(async () => { ${assignMilestoneScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
+        (delete process.env.GH_AW_AGENT_OUTPUT, await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
       }),
       it("should assign milestone successfully", async () => {
         (setAgentOutput({ items: [{ type: "assign_milestone", issue_number: 42, milestone_number: 5 }], errors: [] }),
           mockGithub.rest.issues.update.mockResolvedValue({}),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", issue_number: 42, milestone: 5 }),
           expect(mockCore.info).toHaveBeenCalledWith("Successfully assigned milestone #5 to issue #42"),
           expect(mockCore.setOutput).toHaveBeenCalledWith("assigned_milestones", "42:5"),
@@ -40,7 +40,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should handle staged mode correctly", async () => {
         ((process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
           setAgentOutput({ items: [{ type: "assign_milestone", issue_number: 42, milestone_number: 5 }], errors: [] }),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.summary.addRaw).toHaveBeenCalled());
         const summaryCall = mockCore.summary.addRaw.mock.calls[0][0];
@@ -57,7 +57,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             errors: [],
           }),
           mockGithub.rest.issues.update.mockResolvedValue({}),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledTimes(2),
           expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("Found 3 milestone assignments, but max is 2")));
       }),
@@ -71,7 +71,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             ],
           }),
           mockGithub.rest.issues.update.mockResolvedValue({}),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.listMilestones).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", state: "all", per_page: 100 }),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", issue_number: 42, milestone: 5 }));
       }),
@@ -84,7 +84,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
               { number: 6, title: "v3.0" },
             ],
           }),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining('Milestone "v3.0" (#6) is not in the allowed list')));
       }),
@@ -92,19 +92,19 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         setAgentOutput({ items: [{ type: "assign_milestone", issue_number: 42, milestone_number: 5 }], errors: [] });
         const apiError = new Error("API rate limit exceeded");
         (mockGithub.rest.issues.update.mockRejectedValue(apiError),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Failed to assign milestone #5 to issue #42")),
           expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Failed to assign 1 milestone(s)")));
       }),
       it("should handle invalid issue numbers", async () => {
         (setAgentOutput({ items: [{ type: "assign_milestone", issue_number: -1, milestone_number: 5 }], errors: [] }),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Invalid issue_number")));
       }),
       it("should handle invalid milestone numbers", async () => {
         (setAgentOutput({ items: [{ type: "assign_milestone", issue_number: 42, milestone_number: 0 }], errors: [] }),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Invalid milestone_number")));
       }),
@@ -118,7 +118,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             errors: [],
           }),
           mockGithub.rest.issues.update.mockResolvedValue({}),
-          await eval(`(async () => { ${assignMilestoneScript} })()`),
+          await eval(`(async () => { ${assignMilestoneScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledTimes(2),
           expect(mockCore.setOutput).toHaveBeenCalledWith("assigned_milestones", "1:5\n2:6"));
       }));
diff --git a/pkg/workflow/js/assign_to_agent.cjs b/pkg/workflow/js/assign_to_agent.cjs
index 94235ab486..93ced2cef1 100644
--- a/pkg/workflow/js/assign_to_agent.cjs
+++ b/pkg/workflow/js/assign_to_agent.cjs
@@ -213,6 +213,4 @@ async function main() {
   }
 }
 
-(async () => {
-  await main();
-})();
+module.exports = { main };
diff --git a/pkg/workflow/js/assign_to_user.cjs b/pkg/workflow/js/assign_to_user.cjs
index 62f1520538..ed21318148 100644
--- a/pkg/workflow/js/assign_to_user.cjs
+++ b/pkg/workflow/js/assign_to_user.cjs
@@ -128,4 +128,4 @@ ${assigneesListMarkdown}
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/check_command_position.test.cjs b/pkg/workflow/js/check_command_position.test.cjs
index 2d101bd19c..f590080e3f 100644
--- a/pkg/workflow/js/check_command_position.test.cjs
+++ b/pkg/workflow/js/check_command_position.test.cjs
@@ -42,13 +42,13 @@ const mockCore = {
         void 0 !== originalEnv.GH_AW_COMMAND ? (process.env.GH_AW_COMMAND = originalEnv.GH_AW_COMMAND) : delete process.env.GH_AW_COMMAND;
       }),
       it("should fail when GH_AW_COMMAND is not set", async () => {
-        (delete process.env.GH_AW_COMMAND, await eval(`(async () => { ${checkCommandPositionScript} })()`), expect(mockCore.setFailed).toHaveBeenCalledWith("Configuration error: GH_AW_COMMAND not specified."));
+        (delete process.env.GH_AW_COMMAND, await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`), expect(mockCore.setFailed).toHaveBeenCalledWith("Configuration error: GH_AW_COMMAND not specified."));
       }),
       it("should pass when command is the first word in issue body", async () => {
         ((process.env.GH_AW_COMMAND = "test-bot"),
           (mockContext.eventName = "issues"),
           (mockContext.payload = { issue: { body: "/test-bot please help with this issue" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Command '/test-bot' is at the start")));
       }),
@@ -56,7 +56,7 @@ const mockCore = {
         ((process.env.GH_AW_COMMAND = "test-bot"),
           (mockContext.eventName = "issues"),
           (mockContext.payload = { issue: { body: "Please help with /test-bot this issue" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "false"),
           expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("Command '/test-bot' is not the first word")));
       }),
@@ -64,14 +64,14 @@ const mockCore = {
         ((process.env.GH_AW_COMMAND = "helper"),
           (mockContext.eventName = "issue_comment"),
           (mockContext.payload = { comment: { body: "  \n  /helper analyze this code" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"));
       }),
       it("should pass for non-comment events", async () => {
         ((process.env.GH_AW_COMMAND = "test-bot"),
           (mockContext.eventName = "workflow_dispatch"),
           (mockContext.payload = {}),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("does not require command position check")));
       }),
@@ -79,14 +79,14 @@ const mockCore = {
         ((process.env.GH_AW_COMMAND = "review-bot"),
           (mockContext.eventName = "pull_request"),
           (mockContext.payload = { pull_request: { body: "/review-bot please review my changes" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"));
       }),
       it("should pass when text is empty", async () => {
         ((process.env.GH_AW_COMMAND = "test-bot"),
           (mockContext.eventName = "issues"),
           (mockContext.payload = { issue: { body: "" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No command")));
       }),
@@ -94,7 +94,7 @@ const mockCore = {
         ((process.env.GH_AW_COMMAND = "test-bot"),
           (mockContext.eventName = "issues"),
           (mockContext.payload = { issue: { body: "This is a regular issue without any command" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No command")));
       }),
@@ -102,14 +102,14 @@ const mockCore = {
         ((process.env.GH_AW_COMMAND = "discuss-bot"),
           (mockContext.eventName = "discussion"),
           (mockContext.payload = { discussion: { body: "/discuss-bot help needed here" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"));
       }),
       it("should handle discussion_comment events", async () => {
         ((process.env.GH_AW_COMMAND = "discuss-bot"),
           (mockContext.eventName = "discussion_comment"),
           (mockContext.payload = { comment: { body: "/discuss-bot analyze this" } }),
-          await eval(`(async () => { ${checkCommandPositionScript} })()`),
+          await eval(`(async () => { ${checkCommandPositionScript}; await main(); })()`),
           expect(mockCore.setOutput).toHaveBeenCalledWith("command_position_ok", "true"));
       }));
   }));
diff --git a/pkg/workflow/js/check_permissions.test.cjs b/pkg/workflow/js/check_permissions.test.cjs
index 20df38659e..b59bc1f9de 100644
--- a/pkg/workflow/js/check_permissions.test.cjs
+++ b/pkg/workflow/js/check_permissions.test.cjs
@@ -47,20 +47,20 @@ const mockCore = {
       }),
       it("should fail job when no permissions specified", async () => {
         (delete process.env.GH_AW_REQUIRED_ROLES,
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith("❌ Configuration error: Required permissions not specified. Contact repository administrator."),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).not.toHaveBeenCalled());
       }),
       it("should fail job when permissions are empty", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = ""),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith("❌ Configuration error: Required permissions not specified. Contact repository administrator."),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).not.toHaveBeenCalled());
       }),
       it("should skip validation for safe events", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin"),
           (global.context.eventName = "workflow_dispatch"),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("✅ Event workflow_dispatch does not require validation"),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).not.toHaveBeenCalled(),
           expect(mockCore.error).not.toHaveBeenCalled(),
@@ -69,7 +69,7 @@ const mockCore = {
       it("should pass validation for admin permission", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin,maintainer,write"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "admin" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' has required permissions for testowner/testrepo"),
           expect(mockCore.info).toHaveBeenCalledWith("Required permissions: admin, maintainer, write"),
@@ -81,7 +81,7 @@ const mockCore = {
       it("should pass validation for maintain permission when maintainer is required", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin,maintainer"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "maintain" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("✅ User has maintain access to repository"),
           expect(mockCore.error).not.toHaveBeenCalled(),
           expect(mockCore.warning).not.toHaveBeenCalled());
@@ -89,7 +89,7 @@ const mockCore = {
       it("should pass validation for write permission when write is required", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin,write,triage"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "write" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("✅ User has write access to repository"),
           expect(mockCore.error).not.toHaveBeenCalled(),
           expect(mockCore.warning).not.toHaveBeenCalled());
@@ -97,7 +97,7 @@ const mockCore = {
       it("should fail the job for insufficient permission", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin,maintainer"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "write" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: write"),
           expect(mockCore.warning).toHaveBeenCalledWith("User permission 'write' does not meet requirements: admin, maintainer"),
           expect(mockCore.warning).toHaveBeenCalledWith("Access denied: Only authorized users can trigger this workflow. User 'testuser' is not authorized. Required permissions: admin, maintainer"));
@@ -105,7 +105,7 @@ const mockCore = {
       it("should fail the job for read permission", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin,write"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "read" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: read"),
           expect(mockCore.warning).toHaveBeenCalledWith("User permission 'read' does not meet requirements: admin, write"),
           expect(mockCore.warning).toHaveBeenCalledWith("Access denied: Only authorized users can trigger this workflow. User 'testuser' is not authorized. Required permissions: admin, write"));
@@ -114,14 +114,14 @@ const mockCore = {
         process.env.GH_AW_REQUIRED_ROLES = "admin";
         const apiError = new Error("API Error: Not Found");
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockRejectedValue(apiError),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.warning).toHaveBeenCalledWith("Repository permission check failed: API Error: Not Found"));
       }),
       it("should handle different actor names correctly", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin"),
           (global.context.actor = "different-user"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "admin" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "different-user" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'different-user' has required permissions for testowner/testrepo"),
           expect(mockCore.error).not.toHaveBeenCalled(),
@@ -130,7 +130,7 @@ const mockCore = {
       it("should handle triage permission correctly", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin,write,triage"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "triage" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("✅ User has triage access to repository"),
           expect(mockCore.error).not.toHaveBeenCalled(),
           expect(mockCore.warning).not.toHaveBeenCalled());
@@ -138,7 +138,7 @@ const mockCore = {
       it("should handle single permission requirement", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "write"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "write" } }),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Required permissions: write"),
           expect(mockCore.info).toHaveBeenCalledWith("✅ User has write access to repository"),
           expect(mockCore.error).not.toHaveBeenCalled(),
@@ -147,7 +147,7 @@ const mockCore = {
       it("should skip validation for schedule events", async () => {
         ((process.env.GH_AW_REQUIRED_ROLES = "admin"),
           (global.context.eventName = "schedule"),
-          await eval(`(async () => { ${checkPermissionsScript} })()`),
+          await eval(`(async () => { ${checkPermissionsScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("✅ Event schedule does not require validation"),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).not.toHaveBeenCalled());
       }));
diff --git a/pkg/workflow/js/check_skip_if_match.test.cjs b/pkg/workflow/js/check_skip_if_match.test.cjs
index 5ff278d416..92713d1446 100644
--- a/pkg/workflow/js/check_skip_if_match.test.cjs
+++ b/pkg/workflow/js/check_skip_if_match.test.cjs
@@ -51,14 +51,14 @@ const mockCore = {
         (it("should fail if GH_AW_SKIP_QUERY is not set", async () => {
           (delete process.env.GH_AW_SKIP_QUERY,
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
-            await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+            await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_AW_SKIP_QUERY not specified")),
             expect(mockCore.setOutput).not.toHaveBeenCalled());
         }),
           it("should fail if GH_AW_WORKFLOW_NAME is not set", async () => {
             ((process.env.GH_AW_SKIP_QUERY = "is:issue is:open"),
               delete process.env.GH_AW_WORKFLOW_NAME,
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_AW_WORKFLOW_NAME not specified")),
               expect(mockCore.setOutput).not.toHaveBeenCalled());
           }));
@@ -68,7 +68,7 @@ const mockCore = {
           ((process.env.GH_AW_SKIP_QUERY = "is:issue is:open label:nonexistent"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 0, items: [] } }),
-            await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+            await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
             expect(mockGithub.rest.search.issuesAndPullRequests).toHaveBeenCalledWith({ q: "is:issue is:open label:nonexistent repo:testowner/testrepo", per_page: 1 }),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("below threshold")),
             expect(mockCore.setOutput).toHaveBeenCalledWith("skip_check_ok", "true"),
@@ -80,7 +80,7 @@ const mockCore = {
           ((process.env.GH_AW_SKIP_QUERY = "is:issue is:open label:bug"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 5, items: [{ id: 1, title: "Test Issue" }] } }),
-            await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+            await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
             expect(mockGithub.rest.search.issuesAndPullRequests).toHaveBeenCalledWith({ q: "is:issue is:open label:bug repo:testowner/testrepo", per_page: 1 }),
             expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("Skip condition matched")),
             expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("5 items found")),
@@ -91,7 +91,7 @@ const mockCore = {
             ((process.env.GH_AW_SKIP_QUERY = "is:pr is:open"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 1, items: [{ id: 1, title: "Test PR" }] } }),
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("1 items found")),
               expect(mockCore.setOutput).toHaveBeenCalledWith("skip_check_ok", "false"));
           }));
@@ -101,7 +101,7 @@ const mockCore = {
           ((process.env.GH_AW_SKIP_QUERY = "is:issue"), (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"));
           const errorMessage = "API rate limit exceeded";
           (mockGithub.rest.search.issuesAndPullRequests.mockRejectedValue(new Error(errorMessage)),
-            await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+            await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Failed to execute search query")),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining(errorMessage)),
             expect(mockCore.setOutput).not.toHaveBeenCalled());
@@ -112,7 +112,7 @@ const mockCore = {
           ((process.env.GH_AW_SKIP_QUERY = "is:issue label:enhancement"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 0, items: [] } }),
-            await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+            await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
             expect(mockGithub.rest.search.issuesAndPullRequests).toHaveBeenCalledWith({ q: "is:issue label:enhancement repo:testowner/testrepo", per_page: 1 }));
         });
       }),
@@ -122,7 +122,7 @@ const mockCore = {
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             delete process.env.GH_AW_SKIP_MAX_MATCHES,
             mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 1, items: [{ id: 1 }] } }),
-            await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+            await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("threshold: 1")),
             expect(mockCore.setOutput).toHaveBeenCalledWith("skip_check_ok", "false"));
         }),
@@ -131,7 +131,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_SKIP_MAX_MATCHES = "3"),
               mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 3, items: [{ id: 1 }] } }),
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("3 items found")),
               expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("threshold: 3")),
               expect(mockCore.setOutput).toHaveBeenCalledWith("skip_check_ok", "false"));
@@ -141,7 +141,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_SKIP_MAX_MATCHES = "2"),
               mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 5, items: [{ id: 1 }] } }),
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("5 items found")),
               expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("threshold: 2")),
               expect(mockCore.setOutput).toHaveBeenCalledWith("skip_check_ok", "false"));
@@ -151,7 +151,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_SKIP_MAX_MATCHES = "5"),
               mockGithub.rest.search.issuesAndPullRequests.mockResolvedValue({ data: { total_count: 2, items: [{ id: 1 }] } }),
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("below threshold of 5")),
               expect(mockCore.setOutput).toHaveBeenCalledWith("skip_check_ok", "true"),
               expect(mockCore.warning).not.toHaveBeenCalled());
@@ -160,7 +160,7 @@ const mockCore = {
             ((process.env.GH_AW_SKIP_QUERY = "is:issue is:open"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_SKIP_MAX_MATCHES = "invalid"),
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("must be a positive integer")),
               expect(mockCore.setOutput).not.toHaveBeenCalled());
           }),
@@ -168,7 +168,7 @@ const mockCore = {
             ((process.env.GH_AW_SKIP_QUERY = "is:issue is:open"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_SKIP_MAX_MATCHES = "0"),
-              await eval(`(async () => { ${checkSkipIfMatchScript} })()`),
+              await eval(`(async () => { ${checkSkipIfMatchScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("must be a positive integer")),
               expect(mockCore.setOutput).not.toHaveBeenCalled());
           }));
diff --git a/pkg/workflow/js/check_stop_time.test.cjs b/pkg/workflow/js/check_stop_time.test.cjs
index 31750861d1..bfa82031f4 100644
--- a/pkg/workflow/js/check_stop_time.test.cjs
+++ b/pkg/workflow/js/check_stop_time.test.cjs
@@ -50,14 +50,14 @@ const mockCore = {
         (it("should fail if GH_AW_STOP_TIME is not set", async () => {
           (delete process.env.GH_AW_STOP_TIME,
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
-            await eval(`(async () => { ${checkStopTimeScript} })()`),
+            await eval(`(async () => { ${checkStopTimeScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_AW_STOP_TIME not specified")),
             expect(mockCore.setOutput).not.toHaveBeenCalled());
         }),
           it("should fail if GH_AW_WORKFLOW_NAME is not set", async () => {
             ((process.env.GH_AW_STOP_TIME = "2025-12-31 23:59:59"),
               delete process.env.GH_AW_WORKFLOW_NAME,
-              await eval(`(async () => { ${checkStopTimeScript} })()`),
+              await eval(`(async () => { ${checkStopTimeScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_AW_WORKFLOW_NAME not specified")),
               expect(mockCore.setOutput).not.toHaveBeenCalled());
           }));
@@ -66,7 +66,7 @@ const mockCore = {
         it("should fail with error for invalid format", async () => {
           ((process.env.GH_AW_STOP_TIME = "invalid-date"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
-            await eval(`(async () => { ${checkStopTimeScript} })()`),
+            await eval(`(async () => { ${checkStopTimeScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Invalid stop-time format")),
             expect(mockCore.setOutput).not.toHaveBeenCalled());
         });
@@ -78,7 +78,7 @@ const mockCore = {
           const stopTime = futureDate.toISOString().replace("T", " ").substring(0, 19);
           ((process.env.GH_AW_STOP_TIME = stopTime),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
-            await eval(`(async () => { ${checkStopTimeScript} })()`),
+            await eval(`(async () => { ${checkStopTimeScript}; await main(); })()`),
             expect(mockCore.setOutput).toHaveBeenCalledWith("stop_time_ok", "true"),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
         });
@@ -90,7 +90,7 @@ const mockCore = {
           const stopTime = pastDate.toISOString().replace("T", " ").substring(0, 19);
           ((process.env.GH_AW_STOP_TIME = stopTime),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
-            await eval(`(async () => { ${checkStopTimeScript} })()`),
+            await eval(`(async () => { ${checkStopTimeScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("Stop time reached")),
             expect(mockGithub.rest.actions.listRepoWorkflows).not.toHaveBeenCalled(),
             expect(mockGithub.rest.actions.disableWorkflow).not.toHaveBeenCalled(),
diff --git a/pkg/workflow/js/check_team_member.test.cjs b/pkg/workflow/js/check_team_member.test.cjs
index 98ee6a2761..64af5ad6de 100644
--- a/pkg/workflow/js/check_team_member.test.cjs
+++ b/pkg/workflow/js/check_team_member.test.cjs
@@ -42,7 +42,7 @@ const mockCore = {
     }),
       it("should set is_team_member to true for admin permission", async () => {
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "admin" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: admin"),
@@ -51,7 +51,7 @@ const mockCore = {
       }),
       it("should set is_team_member to true for maintain permission", async () => {
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "maintain" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: maintain"),
@@ -60,7 +60,7 @@ const mockCore = {
       }),
       it("should set is_team_member to false for write permission", async () => {
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "write" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: write"),
@@ -68,7 +68,7 @@ const mockCore = {
       }),
       it("should set is_team_member to false for read permission", async () => {
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "read" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: read"),
@@ -76,7 +76,7 @@ const mockCore = {
       }),
       it("should set is_team_member to false for none permission", async () => {
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "none" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.info).toHaveBeenCalledWith("Repository permission level: none"),
@@ -85,7 +85,7 @@ const mockCore = {
       it("should handle API errors and set is_team_member to false", async () => {
         const apiError = new Error("API Error: Not Found");
         (mockGithub.rest.repos.getCollaboratorPermissionLevel.mockRejectedValue(apiError),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.warning).toHaveBeenCalledWith("Repository permission check failed: API Error: Not Found"),
@@ -94,7 +94,7 @@ const mockCore = {
       it("should handle different actor names correctly", async () => {
         ((global.context.actor = "different-user"),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "admin" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", username: "different-user" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'different-user' is admin or maintainer of testowner/testrepo"),
           expect(mockCore.setOutput).toHaveBeenCalledWith("is_team_member", "true"));
@@ -102,7 +102,7 @@ const mockCore = {
       it("should handle different repository contexts correctly", async () => {
         ((global.context.repo = { owner: "different-owner", repo: "different-repo" }),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockResolvedValue({ data: { permission: "maintain" } }),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getCollaboratorPermissionLevel).toHaveBeenCalledWith({ owner: "different-owner", repo: "different-repo", username: "testuser" }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if user 'testuser' is admin or maintainer of different-owner/different-repo"),
           expect(mockCore.setOutput).toHaveBeenCalledWith("is_team_member", "true"));
@@ -111,7 +111,7 @@ const mockCore = {
         const authError = new Error("Bad credentials");
         ((authError.status = 401),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockRejectedValue(authError),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockCore.warning).toHaveBeenCalledWith("Repository permission check failed: Bad credentials"),
           expect(mockCore.setOutput).toHaveBeenCalledWith("is_team_member", "false"));
       }),
@@ -119,7 +119,7 @@ const mockCore = {
         const rateLimitError = new Error("API rate limit exceeded");
         ((rateLimitError.status = 403),
           mockGithub.rest.repos.getCollaboratorPermissionLevel.mockRejectedValue(rateLimitError),
-          await eval(`(async () => { ${checkTeamMemberScript} })()`),
+          await eval(`(async () => { ${checkTeamMemberScript}; await main(); })()`),
           expect(mockCore.warning).toHaveBeenCalledWith("Repository permission check failed: API rate limit exceeded"),
           expect(mockCore.setOutput).toHaveBeenCalledWith("is_team_member", "false"));
       }));
diff --git a/pkg/workflow/js/check_workflow_timestamp.test.cjs b/pkg/workflow/js/check_workflow_timestamp.test.cjs
index f07b0c1ad6..091ff91f92 100644
--- a/pkg/workflow/js/check_workflow_timestamp.test.cjs
+++ b/pkg/workflow/js/check_workflow_timestamp.test.cjs
@@ -53,13 +53,13 @@ const mockCore = {
         (it("should fail if GITHUB_WORKSPACE is not set", async () => {
           (delete process.env.GITHUB_WORKSPACE,
             (process.env.GH_AW_WORKFLOW_FILE = "test.lock.yml"),
-            await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+            await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GITHUB_WORKSPACE not available")));
         }),
           it("should fail if GH_AW_WORKFLOW_FILE is not set", async () => {
             ((process.env.GITHUB_WORKSPACE = tmpDir),
               delete process.env.GH_AW_WORKFLOW_FILE,
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("GH_AW_WORKFLOW_FILE not available")));
           }));
       }),
@@ -68,7 +68,7 @@ const mockCore = {
           ((process.env.GITHUB_WORKSPACE = tmpDir), (process.env.GH_AW_WORKFLOW_FILE = "test.lock.yml"));
           const lockFile = path.join(workflowsDir, "test.lock.yml");
           (fs.writeFileSync(lockFile, "# Lock file content"),
-            await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+            await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Source file does not exist")),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Skipping timestamp check")),
             expect(mockCore.setFailed).not.toHaveBeenCalled(),
@@ -78,7 +78,7 @@ const mockCore = {
             ((process.env.GITHUB_WORKSPACE = tmpDir), (process.env.GH_AW_WORKFLOW_FILE = "test.lock.yml"));
             const workflowFile = path.join(workflowsDir, "test.md");
             (fs.writeFileSync(workflowFile, "# Workflow content"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Lock file does not exist")),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Skipping timestamp check")),
               expect(mockCore.setFailed).not.toHaveBeenCalled(),
@@ -87,7 +87,7 @@ const mockCore = {
           it("should skip check when both files do not exist", async () => {
             ((process.env.GITHUB_WORKSPACE = tmpDir),
               (process.env.GH_AW_WORKFLOW_FILE = "test.lock.yml"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Skipping timestamp check")),
               expect(mockCore.setFailed).not.toHaveBeenCalled(),
               expect(mockCore.error).not.toHaveBeenCalled());
@@ -101,7 +101,7 @@ const mockCore = {
           (fs.writeFileSync(workflowFile, "# Workflow content"),
             await new Promise(resolve => setTimeout(resolve, 10)),
             fs.writeFileSync(lockFile, "# Lock file content"),
-            await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+            await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Lock file is up to date")),
             expect(mockCore.error).not.toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled(),
@@ -116,7 +116,7 @@ const mockCore = {
               fs.writeFileSync(lockFile, "# Lock file content"),
               fs.utimesSync(workflowFile, now, now),
               fs.utimesSync(lockFile, now, now),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Lock file is up to date")),
               expect(mockCore.error).not.toHaveBeenCalled(),
               expect(mockCore.setFailed).not.toHaveBeenCalled(),
@@ -131,7 +131,7 @@ const mockCore = {
           (fs.writeFileSync(lockFile, "# Lock file content"),
             await new Promise(resolve => setTimeout(resolve, 10)),
             fs.writeFileSync(workflowFile, "# Workflow content"),
-            await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+            await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
             expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("WARNING: Lock file")),
             expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("is outdated")),
             expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("gh aw compile")),
@@ -146,7 +146,7 @@ const mockCore = {
             (fs.writeFileSync(lockFile, "# Lock file content"),
               await new Promise(resolve => setTimeout(resolve, 10)),
               fs.writeFileSync(workflowFile, "# Workflow content"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.error).toHaveBeenCalledWith(expect.stringMatching(/WARNING.*my-workflow\.lock\.yml.*outdated/)),
               expect(mockCore.error).toHaveBeenCalledWith(expect.stringMatching(/my-workflow\.md/)));
           }),
@@ -157,7 +157,7 @@ const mockCore = {
             (fs.writeFileSync(lockFile, "# Lock file content"),
               await new Promise(resolve => setTimeout(resolve, 10)),
               fs.writeFileSync(workflowFile, "# Workflow content"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("Workflow Lock File Warning")),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("WARNING")),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("gh aw compile")),
@@ -170,7 +170,7 @@ const mockCore = {
             (fs.writeFileSync(lockFile, "# Lock file content"),
               await new Promise(resolve => setTimeout(resolve, 10)),
               fs.writeFileSync(workflowFile, "# Workflow content"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("Git Commit")),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("abc123def456")),
               expect(mockCore.summary.write).toHaveBeenCalled());
@@ -182,7 +182,7 @@ const mockCore = {
             (fs.writeFileSync(lockFile, "# Lock file content"),
               await new Promise(resolve => setTimeout(resolve, 10)),
               fs.writeFileSync(workflowFile, "# Workflow content"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("modified:")),
               expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringMatching(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)),
               expect(mockCore.summary.write).toHaveBeenCalled());
@@ -195,7 +195,7 @@ const mockCore = {
             lockFile = path.join(workflowsDir, "my-test-workflow.lock.yml");
           (fs.writeFileSync(workflowFile, "# Workflow content"),
             fs.writeFileSync(lockFile, "# Lock file content"),
-            await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+            await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("my-test-workflow.md")),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
         }),
@@ -205,7 +205,7 @@ const mockCore = {
               lockFile = path.join(workflowsDir, "my_test_workflow.lock.yml");
             (fs.writeFileSync(workflowFile, "# Workflow content"),
               fs.writeFileSync(lockFile, "# Lock file content"),
-              await eval(`(async () => { ${checkWorkflowTimestampScript} })()`),
+              await eval(`(async () => { ${checkWorkflowTimestampScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("my_test_workflow.md")),
               expect(mockCore.setFailed).not.toHaveBeenCalled());
           }));
diff --git a/pkg/workflow/js/close_discussion.cjs b/pkg/workflow/js/close_discussion.cjs
index 20cad4bcf7..5db69bea76 100644
--- a/pkg/workflow/js/close_discussion.cjs
+++ b/pkg/workflow/js/close_discussion.cjs
@@ -312,4 +312,5 @@ async function main() {
   core.info(`Successfully closed ${closedDiscussions.length} discussion(s)`);
   return closedDiscussions;
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/close_discussion.test.cjs b/pkg/workflow/js/close_discussion.test.cjs
index 0594859aea..7e108dc425 100644
--- a/pkg/workflow/js/close_discussion.test.cjs
+++ b/pkg/workflow/js/close_discussion.test.cjs
@@ -33,10 +33,10 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         tempFilePath && fs.existsSync(tempFilePath) && (fs.unlinkSync(tempFilePath), (tempFilePath = void 0));
       }),
       it("should handle empty agent output", async () => {
-        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${closeDiscussionScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No close-discussion items found in agent output"));
+        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No close-discussion items found in agent output"));
       }),
       it("should handle missing agent output", async () => {
-        (await eval(`(async () => { ${closeDiscussionScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
+        (await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
       }),
       it("should close discussion with comment in non-staged mode", async () => {
         const validatedOutput = { items: [{ type: "close_discussion", body: "This discussion is resolved.", reason: "RESOLVED" }], errors: [] };
@@ -47,7 +47,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             .mockResolvedValueOnce({ repository: { discussion: { id: "D_kwDOABCDEF01", title: "Test Discussion", category: { name: "General" }, labels: { nodes: [] }, url: "https://github.com/testowner/testrepo/discussions/42" } } })
             .mockResolvedValueOnce({ addDiscussionComment: { comment: { id: "DC_kwDOABCDEF02", url: "https://github.com/testowner/testrepo/discussions/42#discussioncomment-123" } } })
             .mockResolvedValueOnce({ closeDiscussion: { discussion: { id: "D_kwDOABCDEF01", url: "https://github.com/testowner/testrepo/discussions/42" } } }),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Found 1 close-discussion item(s)"),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Processing close-discussion item 1/1")),
           expect(mockCore.info).toHaveBeenCalledWith("Adding comment to discussion #42"),
@@ -60,7 +60,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         const validatedOutput = { items: [{ type: "close_discussion", body: "This discussion is resolved.", reason: "RESOLVED" }], errors: [] };
         (setAgentOutput(validatedOutput),
           (process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("🎭 Staged Mode: Close Discussions Preview")),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("**Target:** Current discussion")),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("**Reason:** RESOLVED")),
@@ -74,7 +74,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.graphql.mockResolvedValueOnce({
             repository: { discussion: { id: "D_kwDOABCDEF01", title: "Test Discussion", category: { name: "General" }, labels: { nodes: [{ name: "question" }] }, url: "https://github.com/testowner/testrepo/discussions/42" } },
           }),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Discussion #42 does not have required labels: resolved, completed"),
           expect(mockCore.setOutput).not.toHaveBeenCalled());
       }),
@@ -85,7 +85,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.graphql.mockResolvedValueOnce({
             repository: { discussion: { id: "D_kwDOABCDEF01", title: "Test Discussion", category: { name: "General" }, labels: { nodes: [] }, url: "https://github.com/testowner/testrepo/discussions/42" } },
           }),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Discussion #42 does not have required title prefix: [task]"),
           expect(mockCore.setOutput).not.toHaveBeenCalled());
       }),
@@ -96,7 +96,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.graphql.mockResolvedValueOnce({
             repository: { discussion: { id: "D_kwDOABCDEF01", title: "Test Discussion", category: { name: "General" }, labels: { nodes: [] }, url: "https://github.com/testowner/testrepo/discussions/42" } },
           }),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Discussion #42 is not in required category: Announcements"),
           expect(mockCore.setOutput).not.toHaveBeenCalled());
       }),
@@ -109,7 +109,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             .mockResolvedValueOnce({ repository: { discussion: { id: "D_kwDOABCDEF01", title: "Test Discussion", category: { name: "General" }, labels: { nodes: [] }, url: "https://github.com/testowner/testrepo/discussions/99" } } })
             .mockResolvedValueOnce({ addDiscussionComment: { comment: { id: "DC_kwDOABCDEF02", url: "https://github.com/testowner/testrepo/discussions/99#discussioncomment-123" } } })
             .mockResolvedValueOnce({ closeDiscussion: { discussion: { id: "D_kwDOABCDEF01", url: "https://github.com/testowner/testrepo/discussions/99" } } }),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Closing discussion #99")),
           expect(mockCore.setOutput).toHaveBeenCalledWith("discussion_number", 99));
       }),
@@ -117,7 +117,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         const validatedOutput = { items: [{ type: "close_discussion", body: "Closing this discussion." }], errors: [] };
         (setAgentOutput(validatedOutput),
           (mockContext.eventName = "issues"),
-          await eval(`(async () => { ${closeDiscussionScript} })()`),
+          await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in discussion context, skipping discussion close'),
           expect(mockCore.setOutput).not.toHaveBeenCalled());
       }),
@@ -126,7 +126,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         (setAgentOutput(validatedOutput),
           mockGithub.graphql.mockRejectedValueOnce(new Error("GraphQL error: Discussion not found")),
           await expect(async () => {
-            await eval(`(async () => { ${closeDiscussionScript} })()`);
+            await eval(`(async () => { ${closeDiscussionScript}; await main(); })()`);
           }).rejects.toThrow(),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Failed to close discussion #42")));
       }));
diff --git a/pkg/workflow/js/close_issue.cjs b/pkg/workflow/js/close_issue.cjs
index 0d60fbfd75..557007de80 100644
--- a/pkg/workflow/js/close_issue.cjs
+++ b/pkg/workflow/js/close_issue.cjs
@@ -72,4 +72,4 @@ async function main() {
   });
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/close_issue.test.cjs b/pkg/workflow/js/close_issue.test.cjs
index 6bd0b0fc09..37a6f076e9 100644
--- a/pkg/workflow/js/close_issue.test.cjs
+++ b/pkg/workflow/js/close_issue.test.cjs
@@ -32,17 +32,17 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         tempFilePath && fs.existsSync(tempFilePath) && (fs.unlinkSync(tempFilePath), (tempFilePath = void 0));
       }),
       it("should handle empty agent output", async () => {
-        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${closeIssueScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No close-issue items found in agent output"));
+        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${closeIssueScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No close-issue items found in agent output"));
       }),
       it("should handle missing agent output", async () => {
-        (await eval(`(async () => { ${closeIssueScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
+        (await eval(`(async () => { ${closeIssueScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
       }),
       it("should close issue with comment in triggering context", async () => {
         (setAgentOutput({ items: [{ type: "close_issue", body: "Closing this issue due to completion." }] }),
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, title: "[test] Test Issue", labels: [{ name: "bug" }], state: "open", html_url: "https://github.com/testowner/testrepo/issues/42" } }),
           mockGithub.rest.issues.createComment.mockResolvedValue({ data: { id: 123, html_url: "https://github.com/testowner/testrepo/issues/42#issuecomment-123" } }),
           mockGithub.rest.issues.update.mockResolvedValue({ data: { number: 42, html_url: "https://github.com/testowner/testrepo/issues/42", title: "[test] Test Issue" } }),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.createComment).toHaveBeenCalled(),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42, state: "closed" }),
@@ -55,7 +55,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 100, title: "[refactor] Refactor Test", labels: [{ name: "refactoring" }], state: "open", html_url: "https://github.com/testowner/testrepo/issues/100" } }),
           mockGithub.rest.issues.createComment.mockResolvedValue({ data: { id: 456, html_url: "https://github.com/testowner/testrepo/issues/100#issuecomment-456" } }),
           mockGithub.rest.issues.update.mockResolvedValue({ data: { number: 100, html_url: "https://github.com/testowner/testrepo/issues/100", title: "[refactor] Refactor Test" } }),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 100 }),
           expect(mockCore.setOutput).toHaveBeenCalledWith("issue_number", 100));
       }),
@@ -64,7 +64,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           (process.env.GH_AW_CLOSE_ISSUE_TARGET = "*"),
           (process.env.GH_AW_CLOSE_ISSUE_REQUIRED_TITLE_PREFIX = "[refactor] "),
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 50, title: "[bug] Bug Fix", labels: [], state: "open", html_url: "https://github.com/testowner/testrepo/issues/50" } }),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalled(),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("does not have required title prefix")));
@@ -74,7 +74,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           (process.env.GH_AW_CLOSE_ISSUE_TARGET = "*"),
           (process.env.GH_AW_CLOSE_ISSUE_REQUIRED_LABELS = "automated,stale"),
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 60, title: "Test Issue", labels: [{ name: "bug" }], state: "open", html_url: "https://github.com/testowner/testrepo/issues/60" } }),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalled(),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("does not have required labels")));
@@ -83,7 +83,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         (setAgentOutput({ items: [{ type: "close_issue", issue_number: 70, body: "Closing this issue." }] }),
           (process.env.GH_AW_CLOSE_ISSUE_TARGET = "*"),
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 70, title: "Already Closed", labels: [], state: "closed", html_url: "https://github.com/testowner/testrepo/issues/70" } }),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalled(),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith("Issue #70 is already closed, skipping"));
@@ -91,7 +91,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should work in staged mode", async () => {
         (setAgentOutput({ items: [{ type: "close_issue", issue_number: 80, body: "This is a test close." }] }),
           (process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).not.toHaveBeenCalled(),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("🎭 Staged Mode: Close Issues Preview")),
@@ -110,7 +110,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             .mockResolvedValueOnce({ data: { number: 92, title: "Issue 92", labels: [], state: "open", html_url: "https://github.com/testowner/testrepo/issues/92" } }),
           mockGithub.rest.issues.createComment.mockResolvedValue({ data: { id: 999, html_url: "https://github.com/testowner/testrepo/issues/91#issuecomment-999" } }),
           mockGithub.rest.issues.update.mockResolvedValue({ data: { number: 91, html_url: "https://github.com/testowner/testrepo/issues/91", title: "Issue 91" } }),
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledTimes(2),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledTimes(2),
           expect(mockCore.info).toHaveBeenCalledWith("Successfully closed 2 issue(s)"));
@@ -119,7 +119,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         (setAgentOutput({ items: [{ type: "close_issue", body: "Closing issue." }] }),
           (global.context.eventName = "push"),
           delete global.context.payload.issue,
-          await eval(`(async () => { ${closeIssueScript} })()`),
+          await eval(`(async () => { ${closeIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in issue context, skipping issue close'));
       }));
diff --git a/pkg/workflow/js/close_pull_request.cjs b/pkg/workflow/js/close_pull_request.cjs
index 3fc9fb2ac5..f293beec87 100644
--- a/pkg/workflow/js/close_pull_request.cjs
+++ b/pkg/workflow/js/close_pull_request.cjs
@@ -72,4 +72,4 @@ async function main() {
   });
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/collect_ndjson_output.test.cjs b/pkg/workflow/js/collect_ndjson_output.test.cjs
index 8975a79274..f2f35e73fc 100644
--- a/pkg/workflow/js/collect_ndjson_output.test.cjs
+++ b/pkg/workflow/js/collect_ndjson_output.test.cjs
@@ -127,13 +127,13 @@ describe("collect_ndjson_output.cjs", () => {
     }),
     it("should handle missing GH_AW_SAFE_OUTPUTS environment variable", async () => {
       (delete process.env.GH_AW_SAFE_OUTPUTS,
-        await eval(`(async () => { ${collectScript} })()`),
+        await eval(`(async () => { ${collectScript}; await main(); })()`),
         expect(mockCore.setOutput).toHaveBeenCalledWith("output", ""),
         expect(mockCore.info).toHaveBeenCalledWith("GH_AW_SAFE_OUTPUTS not set, no output to collect"));
     }),
     it("should handle missing output file", async () => {
       ((process.env.GH_AW_SAFE_OUTPUTS = "/tmp/gh-aw/nonexistent-file.txt"),
-        await eval(`(async () => { ${collectScript} })()`),
+        await eval(`(async () => { ${collectScript}; await main(); })()`),
         expect(mockCore.setOutput).toHaveBeenCalledWith("output", ""),
         expect(mockCore.info).toHaveBeenCalledWith("Output file does not exist: /tmp/gh-aw/nonexistent-file.txt"));
     }),
@@ -141,7 +141,7 @@ describe("collect_ndjson_output.cjs", () => {
       const testFile = "/tmp/gh-aw/test-ndjson-output.txt";
       (fs.writeFileSync(testFile, ""),
         (process.env.GH_AW_SAFE_OUTPUTS = testFile),
-        await eval(`(async () => { ${collectScript} })()`),
+        await eval(`(async () => { ${collectScript}; await main(); })()`),
         expect(mockCore.setOutput).toHaveBeenCalledWith("output", '{"items":[],"errors":[]}'),
         expect(mockCore.info).toHaveBeenCalledWith("Output file is empty"));
     }),
@@ -151,7 +151,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": true, "add_comment": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -164,7 +164,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -179,7 +179,7 @@ describe("collect_ndjson_output.cjs", () => {
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
       (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
         fs.writeFileSync(configPath, __config),
-        await eval(`(async () => { ${collectScript} })()`),
+        await eval(`(async () => { ${collectScript}; await main(); })()`),
         expect(mockCore.warning).toHaveBeenCalled(),
         expect(mockCore.setFailed).not.toHaveBeenCalled());
       const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -197,7 +197,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"add_labels": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -211,7 +211,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_pull_request": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -231,7 +231,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": true, "add_comment": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -244,7 +244,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -258,7 +258,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": {"max": 2}}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -275,7 +275,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_discussion": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -293,7 +293,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": true, "add_comment": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -307,7 +307,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_pull_request_review_comment": {"max": 10}}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -329,7 +329,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_pull_request_review_comment": {"max": 10}}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -347,7 +347,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"update_release": {"max": 10}}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -372,7 +372,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_pull_request_review_comment": {"max": 5}}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
       const setOutputCalls = mockCore.setOutput.mock.calls,
         outputCall = setOutputCalls.find(call => "output" === call[0]);
       expect(outputCall).toBeDefined();
@@ -386,7 +386,7 @@ describe("collect_ndjson_output.cjs", () => {
         (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
         const __config = '{"create_issue": true}',
           configPath = "/tmp/gh-aw/safeoutputs/config.json";
-        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
         const setOutputCalls = mockCore.setOutput.mock.calls,
           outputCall = setOutputCalls.find(call => "output" === call[0]);
         expect(outputCall).toBeDefined();
@@ -399,7 +399,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -412,7 +412,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -425,7 +425,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -438,7 +438,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -451,7 +451,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -464,7 +464,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -477,7 +477,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -490,7 +490,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"add_labels": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -503,7 +503,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -516,7 +516,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true, "add_comment": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -534,7 +534,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -549,7 +549,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -562,7 +562,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -575,7 +575,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"add_labels": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -588,7 +588,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"add_labels": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -603,7 +603,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -616,7 +616,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -629,7 +629,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -646,7 +646,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -663,7 +663,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -680,7 +680,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -697,7 +697,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -714,7 +714,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -729,7 +729,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -746,7 +746,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -763,7 +763,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -783,7 +783,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -799,7 +799,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -812,7 +812,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -830,7 +830,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -845,7 +845,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -860,7 +860,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -877,7 +877,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -892,7 +892,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"add_labels": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -905,7 +905,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -920,7 +920,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"add_labels": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -933,7 +933,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -951,7 +951,7 @@ describe("collect_ndjson_output.cjs", () => {
       (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
       const __config = '{"create_issue": true, "add_comment": true}',
         configPath = "/tmp/gh-aw/safeoutputs/config.json";
-      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`), expect(fs.existsSync("/tmp/gh-aw/agent_output.json")).toBe(!0));
+      (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`), expect(fs.existsSync("/tmp/gh-aw/agent_output.json")).toBe(!0));
       const agentOutputContent = fs.readFileSync("/tmp/gh-aw/agent_output.json", "utf8"),
         agentOutputJson = JSON.parse(agentOutputContent);
       (expect(agentOutputJson.items).toHaveLength(2),
@@ -977,7 +977,7 @@ describe("collect_ndjson_output.cjs", () => {
         if ("/tmp/gh-aw/agent_output.json" === filePath) throw new Error("Permission denied");
         return originalWriteFileSync(filePath, content, options);
       })),
-        await eval(`(async () => { ${collectScript} })()`),
+        await eval(`(async () => { ${collectScript}; await main(); })()`),
         (fs.writeFileSync = originalWriteFileSync),
         expect(mockCore.error).toHaveBeenCalledWith("Failed to write agent output file: Permission denied"));
       const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -994,7 +994,7 @@ describe("collect_ndjson_output.cjs", () => {
         (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
         const __config = '{"create_code_scanning_alert": true}',
           configPath = "/tmp/gh-aw/safeoutputs/config.json";
-        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
         const setOutputCalls = mockCore.setOutput.mock.calls,
           outputCall = setOutputCalls.find(call => "output" === call[0]);
         expect(outputCall).toBeDefined();
@@ -1014,7 +1014,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1037,7 +1037,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1060,7 +1060,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1080,7 +1080,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1100,7 +1100,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_code_scanning_alert": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1120,7 +1120,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1143,7 +1143,10 @@ describe("collect_ndjson_output.cjs", () => {
         (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
         const __config = '{"create_issue": true}',
           configPath = "/tmp/gh-aw/safeoutputs/config.json";
-        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`), expect(mockCore.setOutput).toHaveBeenCalledWith("output", expect.any(String)));
+        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
+          fs.writeFileSync(configPath, __config),
+          await eval(`(async () => { ${collectScript}; await main(); })()`),
+          expect(mockCore.setOutput).toHaveBeenCalledWith("output", expect.any(String)));
         const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
           parsedOutput = JSON.parse(outputCall[1]);
         (expect(parsedOutput.items).toHaveLength(1), expect(parsedOutput.items[0].body).toBe("Use z3 -v:10 and z3 -memory:high for performance monitoring"), expect(parsedOutput.errors).toHaveLength(0));
@@ -1154,7 +1157,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("Various flags: gcc -std:c++20, clang -target:x86_64, rustc -C:opt-level=3, javac -cp:lib/*, python -W:ignore, node --max-old-space-size:8192");
@@ -1165,7 +1168,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("Use https://github.com/repo for code, avoid (redacted) and (redacted) but z3 -v:10 should work");
@@ -1177,7 +1180,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("Install from https://github.com/z3prover/z3, then run: z3 -v:10 -memory:high -timeout:30000. Avoid (redacted) or (redacted)");
@@ -1188,7 +1191,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("GitHub URLs: https://github.com/repo, https://api.github.com/users, https://githubusercontent.com/file. External: (redacted)");
@@ -1199,7 +1202,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("Hey `@username` and `@org/team`, check this out! But preserve email@domain.com");
@@ -1210,7 +1213,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("This `fixes #123` and `closes #456`, also `resolves #789`");
@@ -1222,7 +1225,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("Red text and Bold text");
@@ -1236,7 +1239,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           (expect(parsedOutput.items[0].body).toBe("Allowed: https://example.com/page, https://sub.example.com/file, https://test.org/doc. Blocked: (redacted), (redacted)"),
@@ -1250,7 +1253,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("Time 12:30 PM, ratio 3:1, IPv6 ::1, URL path/file:with:colons, command -flag:value, namespace::function");
@@ -1262,7 +1265,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           (expect(parsedOutput.items[0].body).toMatch(/\[Content truncated due to length\]$/), expect(parsedOutput.items[0].body.length).toBeLessThan(6e5));
@@ -1274,7 +1277,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
           const parsedOutput = JSON.parse(outputCall[1]);
@@ -1288,7 +1291,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           (expect(parsedOutput.items[0].body).toContain("z3 -v:10"), expect(parsedOutput.items[0].body).toContain("z3 -memory:high"));
@@ -1299,7 +1302,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_pull_request": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           (expect(parsedOutput.items[0].title).toBe("PR with z3 -v:10 flag"),
@@ -1314,7 +1317,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]),
             parsedOutput = JSON.parse(outputCall[1]);
           expect(parsedOutput.items[0].body).toBe("This is visible  more visible text  and more text  final text");
@@ -1328,7 +1331,7 @@ describe("collect_ndjson_output.cjs", () => {
         (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
         const __config = '{"create_issue": {"min": 2, "max": 5}}',
           configPath = "/tmp/gh-aw/safeoutputs/config.json";
-        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
         const setOutputCalls = mockCore.setOutput.mock.calls,
           outputCall = setOutputCalls.find(call => "output" === call[0]);
         expect(outputCall).toBeDefined();
@@ -1341,7 +1344,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": {"min": 3, "max": 5}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1354,7 +1357,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": {"min": 1, "max": 5}, "add_comment": {"min": 2, "max": 5}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1367,7 +1370,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": {"min": 0, "max": 5}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1380,7 +1383,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": {"max": 5}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1393,7 +1396,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"create_issue": {"min": 1, "max": 5}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1406,7 +1409,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"add_comment": {"min": 2, "max": 5}, "create_discussion": {"min": 1, "max": 5}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1421,7 +1424,7 @@ describe("collect_ndjson_output.cjs", () => {
         (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
         const config = '{"noop": true}',
           configPath = "/tmp/gh-aw/safeoutputs/config.json";
-        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, config), await eval(`(async () => { ${collectScript} })()`));
+        (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, config), await eval(`(async () => { ${collectScript}; await main(); })()`));
         const setOutputCalls = mockCore.setOutput.mock.calls,
           outputCall = setOutputCalls.find(call => "output" === call[0]);
         expect(outputCall).toBeDefined();
@@ -1436,7 +1439,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1453,7 +1456,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1468,7 +1471,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const config = '{"noop": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1481,7 +1484,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const config = '{"noop": {"max": 3}}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1498,7 +1501,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"assign_milestone": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1511,7 +1514,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"assign_to_agent": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1524,7 +1527,7 @@ describe("collect_ndjson_output.cjs", () => {
           (fs.writeFileSync(testFile, ndjsonContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile));
           const __config = '{"assign_to_agent": true}',
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
-          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript} })()`));
+          (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }), fs.writeFileSync(configPath, __config), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const setOutputCalls = mockCore.setOutput.mock.calls,
             outputCall = setOutputCalls.find(call => "output" === call[0]);
           expect(outputCall).toBeDefined();
@@ -1539,7 +1542,7 @@ describe("collect_ndjson_output.cjs", () => {
             configPath = "/tmp/gh-aw/safeoutputs/config.json";
           (fs.mkdirSync("/tmp/gh-aw/safeoutputs", { recursive: !0 }),
             fs.writeFileSync(configPath, __config),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1557,7 +1560,7 @@ describe("collect_ndjson_output.cjs", () => {
         it("should accept valid positive integer for parent_issue_number", async () => {
           const testInput = JSON.stringify({ type: "link_sub_issue", parent_issue_number: 100, sub_issue_number: 50 }),
             outputPath = "/tmp/gh-aw/test-link-sub-issue-integers.txt";
-          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript} })()`));
+          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const failedCalls = mockCore.setFailed.mock.calls;
           expect(failedCalls.length).toBe(0);
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1569,7 +1572,7 @@ describe("collect_ndjson_output.cjs", () => {
         it("should accept temporary ID (aw_ prefix) for parent_issue_number", async () => {
           const testInput = JSON.stringify({ type: "link_sub_issue", parent_issue_number: "aw_abc123def456", sub_issue_number: 50 }),
             outputPath = "/tmp/gh-aw/test-link-sub-issue-temp-id.txt";
-          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript} })()`));
+          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const failedCalls = mockCore.setFailed.mock.calls;
           expect(failedCalls.length).toBe(0);
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1581,7 +1584,7 @@ describe("collect_ndjson_output.cjs", () => {
         it("should accept temporary ID (aw_ prefix) for sub_issue_number", async () => {
           const testInput = JSON.stringify({ type: "link_sub_issue", parent_issue_number: 100, sub_issue_number: "aw_123456abcdef" }),
             outputPath = "/tmp/gh-aw/test-link-sub-issue-temp-id-sub.txt";
-          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript} })()`));
+          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const failedCalls = mockCore.setFailed.mock.calls;
           expect(failedCalls.length).toBe(0);
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1593,7 +1596,7 @@ describe("collect_ndjson_output.cjs", () => {
         it("should accept temporary IDs for both parent and sub issue numbers", async () => {
           const testInput = JSON.stringify({ type: "link_sub_issue", parent_issue_number: "aw_abc123def456", sub_issue_number: "aw_fedcba654321" }),
             outputPath = "/tmp/gh-aw/test-link-sub-issue-both-temp-ids.txt";
-          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript} })()`));
+          (fs.writeFileSync(outputPath, testInput), (process.env.GH_AW_SAFE_OUTPUTS = outputPath), await eval(`(async () => { ${collectScript}; await main(); })()`));
           const failedCalls = mockCore.setFailed.mock.calls;
           expect(failedCalls.length).toBe(0);
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1607,7 +1610,7 @@ describe("collect_ndjson_output.cjs", () => {
             outputPath = "/tmp/gh-aw/test-link-sub-issue-invalid-temp-id.txt";
           (fs.writeFileSync(outputPath, testInput),
             (process.env.GH_AW_SAFE_OUTPUTS = outputPath),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
@@ -1622,7 +1625,7 @@ describe("collect_ndjson_output.cjs", () => {
             outputPath = "/tmp/gh-aw/test-link-sub-issue-same-temp-ids.txt";
           (fs.writeFileSync(outputPath, testInput),
             (process.env.GH_AW_SAFE_OUTPUTS = outputPath),
-            await eval(`(async () => { ${collectScript} })()`),
+            await eval(`(async () => { ${collectScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalled(),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
           const setOutputCalls = mockCore.setOutput.mock.calls,
diff --git a/pkg/workflow/js/create_code_scanning_alert.cjs b/pkg/workflow/js/create_code_scanning_alert.cjs
index 24def2d02a..bd70bc892e 100644
--- a/pkg/workflow/js/create_code_scanning_alert.cjs
+++ b/pkg/workflow/js/create_code_scanning_alert.cjs
@@ -241,4 +241,5 @@ async function main() {
     findings: validFindings,
   };
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/create_code_scanning_alert.test.cjs b/pkg/workflow/js/create_code_scanning_alert.test.cjs
index 5c817a78a8..3f1cfbb1ea 100644
--- a/pkg/workflow/js/create_code_scanning_alert.test.cjs
+++ b/pkg/workflow/js/create_code_scanning_alert.test.cjs
@@ -56,20 +56,20 @@ describe("create_code_scanning_alert.cjs", () => {
     }),
     describe("main function", () => {
       (it("should handle missing environment variable", async () => {
-        (delete process.env.GH_AW_AGENT_OUTPUT, await eval(`(async () => { ${securityReportScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
+        (delete process.env.GH_AW_AGENT_OUTPUT, await eval(`(async () => { ${securityReportScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
       }),
         it("should handle empty agent output", async () => {
-          (setAgentOutput(""), await eval(`(async () => { ${securityReportScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"));
+          (setAgentOutput(""), await eval(`(async () => { ${securityReportScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"));
         }),
         it("should handle invalid JSON", async () => {
-          (setAgentOutput("invalid json"), await eval(`(async () => { ${securityReportScript} })()`), expect(mockCore.error).toHaveBeenCalledWith(expect.stringMatching(/Error parsing agent output JSON:/)));
+          (setAgentOutput("invalid json"), await eval(`(async () => { ${securityReportScript}; await main(); })()`), expect(mockCore.error).toHaveBeenCalledWith(expect.stringMatching(/Error parsing agent output JSON:/)));
         }),
         it("should handle missing items array", async () => {
-          (setAgentOutput({ status: "success" }), await eval(`(async () => { ${securityReportScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No valid items found in agent output"));
+          (setAgentOutput({ status: "success" }), await eval(`(async () => { ${securityReportScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No valid items found in agent output"));
         }),
         it("should handle no code scanning alert items", async () => {
           (setAgentOutput({ items: [{ type: "create_issue", title: "Test Issue" }] }),
-            await eval(`(async () => { ${securityReportScript} })()`),
+            await eval(`(async () => { ${securityReportScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith("No create-code-scanning-alert items found in agent output"));
         }),
         it("should create SARIF file for valid security findings", async () => {
@@ -79,7 +79,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/utils.js", line: 15, severity: "warning", message: "Potential XSS vulnerability" },
             ],
           };
-          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif");
           expect(fs.existsSync(sarifFile)).toBe(!0);
           const sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
@@ -107,7 +107,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/utils.js", line: 15, severity: "warning", message: "Second finding" },
             ],
           };
-          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif");
           expect(fs.existsSync(sarifFile)).toBe(!0);
           const sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
@@ -123,7 +123,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/invalid3.js", line: 30, severity: "invalid-severity", message: "Invalid - bad severity" },
             ],
           };
-          (setAgentOutput(mixedFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(mixedFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif");
           expect(fs.existsSync(sarifFile)).toBe(!0);
           const sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
@@ -132,14 +132,14 @@ describe("create_code_scanning_alert.cjs", () => {
         it("should use custom driver name when configured", async () => {
           ((process.env.GH_AW_SECURITY_REPORT_DRIVER = "Custom Security Scanner"), (process.env.GH_AW_WORKFLOW_FILENAME = "security-scan"));
           const securityFindings = { items: [{ type: "create_code_scanning_alert", file: "src/app.js", line: 42, severity: "error", message: "Security issue found" }] };
-          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif"),
             sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
           (expect(sarifContent.runs[0].tool.driver.name).toBe("Custom Security Scanner"), expect(sarifContent.runs[0].results[0].ruleId).toBe("security-scan-security-finding-1"));
         }),
         it("should use default driver name when not configured", async () => {
           const securityFindings = { items: [{ type: "create_code_scanning_alert", file: "src/app.js", line: 42, severity: "error", message: "Security issue found" }] };
-          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif"),
             sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
           (expect(sarifContent.runs[0].tool.driver.name).toBe("GitHub Agentic Workflows Security Scanner"), expect(sarifContent.runs[0].results[0].ruleId).toBe("workflow-security-finding-1"));
@@ -151,7 +151,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/utils.js", line: 25, severity: "warning", message: "Security issue without column" },
             ],
           };
-          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif"),
             sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
           (expect(sarifContent.runs[0].results[0].locations[0].physicalLocation.region.startColumn).toBe(15), expect(sarifContent.runs[0].results[1].locations[0].physicalLocation.region.startColumn).toBe(1));
@@ -165,7 +165,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/invalid3.js", line: 40, column: -1, severity: "error", message: "Invalid column - negative" },
             ],
           };
-          (setAgentOutput(invalidFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(invalidFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif"),
             sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
           (expect(sarifContent.runs[0].results).toHaveLength(1),
@@ -181,7 +181,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/config.js", line: 10, severity: "info", message: "Standard numbered finding" },
             ],
           };
-          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(securityFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif"),
             sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
           (expect(sarifContent.runs[0].results[0].ruleId).toBe("security-scan-sql-injection"),
@@ -198,7 +198,7 @@ describe("create_code_scanning_alert.cjs", () => {
               { type: "create_code_scanning_alert", file: "src/invalid4.js", line: 50, severity: "error", message: "Invalid ruleIdSuffix - not a string", ruleIdSuffix: 123 },
             ],
           };
-          (setAgentOutput(invalidFindings), await eval(`(async () => { ${securityReportScript} })()`));
+          (setAgentOutput(invalidFindings), await eval(`(async () => { ${securityReportScript}; await main(); })()`));
           const sarifFile = path.join(process.cwd(), "code-scanning-alert.sarif"),
             sarifContent = JSON.parse(fs.readFileSync(sarifFile, "utf8"));
           (expect(sarifContent.runs[0].results).toHaveLength(1), expect(sarifContent.runs[0].results[0].message.text).toBe("Valid with valid ruleIdSuffix"), expect(sarifContent.runs[0].results[0].ruleId).toBe("workflow-valid-rule-id_123"));
diff --git a/pkg/workflow/js/create_discussion.cjs b/pkg/workflow/js/create_discussion.cjs
index 9a9c0f5af8..066bd6aa04 100644
--- a/pkg/workflow/js/create_discussion.cjs
+++ b/pkg/workflow/js/create_discussion.cjs
@@ -342,4 +342,5 @@ async function main() {
   }
   core.info(`Successfully created ${createdDiscussions.length} discussion(s)`);
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/create_discussion.test.cjs b/pkg/workflow/js/create_discussion.test.cjs
index b0becc2340..e34ca90100 100644
--- a/pkg/workflow/js/create_discussion.test.cjs
+++ b/pkg/workflow/js/create_discussion.test.cjs
@@ -54,27 +54,27 @@ const mockCore = {
         tempFilePath && require("fs").existsSync(tempFilePath) && (require("fs").unlinkSync(tempFilePath), (tempFilePath = void 0));
       }),
       it("should handle missing GH_AW_AGENT_OUTPUT environment variable", async () => {
-        (await eval(`(async () => { ${createDiscussionScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
+        (await eval(`(async () => { ${createDiscussionScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
       }),
       it("should handle empty agent output", async () => {
-        (setAgentOutput(""), await eval(`(async () => { ${createDiscussionScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"));
+        (setAgentOutput(""), await eval(`(async () => { ${createDiscussionScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"));
       }),
       it("should handle invalid JSON in agent output", async () => {
         (setAgentOutput("invalid json"),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Agent output content length: 12"),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringMatching(/Error parsing agent output JSON:.*Unexpected token/)));
       }),
       it("should handle missing create-discussion items", async () => {
         const validOutput = { items: [{ type: "create_issue", title: "Test Issue", body: "Test body" }] };
-        (setAgentOutput(validOutput), await eval(`(async () => { ${createDiscussionScript} })()`), expect(mockCore.warning).toHaveBeenCalledWith("No create-discussion items found in agent output"));
+        (setAgentOutput(validOutput), await eval(`(async () => { ${createDiscussionScript}; await main(); })()`), expect(mockCore.warning).toHaveBeenCalledWith("No create-discussion items found in agent output"));
       }),
       it("should create discussions successfully with basic configuration", async () => {
         (mockGithub.graphql.mockResolvedValueOnce({ repository: { id: "MDEwOlJlcG9zaXRvcnkxMjM0NTY3ODk=", discussionCategories: { nodes: [{ id: "DIC_test456", name: "General", slug: "general" }] } } }),
           mockGithub.graphql.mockResolvedValueOnce({ createDiscussion: { discussion: { id: "D_test789", number: 1, title: "Test Discussion", url: "https://github.com/testowner/testrepo/discussions/1" } } }));
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledTimes(2),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("query($owner: String!, $repo: String!)"), { owner: "testowner", repo: "testrepo" }),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation($repositoryId: ID!, $categoryId: ID!, $title: String!, $body: String!)"), {
@@ -94,7 +94,7 @@ const mockCore = {
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
           (process.env.GH_AW_DISCUSSION_TITLE_PREFIX = "[ai] "),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation($repositoryId: ID!, $categoryId: ID!, $title: String!, $body: String!)"), expect.objectContaining({ title: "[ai] Test Discussion" })));
       }),
       it("should use specified category ID when configured", async () => {
@@ -113,7 +113,7 @@ const mockCore = {
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
           (process.env.GH_AW_DISCUSSION_CATEGORY = "DIC_custom789"),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation($repositoryId: ID!, $categoryId: ID!, $title: String!, $body: String!)"), expect.objectContaining({ categoryId: "DIC_custom789" })));
       }),
       it("should handle repositories without discussions enabled gracefully", async () => {
@@ -121,7 +121,7 @@ const mockCore = {
         mockGithub.graphql.mockRejectedValue(discussionError);
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockCore.warning).toHaveBeenCalledWith("Skipping discussion: Discussions are not enabled for repository 'testowner/testrepo'"),
           expect(mockGithub.graphql).toHaveBeenCalledTimes(1));
       }),
@@ -141,7 +141,7 @@ const mockCore = {
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
           (process.env.GH_AW_DISCUSSION_CATEGORY = "Custom"),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Using category by name: Custom (DIC_custom789)"),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation($repositoryId: ID!, $categoryId: ID!, $title: String!, $body: String!)"), expect.objectContaining({ categoryId: "DIC_custom789" })));
       }),
@@ -161,7 +161,7 @@ const mockCore = {
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
           (process.env.GH_AW_DISCUSSION_CATEGORY = "custom-category"),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Using category by slug: Custom Category (DIC_custom789)"),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation($repositoryId: ID!, $categoryId: ID!, $title: String!, $body: String!)"), expect.objectContaining({ categoryId: "DIC_custom789" })));
       }),
@@ -171,7 +171,7 @@ const mockCore = {
         const validOutput = { items: [{ type: "create_discussion", title: "Test Discussion", body: "Test discussion body" }] };
         (setAgentOutput(validOutput),
           (process.env.GH_AW_DISCUSSION_CATEGORY = "NonExistent"),
-          await eval(`(async () => { ${createDiscussionScript} })()`),
+          await eval(`(async () => { ${createDiscussionScript}; await main(); })()`),
           expect(mockCore.warning).toHaveBeenCalledWith('Category "NonExistent" not found by ID, name, or slug. Available categories: General'),
           expect(mockCore.info).toHaveBeenCalledWith("Falling back to default category: General (DIC_test456)"),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("mutation($repositoryId: ID!, $categoryId: ID!, $title: String!, $body: String!)"), expect.objectContaining({ categoryId: "DIC_test456" })));
diff --git a/pkg/workflow/js/create_issue.cjs b/pkg/workflow/js/create_issue.cjs
index 3852972602..d20ecf2236 100644
--- a/pkg/workflow/js/create_issue.cjs
+++ b/pkg/workflow/js/create_issue.cjs
@@ -347,6 +347,5 @@ async function main() {
 
   core.info(`Successfully created ${createdIssues.length} issue(s)`);
 }
-(async () => {
-  await main();
-})();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/create_issue.test.cjs b/pkg/workflow/js/create_issue.test.cjs
index ed69edd9f3..a5ffd48d69 100644
--- a/pkg/workflow/js/create_issue.test.cjs
+++ b/pkg/workflow/js/create_issue.test.cjs
@@ -58,18 +58,18 @@ const mockCore = {
       }),
       it("should skip when no agent output is provided", async () => {
         (delete process.env.GH_AW_AGENT_OUTPUT,
-          await eval(`(async () => { ${createIssueScript} })()`),
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"),
           expect(mockGithub.rest.issues.create).not.toHaveBeenCalled());
       }),
       it("should skip when agent output is empty", async () => {
-        (setAgentOutput(""), await eval(`(async () => { ${createIssueScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"), expect(mockGithub.rest.issues.create).not.toHaveBeenCalled());
+        (setAgentOutput(""), await eval(`(async () => { ${createIssueScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"), expect(mockGithub.rest.issues.create).not.toHaveBeenCalled());
       }),
       it("should create issue with default title when only body content provided", async () => {
         setAgentOutput({ items: [{ type: "create_issue", body: "This is the issue body content" }] });
         const mockIssue = { number: 456, html_url: "https://github.com/testowner/testrepo/issues/456" };
         (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }),
-          await eval(`(async () => { ${createIssueScript} })()`),
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.create).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", title: "This is the issue body content", body: expect.stringContaining("AI generated by"), labels: [] }),
           expect(mockCore.setOutput).toHaveBeenCalledWith("issue_number", 456),
           expect(mockCore.setOutput).toHaveBeenCalledWith("issue_url", mockIssue.html_url));
@@ -77,28 +77,28 @@ const mockCore = {
       it("should extract title from markdown heading", async () => {
         setAgentOutput({ items: [{ type: "create_issue", title: "Bug Report", body: "This is a detailed bug description\n\nSteps to reproduce:\n1. Step one" }] });
         const mockIssue = { number: 789, html_url: "https://github.com/testowner/testrepo/issues/789" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.title).toBe("Bug Report"), expect(callArgs.body).toContain("This is a detailed bug description"), expect(callArgs.body).toContain("Steps to reproduce:"));
       }),
       it("should handle labels from environment variable", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Issue with labels", body: "Issue with labels" }] }), (process.env.GH_AW_ISSUE_LABELS = "bug, enhancement, high-priority"));
         const mockIssue = { number: 101, html_url: "https://github.com/testowner/testrepo/issues/101" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(callArgs.labels).toEqual(["bug", "enhancement", "high-priority"]);
       }),
       it("should apply title prefix when provided", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Simple issue title", body: "Simple issue title" }] }), (process.env.GH_AW_ISSUE_TITLE_PREFIX = "[AUTO] "));
         const mockIssue = { number: 202, html_url: "https://github.com/testowner/testrepo/issues/202" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(callArgs.title).toBe("[AUTO] Simple issue title");
       }),
       it("should not duplicate title prefix when already present", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "[AUTO] Issue title already prefixed", body: "Issue body content" }] }), (process.env.GH_AW_ISSUE_TITLE_PREFIX = "[AUTO] "));
         const mockIssue = { number: 203, html_url: "https://github.com/testowner/testrepo/issues/203" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(callArgs.title).toBe("[AUTO] Issue title already prefixed");
       }),
@@ -120,21 +120,21 @@ const mockCore = {
           )
         ),
           mockGithub.rest.issues.createComment.mockResolvedValue({}),
-          await eval(`(async () => { ${createIssueScript} })()`));
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const createArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(createArgs.body).toContain("Related to #555");
       }),
       it("should handle empty labels gracefully", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Issue without labels", body: "Issue without labels" }] }), (process.env.GH_AW_ISSUE_LABELS = "  , , "));
         const mockIssue = { number: 303, html_url: "https://github.com/testowner/testrepo/issues/303" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(callArgs.labels).toEqual([]);
       }),
       it("should include run information in issue body", async () => {
         setAgentOutput({ items: [{ type: "create_issue", title: "Test issue content", body: "Test issue content" }] });
         const mockIssue = { number: 404, html_url: "https://github.com/testowner/testrepo/issues/404" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.body).toContain("AI generated by"), expect(callArgs.body).toContain("https://github.com/testowner/testrepo/actions/runs/12345"));
       }),
@@ -143,7 +143,7 @@ const mockCore = {
         const disabledError = new Error("Issues has been disabled in this repository.");
         mockGithub.rest.issues.create.mockRejectedValue(disabledError);
         const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
-        (await eval(`(async () => { ${createIssueScript} })()`),
+        (await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith('⚠ Cannot create issue "Test issue" in testowner/testrepo: Issues are disabled for this repository'),
           expect(mockCore.info).toHaveBeenCalledWith("Consider enabling issues in repository settings if you want to create issues automatically"),
           expect(consoleErrorSpy).not.toHaveBeenCalledWith(expect.stringContaining("✗ Failed to create issue")),
@@ -162,7 +162,7 @@ const mockCore = {
         const disabledError = new Error("Issues has been disabled in this repository."),
           mockIssue = { number: 505, html_url: "https://github.com/testowner/testrepo/issues/505" };
         (mockGithub.rest.issues.create.mockRejectedValueOnce(disabledError).mockResolvedValueOnce({ data: mockIssue }),
-          await eval(`(async () => { ${createIssueScript} })()`),
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith('⚠ Cannot create issue "First issue" in testowner/testrepo: Issues are disabled for this repository'),
           expect(mockGithub.rest.issues.create).toHaveBeenCalledTimes(2));
       }),
@@ -170,14 +170,14 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Issue with duplicate labels", body: "Testing duplicate label handling", labels: ["bug", "enhancement", "bug", "automation"] }] }),
           (process.env.GH_AW_ISSUE_LABELS = "bug,enhancement,automation"));
         const mockIssue = { number: 606, html_url: "https://github.com/testowner/testrepo/issues/606" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.labels).toEqual(["bug", "enhancement", "automation"]), expect(callArgs.labels).toHaveLength(3));
       }),
       it("should sanitize labels by removing problematic characters", async () => {
         setAgentOutput({ items: [{ type: "create_issue", title: "Issue with problematic labels", body: "Testing label sanitization", labels: ["bug<script>", "enhancement@user", "automation&test", "normal-label"] }] });
         const mockIssue = { number: 707, html_url: "https://github.com/testowner/testrepo/issues/707" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(callArgs.labels).toEqual(["bugscript", "enhancement@user", "automationtest", "normal-label"]);
       }),
@@ -185,14 +185,14 @@ const mockCore = {
         const longLabel = "a".repeat(100);
         setAgentOutput({ items: [{ type: "create_issue", title: "Issue with long labels", body: "Testing label length limiting", labels: [longLabel, "short"] }] });
         const mockIssue = { number: 808, html_url: "https://github.com/testowner/testrepo/issues/808" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.labels[0]).toHaveLength(64), expect(callArgs.labels[0]).toBe("a".repeat(64)), expect(callArgs.labels[1]).toBe("short"));
       }),
       it("should remove empty and whitespace-only labels", async () => {
         setAgentOutput({ items: [{ type: "create_issue", title: "Issue with empty labels", body: "Testing empty label removal", labels: ["bug", "", "   ", "enhancement", null, void 0, 0, !1] }] });
         const mockIssue = { number: 909, html_url: "https://github.com/testowner/testrepo/issues/909" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         expect(callArgs.labels).toEqual(["bug", "enhancement"]);
       }),
@@ -202,7 +202,7 @@ const mockCore = {
           (process.env.GH_AW_WORKFLOW_SOURCE = "githubnext/agentics/workflows/ci-doctor.md@v1.0.0"),
           (process.env.GH_AW_WORKFLOW_SOURCE_URL = "https://github.com/githubnext/agentics/tree/v1.0.0/workflows/ci-doctor.md"));
         const mockIssue = { number: 101, html_url: "https://github.com/testowner/testrepo/issues/101" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`), expect(mockGithub.rest.issues.create).toHaveBeenCalled());
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`), expect(mockGithub.rest.issues.create).toHaveBeenCalled());
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test issue with source"),
           expect(callArgs.body).toContain("AI generated by [Test Workflow]"),
@@ -213,7 +213,7 @@ const mockCore = {
       it("should not include workflow source footer when GH_AW_WORKFLOW_SOURCE is not provided", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Test Issue", body: "Test issue without source" }] }), (process.env.GH_AW_WORKFLOW_NAME = "Test Workflow"), delete process.env.GH_AW_WORKFLOW_SOURCE);
         const mockIssue = { number: 102, html_url: "https://github.com/testowner/testrepo/issues/102" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`), expect(mockGithub.rest.issues.create).toHaveBeenCalled());
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`), expect(mockGithub.rest.issues.create).toHaveBeenCalled());
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test issue without source"),
           expect(callArgs.body).toContain("AI generated by [Test Workflow]"),
@@ -225,7 +225,7 @@ const mockCore = {
         const mockIssue = { number: 999, html_url: "https://github.com/testowner/testrepo/issues/999" };
         (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }),
           mockGithub.graphql.mockResolvedValue({ repository: { issue: { id: "test-id" } }, addSubIssue: { subIssue: { id: "test-id", number: 999 } } }),
-          await eval(`(async () => { ${createIssueScript} })()`));
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.body).toContain("AI generated by [Test Workflow]"), expect(callArgs.body).toContain("for #42"));
       }),
@@ -235,7 +235,7 @@ const mockCore = {
           delete global.context.payload.issue,
           (global.context.payload.pull_request = { number: 123 }));
         const mockIssue = { number: 888, html_url: "https://github.com/testowner/testrepo/issues/888" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.body).toContain("AI generated by [Test Workflow]"), expect(callArgs.body).toContain("for #123"), delete global.context.payload.pull_request);
       }),
@@ -246,14 +246,14 @@ const mockCore = {
           delete global.context.payload.pull_request,
           delete global.context.payload.discussion);
         const mockIssue = { number: 777, html_url: "https://github.com/testowner/testrepo/issues/777" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const callArgs = mockGithub.rest.issues.create.mock.calls[0][0];
         (expect(callArgs.body).toContain("AI generated by [Test Workflow]"), expect(callArgs.body).not.toMatch(/for #\d+/), expect(callArgs.body).not.toMatch(/for discussion #\d+/));
       }),
       it("should log summary content to core.info in staged mode", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Staged Issue Title", body: "Staged issue body content", labels: ["bug", "enhancement"] }] }),
           (process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
-          await eval(`(async () => { ${createIssueScript} })()`),
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.create).not.toHaveBeenCalled(),
           expect(mockCore.summary.addRaw).toHaveBeenCalled(),
           expect(mockCore.summary.write).toHaveBeenCalled());
@@ -270,7 +270,7 @@ const mockCore = {
       it("should generate temporary_id_map output with created issues", async () => {
         setAgentOutput({ items: [{ type: "create_issue", title: "Parent Issue", body: "This is a parent issue", temporary_id: "aw_abc123def456" }] });
         const mockIssue = { number: 100, title: "Parent Issue", html_url: "https://github.com/testowner/testrepo/issues/100" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const setOutputCalls = mockCore.setOutput.mock.calls,
           tempIdMapCalls = setOutputCalls.filter(call => "temporary_id_map" === call[0]),
           lastTempIdMapCall = tempIdMapCalls[tempIdMapCalls.length - 1];
@@ -289,7 +289,7 @@ const mockCore = {
           subIssue = { number: 101, title: "Sub Issue", html_url: "https://github.com/testowner/testrepo/issues/101" };
         (mockGithub.rest.issues.create.mockResolvedValueOnce({ data: parentIssue }).mockResolvedValueOnce({ data: subIssue }),
           mockGithub.graphql.mockResolvedValue({ repository: { issue: { id: "test-node-id" } }, addSubIssue: { subIssue: { id: "test-child-id", number: 101 } } }),
-          await eval(`(async () => { ${createIssueScript} })()`),
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Resolved parent temporary ID 'aw_aabbccdd1122' to testowner/testrepo#100"),
           expect(mockGithub.rest.issues.create).toHaveBeenCalledTimes(2));
       }),
@@ -302,14 +302,14 @@ const mockCore = {
         });
         const parentIssue = { number: 200, title: "Parent Issue", html_url: "https://github.com/testowner/testrepo/issues/200" },
           subIssue = { number: 201, title: "Sub Issue", html_url: "https://github.com/testowner/testrepo/issues/201" };
-        (mockGithub.rest.issues.create.mockResolvedValueOnce({ data: parentIssue }).mockResolvedValueOnce({ data: subIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValueOnce({ data: parentIssue }).mockResolvedValueOnce({ data: subIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const secondCallArgs = mockGithub.rest.issues.create.mock.calls[1][0];
         (expect(secondCallArgs.body).toContain("#200"), expect(secondCallArgs.body).not.toContain("#aw_aabbccdd1122"));
       }),
       it("should generate auto temporary_id when none is provided", async () => {
         setAgentOutput({ items: [{ type: "create_issue", title: "Issue without explicit temporary_id", body: "Body content" }] });
         const mockIssue = { number: 300, title: "Issue without explicit temporary_id", html_url: "https://github.com/testowner/testrepo/issues/300" };
-        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript} })()`));
+        (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }), await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const setOutputCalls = mockCore.setOutput.mock.calls,
           tempIdMapCalls = setOutputCalls.filter(call => "temporary_id_map" === call[0]),
           lastTempIdMapCall = tempIdMapCalls[tempIdMapCalls.length - 1];
@@ -321,7 +321,7 @@ const mockCore = {
       it("should show temporary_id in staged mode preview", async () => {
         (setAgentOutput({ items: [{ type: "create_issue", title: "Issue with temp ID", body: "Body content", temporary_id: "aw_a1b2c3d4e5f6" }] }),
           (process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
-          await eval(`(async () => { ${createIssueScript} })()`));
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`));
         const infoCall = mockCore.info.mock.calls.find(call => call[0].includes("🎭 Staged Mode: Create Issues Preview"));
         (expect(infoCall).toBeDefined(), expect(infoCall[0]).toContain("**Temporary ID:** aw_a1b2c3d4e5f6"), delete process.env.GH_AW_SAFE_OUTPUTS_STAGED);
       }),
@@ -329,7 +329,7 @@ const mockCore = {
         setAgentOutput({ items: [{ type: "create_issue", title: "Sub Issue", body: "References non-existent parent", parent: "aw_000000000000" }] });
         const mockIssue = { number: 400, title: "Sub Issue", html_url: "https://github.com/testowner/testrepo/issues/400" };
         (mockGithub.rest.issues.create.mockResolvedValue({ data: mockIssue }),
-          await eval(`(async () => { ${createIssueScript} })()`),
+          await eval(`(async () => { ${createIssueScript}; await main(); })()`),
           expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("Parent temporary ID 'aw_000000000000' not found")));
       }));
   }));
diff --git a/pkg/workflow/js/create_pr_review_comment.cjs b/pkg/workflow/js/create_pr_review_comment.cjs
index 6dc42781ed..65f6d6cb48 100644
--- a/pkg/workflow/js/create_pr_review_comment.cjs
+++ b/pkg/workflow/js/create_pr_review_comment.cjs
@@ -255,4 +255,5 @@ async function main() {
   core.info(`Successfully created ${createdComments.length} review comment(s)`);
   return createdComments;
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/create_pr_review_comment.test.cjs b/pkg/workflow/js/create_pr_review_comment.test.cjs
index bc4835aa84..bb80aea07f 100644
--- a/pkg/workflow/js/create_pr_review_comment.test.cjs
+++ b/pkg/workflow/js/create_pr_review_comment.test.cjs
@@ -60,7 +60,7 @@ const mockCore = {
       it("should create a single PR review comment with basic configuration", async () => {
         (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: { id: 456, html_url: "https://github.com/testowner/testrepo/pull/123#discussion_r456" } }),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "Consider using const instead of let here." }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledWith({
             owner: "testowner",
             repo: "testrepo",
@@ -77,7 +77,7 @@ const mockCore = {
       it("should create a multi-line PR review comment", async () => {
         (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: { id: 789, html_url: "https://github.com/testowner/testrepo/pull/123#discussion_r789" } }),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/utils.js", line: 25, start_line: 20, side: "LEFT", body: "This entire function could be simplified using modern JS features." }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledWith({
             owner: "testowner",
             repo: "testrepo",
@@ -101,7 +101,7 @@ const mockCore = {
               { type: "create_pull_request_review_comment", path: "src/utils.js", line: 25, body: "Second comment" },
             ],
           }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledTimes(2),
           expect(mockCore.setOutput).toHaveBeenCalledWith("review_comment_id", 222),
           expect(mockCore.setOutput).toHaveBeenCalledWith("review_comment_url", "https://github.com/testowner/testrepo/pull/123#discussion_r222"));
@@ -110,13 +110,13 @@ const mockCore = {
         (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: { id: 333, html_url: "https://github.com/testowner/testrepo/pull/123#discussion_r333" } }),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "Comment on left side" }] }),
           (process.env.GH_AW_PR_REVIEW_COMMENT_SIDE = "LEFT"),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledWith(expect.objectContaining({ side: "LEFT" })));
       }),
       it("should skip when not in pull request context", async () => {
         ((global.context = { ...mockContext, eventName: "issues", payload: { issue: { number: 123 }, repository: mockContext.payload.repository } }),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "This should not be created" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).not.toHaveBeenCalled(),
           expect(mockCore.setOutput).not.toHaveBeenCalled());
       }),
@@ -129,24 +129,24 @@ const mockCore = {
             { type: "create_pull_request_review_comment", path: "src/main.js", line: "invalid", body: "Invalid line number" },
           ],
         }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).not.toHaveBeenCalled(),
           expect(mockCore.setOutput).not.toHaveBeenCalled());
       }),
       it("should validate start_line is not greater than line", async () => {
         (setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, start_line: 15, body: "Invalid range" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).not.toHaveBeenCalled());
       }),
       it("should validate side values", async () => {
         (setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, side: "INVALID_SIDE", body: "Invalid side value" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).not.toHaveBeenCalled());
       }),
       it("should include AI disclaimer in comment body", async () => {
         (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: { id: 999, html_url: "https://github.com/testowner/testrepo/pull/123#discussion_r999" } }),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "Original comment" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledWith(expect.objectContaining({ body: expect.stringMatching(/Original comment[\s\S]*AI generated by/) })));
       }),
       it("should respect target configuration for specific PR number", async () => {
@@ -154,7 +154,7 @@ const mockCore = {
           (mockGithub.rest.pulls.get = vi.fn().mockResolvedValue({ data: { number: 456, head: { sha: "def456abc789" } } })),
           (mockGithub.rest.pulls.createReviewComment = vi.fn().mockResolvedValue({ data: { id: 999, html_url: "https://github.com/testowner/testrepo/pull/456#discussion_r999" } })),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "Review comment on specific PR" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", pull_number: 456 }),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledWith(expect.objectContaining({ pull_number: 456, path: "src/main.js", line: 10, commit_id: "def456abc789" })));
       }),
@@ -163,21 +163,21 @@ const mockCore = {
           (mockGithub.rest.pulls.get = vi.fn().mockResolvedValue({ data: { number: 789, head: { sha: "xyz789abc456" } } })),
           (mockGithub.rest.pulls.createReviewComment = vi.fn().mockResolvedValue({ data: { id: 888, html_url: "https://github.com/testowner/testrepo/pull/789#discussion_r888" } })),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", pull_request_number: 789, path: "src/utils.js", line: 20, body: "Review comment on any PR" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", pull_number: 789 }),
           expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalledWith(expect.objectContaining({ pull_number: 789, path: "src/utils.js", line: 20, commit_id: "xyz789abc456" })));
       }),
       it('should skip item when target is "*" but no pull_request_number specified', async () => {
         ((process.env.GH_AW_PR_REVIEW_COMMENT_TARGET = "*"),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "Review comment without PR number" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).not.toHaveBeenCalled());
       }),
       it("should skip comment creation when target is triggering but not in PR context", async () => {
         ((process.env.GH_AW_PR_REVIEW_COMMENT_TARGET = "triggering"),
           (global.context = { eventName: "issues", runId: 12345, repo: { owner: "testowner", repo: "testrepo" }, payload: { issue: { number: 10 }, repository: { html_url: "https://github.com/testowner/testrepo" } } }),
           setAgentOutput({ items: [{ type: "create_pull_request_review_comment", path: "src/main.js", line: 10, body: "This should not be created" }] }),
-          await eval(`(async () => { ${createPRReviewCommentScript} })()`),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
           expect(mockGithub.rest.pulls.createReviewComment).not.toHaveBeenCalled());
       }),
       it("should include workflow source in footer when GH_AW_WORKFLOW_SOURCE is provided", async () => {
@@ -192,7 +192,9 @@ const mockCore = {
             payload: { pull_request: { number: 10, head: { sha: "abc123" } }, repository: { html_url: "https://github.com/testowner/testrepo" } },
           }));
         const mockComment = { id: 456, html_url: "https://github.com/testowner/testrepo/pull/10#discussion_r456" };
-        (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createPRReviewCommentScript} })()`), expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalled());
+        (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: mockComment }),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
+          expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalled());
         const callArgs = mockGithub.rest.pulls.createReviewComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test review comment with source"),
           expect(callArgs.body).toContain("AI generated by [Test Workflow]"),
@@ -211,7 +213,9 @@ const mockCore = {
             payload: { pull_request: { number: 10, head: { sha: "abc123" } }, repository: { html_url: "https://github.com/testowner/testrepo" } },
           }));
         const mockComment = { id: 457, html_url: "https://github.com/testowner/testrepo/pull/10#discussion_r457" };
-        (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createPRReviewCommentScript} })()`), expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalled());
+        (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: mockComment }),
+          await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`),
+          expect(mockGithub.rest.pulls.createReviewComment).toHaveBeenCalled());
         const callArgs = mockGithub.rest.pulls.createReviewComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Test review comment without source"),
           expect(callArgs.body).toContain("AI generated by [Test Workflow]"),
@@ -224,7 +228,7 @@ const mockCore = {
           (global.context.eventName = "pull_request"),
           (global.context.payload.pull_request = { number: 123, head: { sha: "abc123" } }));
         const mockComment = { id: 999, html_url: "https://github.com/testowner/testrepo/pull/123#discussion_r999" };
-        (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createPRReviewCommentScript} })()`));
+        (mockGithub.rest.pulls.createReviewComment.mockResolvedValue({ data: mockComment }), await eval(`(async () => { ${createPRReviewCommentScript}; await main(); })()`));
         const callArgs = mockGithub.rest.pulls.createReviewComment.mock.calls[0][0];
         (expect(callArgs.body).toContain("Review comment from PR context"), expect(callArgs.body).toContain("AI generated by [Test Workflow]"), expect(callArgs.body).toContain("for #123"));
       }));
diff --git a/pkg/workflow/js/create_pull_request.cjs b/pkg/workflow/js/create_pull_request.cjs
index 5f9fc75da3..7436d2ce43 100644
--- a/pkg/workflow/js/create_pull_request.cjs
+++ b/pkg/workflow/js/create_pull_request.cjs
@@ -680,4 +680,5 @@ You can manually create a pull request from the branch if needed.${patchPreview}
     }
   }
 }
-await main();
+
+module.exports = { main };
diff --git a/pkg/workflow/js/create_pull_request.test.cjs b/pkg/workflow/js/create_pull_request.test.cjs
index 39910051f4..1fae264f1b 100644
--- a/pkg/workflow/js/create_pull_request.test.cjs
+++ b/pkg/workflow/js/create_pull_request.test.cjs
@@ -2,8 +2,9 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 import { readFileSync } from "fs";
 import path from "path";
 const createTestableFunction = scriptContent => {
-  const beforeMainCall = scriptContent.match(/^([\s\S]*?)\s*await main\(\);?\s*$/);
-  if (!beforeMainCall) throw new Error("Could not extract script content before await main()");
+  // Match either the old pattern (await main()) or the new pattern (module.exports = { main })
+  const beforeMainCall = scriptContent.match(/^([\s\S]*?)\s*(?:await main\(\);?|module\.exports = \{ main \};?)\s*$/);
+  if (!beforeMainCall) throw new Error("Could not extract script content before await main() or module.exports");
   let scriptBody = beforeMainCall[1];
   return (
     (scriptBody = scriptBody.replace(/\/\*\* @type \{typeof import\("fs"\)\} \*\/\s*const fs = require\("fs"\);?\s*/g, "")),
diff --git a/pkg/workflow/js/hide_comment.cjs b/pkg/workflow/js/hide_comment.cjs
index 59fc2a9c55..c63dbf1291 100644
--- a/pkg/workflow/js/hide_comment.cjs
+++ b/pkg/workflow/js/hide_comment.cjs
@@ -118,5 +118,4 @@ async function main() {
   }
 }
 
-// Call the main function
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/hide_comment.test.cjs b/pkg/workflow/js/hide_comment.test.cjs
index b6024dcf27..fc525a4312 100644
--- a/pkg/workflow/js/hide_comment.test.cjs
+++ b/pkg/workflow/js/hide_comment.test.cjs
@@ -29,16 +29,16 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         tempFilePath && fs.existsSync(tempFilePath) && (fs.unlinkSync(tempFilePath), (tempFilePath = void 0));
       }),
       it("should handle empty agent output", async () => {
-        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${hideCommentScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No hide-comment items found in agent output"));
+        (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${hideCommentScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No hide-comment items found in agent output"));
       }),
       it("should handle missing agent output", async () => {
-        (await eval(`(async () => { ${hideCommentScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
+        (await eval(`(async () => { ${hideCommentScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"));
       }),
       it("should hide a comment successfully", async () => {
         const commentNodeId = "IC_kwDOABCD123456";
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: commentNodeId }], errors: [] }),
           mockGithub.graphql.mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !0 } } }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Found 1 hide-comment item(s)"),
           expect(mockCore.info).toHaveBeenCalledWith(`Hiding comment: ${commentNodeId} (reason: SPAM)`),
           expect(mockCore.info).toHaveBeenCalledWith(`Successfully hidden comment: ${commentNodeId}`),
@@ -51,7 +51,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         setAgentOutput({ items: [{ type: "hide_comment", comment_id: commentNodeId }], errors: [] });
         const errorMessage = "Comment not found";
         (mockGithub.graphql.mockRejectedValueOnce(new Error(errorMessage)),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining(errorMessage)),
           expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining(errorMessage)));
       }),
@@ -59,7 +59,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true";
         const commentNodeId = "IC_kwDOABCD123456";
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: commentNodeId }], errors: [] }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Found 1 hide-comment item(s)"),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("Staged Mode: Hide Comments Preview")),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining(commentNodeId)),
@@ -77,7 +77,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           errors: [],
         }),
           mockGithub.graphql.mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !0 } } }).mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !0 } } }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Found 2 hide-comment item(s)"),
           expect(mockGithub.graphql).toHaveBeenCalledTimes(2),
           expect(mockCore.info).toHaveBeenCalledWith(`Successfully hidden comment: ${commentNodeId1}`),
@@ -85,7 +85,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       }),
       it("should fail when comment_id is missing", async () => {
         (setAgentOutput({ items: [{ type: "hide_comment" }], errors: [] }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("comment_id is required")),
           expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("comment_id is required")));
       }),
@@ -93,7 +93,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         const commentNodeId = "IC_kwDOABCD123456";
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: commentNodeId }], errors: [] }),
           mockGithub.graphql.mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !1 } } }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Failed to hide comment")),
           expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Failed to hide comment")));
       }),
@@ -101,7 +101,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: "IC_kwDOABCD123456", reason: "SPAM" }] }),
           (process.env.GH_AW_HIDE_COMMENT_ALLOWED_REASONS = JSON.stringify(["SPAM", "ABUSE"])),
           mockGithub.graphql.mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !0 } } }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("minimizeComment"), expect.objectContaining({ nodeId: "IC_kwDOABCD123456", classifier: "SPAM" })),
           expect(mockCore.info).toHaveBeenCalledWith("Allowed reasons for hiding: [SPAM, ABUSE]"),
           expect(mockCore.info).toHaveBeenCalledWith("Successfully hidden comment: IC_kwDOABCD123456"));
@@ -109,14 +109,14 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should skip hiding when reason is not in allowed-reasons", async () => {
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: "IC_kwDOABCD123456", reason: "OUTDATED" }] }),
           (process.env.GH_AW_HIDE_COMMENT_ALLOWED_REASONS = JSON.stringify(["SPAM"])),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockGithub.graphql).not.toHaveBeenCalled(),
           expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining('Reason "OUTDATED" is not in allowed-reasons list')));
       }),
       it("should allow all reasons when allowed-reasons is not specified", async () => {
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: "IC_kwDOABCD123456", reason: "RESOLVED" }] }),
           mockGithub.graphql.mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !0 } } }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("minimizeComment"), expect.objectContaining({ nodeId: "IC_kwDOABCD123456", classifier: "RESOLVED" })),
           expect(mockCore.info).toHaveBeenCalledWith("Successfully hidden comment: IC_kwDOABCD123456"));
       }),
@@ -124,7 +124,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         (setAgentOutput({ items: [{ type: "hide_comment", comment_id: "IC_kwDOABCD123456", reason: "spam" }] }),
           (process.env.GH_AW_HIDE_COMMENT_ALLOWED_REASONS = JSON.stringify(["spam", "abuse"])),
           mockGithub.graphql.mockResolvedValueOnce({ minimizeComment: { minimizedComment: { isMinimized: !0 } } }),
-          await eval(`(async () => { ${hideCommentScript} })()`),
+          await eval(`(async () => { ${hideCommentScript}; await main(); })()`),
           expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("minimizeComment"), expect.objectContaining({ nodeId: "IC_kwDOABCD123456", classifier: "SPAM" })),
           expect(mockCore.info).toHaveBeenCalledWith("Successfully hidden comment: IC_kwDOABCD123456"));
       }));
diff --git a/pkg/workflow/js/link_sub_issue.cjs b/pkg/workflow/js/link_sub_issue.cjs
index 5ca6fd42ed..d97e486663 100644
--- a/pkg/workflow/js/link_sub_issue.cjs
+++ b/pkg/workflow/js/link_sub_issue.cjs
@@ -358,4 +358,4 @@ async function main() {
   }
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/link_sub_issue.test.cjs b/pkg/workflow/js/link_sub_issue.test.cjs
index 11aa236fec..6fa1c9ece1 100644
--- a/pkg/workflow/js/link_sub_issue.test.cjs
+++ b/pkg/workflow/js/link_sub_issue.test.cjs
@@ -56,7 +56,7 @@ const mockCore = {
       (fs.writeFileSync(outputFile, JSON.stringify(output)), (process.env.GH_AW_AGENT_OUTPUT = outputFile));
     };
     async function runScript() {
-      await eval(`(async () => { ${linkSubIssueScript} })()`);
+      await eval(`(async () => { ${linkSubIssueScript}; await main(); })()`);
     }
     (afterEach(() => {
       tempDir && fs.existsSync(tempDir) && fs.rmSync(tempDir, { recursive: !0 });
diff --git a/pkg/workflow/js/lock-issue.test.cjs b/pkg/workflow/js/lock-issue.test.cjs
index 4c91f418dc..39bfa7c74e 100644
--- a/pkg/workflow/js/lock-issue.test.cjs
+++ b/pkg/workflow/js/lock-issue.test.cjs
@@ -17,7 +17,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should lock issue successfully", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } }),
           mockGithub.rest.issues.lock.mockResolvedValue({ status: 204 }),
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.lock).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #42 is already locked"),
@@ -28,7 +28,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       }),
       it("should skip locking if issue is already locked", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !0 } }),
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.lock).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #42 is already locked"),
@@ -38,7 +38,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       }),
       it("should skip locking if issue is a pull request", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1, pull_request: { url: "https://api.github.com/repos/testowner/testrepo/pulls/42" } } }),
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.lock).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #42 is already locked"),
@@ -49,7 +49,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should fail when issue number is not found in context", async () => {
         ((global.context.issue = {}),
           delete global.context.payload.issue,
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.lock).not.toHaveBeenCalled(),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Issue number not found in context"));
       }),
@@ -57,7 +57,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } });
         const apiError = new Error("API rate limit exceeded");
         (mockGithub.rest.issues.lock.mockRejectedValue(apiError),
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.lock).toHaveBeenCalled(),
           expect(mockCore.error).toHaveBeenCalledWith("Failed to lock issue: API rate limit exceeded"),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to lock issue #42: API rate limit exceeded"),
@@ -66,7 +66,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should handle non-Error exceptions", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } }),
           mockGithub.rest.issues.lock.mockRejectedValue("String error"),
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith("Failed to lock issue: String error"),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to lock issue #42: String error"),
           expect(mockCore.setOutput).toHaveBeenCalledWith("locked", "false"));
@@ -76,14 +76,14 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           (global.context.payload.issue = { number: 100 }),
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 100, locked: !1 } }),
           mockGithub.rest.issues.lock.mockResolvedValue({ status: 204 }),
-          await eval(`(async () => { ${lockIssueScript} })()`),
+          await eval(`(async () => { ${lockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.lock).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 100 }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #100 is already locked"),
           expect(mockCore.info).toHaveBeenCalledWith("Locking issue #100 for agent workflow execution"),
           expect(mockCore.info).toHaveBeenCalledWith("✅ Successfully locked issue #100"));
       }),
       it("should not provide a lock reason", async () => {
-        (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } }), mockGithub.rest.issues.lock.mockResolvedValue({ status: 204 }), await eval(`(async () => { ${lockIssueScript} })()`));
+        (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } }), mockGithub.rest.issues.lock.mockResolvedValue({ status: 204 }), await eval(`(async () => { ${lockIssueScript}; await main(); })()`));
         const lockCall = mockGithub.rest.issues.lock.mock.calls[0][0];
         (expect(lockCall).not.toHaveProperty("lock_reason"), expect(lockCall).toEqual({ owner: "testowner", repo: "testrepo", issue_number: 42 }));
       }));
diff --git a/pkg/workflow/js/missing_tool.test.cjs b/pkg/workflow/js/missing_tool.test.cjs
index 08e22d41e6..69bd28774a 100644
--- a/pkg/workflow/js/missing_tool.test.cjs
+++ b/pkg/workflow/js/missing_tool.test.cjs
@@ -39,6 +39,7 @@ describe("missing_tool.cjs", () => {
         summary: { addRaw: vi.fn().mockReturnThis(), write: vi.fn().mockResolvedValue() },
       }),
       (global.core = mockCore),
+      (global.module = { exports: {} }), // Add module for exports
       (global.require = vi.fn().mockImplementation(module => {
         if ("fs" === module) return fs;
         if ("@actions/core" === module) return mockCore;
@@ -53,9 +54,15 @@ describe("missing_tool.cjs", () => {
         delete process.env.GH_AW_MISSING_TOOL_MAX,
         (global.console = originalConsole),
         delete global.core,
+        delete global.module,
         delete global.require);
     }));
-  const runScript = async () => new Function(missingToolScript)();
+  const runScript = async () => {
+    new Function(missingToolScript)();
+    if (global.module.exports.main) {
+      await global.module.exports.main();
+    }
+  };
   (describe("JSON Array Input Format", () => {
     (it("should parse JSON array with missing-tool entries", async () => {
       (setAgentOutput({
diff --git a/pkg/workflow/js/noop.test.cjs b/pkg/workflow/js/noop.test.cjs
index e52079ae63..3c243b6d28 100644
--- a/pkg/workflow/js/noop.test.cjs
+++ b/pkg/workflow/js/noop.test.cjs
@@ -19,11 +19,11 @@ describe("noop", () => {
       tempFilePath && fs.existsSync(tempFilePath) && (fs.unlinkSync(tempFilePath), (tempFilePath = void 0));
     }),
     it("should handle empty agent output", async () => {
-      (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${noopScript} })()`), expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No noop items found")));
+      (setAgentOutput({ items: [], errors: [] }), await eval(`(async () => { ${noopScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No noop items found")));
     }),
     it("should process single noop message", async () => {
       (setAgentOutput({ items: [{ type: "noop", message: "No issues found in this review" }], errors: [] }),
-        await eval(`(async () => { ${noopScript} })()`),
+        await eval(`(async () => { ${noopScript}; await main(); })()`),
         expect(mockCore.info).toHaveBeenCalledWith("Found 1 noop item(s)"),
         expect(mockCore.info).toHaveBeenCalledWith("No-op message 1: No issues found in this review"),
         expect(mockCore.setOutput).toHaveBeenCalledWith("noop_message", "No issues found in this review"),
@@ -40,7 +40,7 @@ describe("noop", () => {
         ],
         errors: [],
       }),
-        await eval(`(async () => { ${noopScript} })()`),
+        await eval(`(async () => { ${noopScript}; await main(); })()`),
         expect(mockCore.info).toHaveBeenCalledWith("Found 3 noop item(s)"),
         expect(mockCore.info).toHaveBeenCalledWith("No-op message 1: First message"),
         expect(mockCore.info).toHaveBeenCalledWith("No-op message 2: Second message"),
@@ -51,7 +51,7 @@ describe("noop", () => {
     it("should show preview in staged mode", async () => {
       ((process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
         setAgentOutput({ items: [{ type: "noop", message: "Test message in staged mode" }], errors: [] }),
-        await eval(`(async () => { ${noopScript} })()`),
+        await eval(`(async () => { ${noopScript}; await main(); })()`),
         expect(mockCore.info).toHaveBeenCalledWith("Found 1 noop item(s)"),
         expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("📝 No-op message preview written to step summary")),
         expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("🎭 Staged Mode")),
@@ -67,12 +67,12 @@ describe("noop", () => {
         ],
         errors: [],
       }),
-        await eval(`(async () => { ${noopScript} })()`),
+        await eval(`(async () => { ${noopScript}; await main(); })()`),
         expect(mockCore.info).toHaveBeenCalledWith("Found 1 noop item(s)"),
         expect(mockCore.info).toHaveBeenCalledWith("No-op message 1: This is the only noop"));
     }),
     it("should handle missing agent output file", async () => {
-      ((process.env.GH_AW_AGENT_OUTPUT = "/tmp/nonexistent.json"), await eval(`(async () => { ${noopScript} })()`), expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Error reading agent output file")));
+      ((process.env.GH_AW_AGENT_OUTPUT = "/tmp/nonexistent.json"), await eval(`(async () => { ${noopScript}; await main(); })()`), expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Error reading agent output file")));
     }),
     it("should generate proper step summary format", async () => {
       (setAgentOutput({
@@ -82,7 +82,7 @@ describe("noop", () => {
         ],
         errors: [],
       }),
-        await eval(`(async () => { ${noopScript} })()`));
+        await eval(`(async () => { ${noopScript}; await main(); })()`));
       const summaryCall = mockCore.summary.addRaw.mock.calls[0][0];
       (expect(summaryCall).toContain("## No-Op Messages"), expect(summaryCall).toContain("- Analysis complete"), expect(summaryCall).toContain("- No action required"));
     }));
diff --git a/pkg/workflow/js/notify_comment_error.test.cjs b/pkg/workflow/js/notify_comment_error.test.cjs
index a4aee3093d..04006de50c 100644
--- a/pkg/workflow/js/notify_comment_error.test.cjs
+++ b/pkg/workflow/js/notify_comment_error.test.cjs
@@ -68,7 +68,7 @@ const mockCore = {
             (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             (process.env.GH_AW_AGENT_CONCLUSION = "failure"),
-            await eval(`(async () => { ${notifyCommentScript} })()`),
+            await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith("No comment ID found and no noop messages to process, skipping comment update"),
             expect(mockGithub.request).not.toHaveBeenCalled(),
             expect(mockGithub.graphql).not.toHaveBeenCalled());
@@ -80,7 +80,7 @@ const mockCore = {
             delete process.env.GH_AW_RUN_URL,
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             (process.env.GH_AW_AGENT_CONCLUSION = "failure"),
-            await eval(`(async () => { ${notifyCommentScript} })()`),
+            await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
             expect(mockCore.setFailed).toHaveBeenCalledWith("Run URL is required"),
             expect(mockGithub.request).not.toHaveBeenCalled(),
             expect(mockGithub.graphql).not.toHaveBeenCalled());
@@ -92,7 +92,7 @@ const mockCore = {
             (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             (process.env.GH_AW_AGENT_CONCLUSION = "success"),
-            await eval(`(async () => { ${notifyCommentScript} })()`),
+            await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
             expect(mockGithub.request).toHaveBeenCalledWith(
               "PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}",
               expect.objectContaining({ owner: "testowner", repo: "testrepo", comment_id: 123456, body: expect.stringContaining("found the treasure and completed successfully") })
@@ -104,7 +104,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "failure"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith(
                 "PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}",
                 expect.objectContaining({ owner: "testowner", repo: "testrepo", comment_id: 123456, body: expect.stringContaining("walked the plank") })
@@ -116,7 +116,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "cancelled"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith(
                 "PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}",
                 expect.objectContaining({ body: expect.stringContaining("was cancelled"), body: expect.stringContaining("walked the plank") })
@@ -127,7 +127,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "timed_out"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith(
                 "PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}",
                 expect.objectContaining({ body: expect.stringContaining("timed out"), body: expect.stringContaining("walked the plank") })
@@ -138,7 +138,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "skipped"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith(
                 "PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}",
                 expect.objectContaining({ body: expect.stringContaining("was skipped"), body: expect.stringContaining("walked the plank") })
@@ -150,7 +150,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "success"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith("PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}", expect.objectContaining({ owner: "customowner", repo: "customrepo" })));
           }),
           it("should prioritize detection failure message when detection job fails", async () => {
@@ -159,7 +159,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "success"),
               (process.env.GH_AW_DETECTION_CONCLUSION = "failure"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith(
                 "PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}",
                 expect.objectContaining({ owner: "testowner", repo: "testrepo", comment_id: 123456, body: expect.stringContaining("Security scanning failed") })
@@ -172,7 +172,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "failure"),
               (process.env.GH_AW_DETECTION_CONCLUSION = "failure"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith("PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}", expect.objectContaining({ body: expect.stringContaining("Security scanning failed") })));
           }),
           it("should show agent success when detection succeeds", async () => {
@@ -181,7 +181,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "success"),
               (process.env.GH_AW_DETECTION_CONCLUSION = "success"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.request).toHaveBeenCalledWith("PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}", expect.objectContaining({ body: expect.stringContaining("found the treasure and completed successfully") })));
           }));
       }),
@@ -191,7 +191,7 @@ const mockCore = {
             (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             (process.env.GH_AW_AGENT_CONCLUSION = "success"),
-            await eval(`(async () => { ${notifyCommentScript} })()`),
+            await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
             expect(mockGithub.graphql).toHaveBeenCalledWith(
               expect.stringContaining("updateDiscussionComment"),
               expect.objectContaining({ commentId: "DC_kwDOABCDEF4ABCDEF", body: expect.stringContaining("found the treasure and completed successfully") })
@@ -203,7 +203,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "failure"),
-              await eval(`(async () => { ${notifyCommentScript} })()`),
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
               expect(mockGithub.graphql).toHaveBeenCalledWith(expect.stringContaining("updateDiscussionComment"), expect.objectContaining({ commentId: "DC_kwDOABCDEF4ABCDEF", body: expect.stringContaining("walked the plank") })));
           }));
       }),
@@ -214,7 +214,7 @@ const mockCore = {
             (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
             (process.env.GH_AW_AGENT_CONCLUSION = "success"),
             mockGithub.request.mockRejectedValueOnce(new Error("API error")),
-            await eval(`(async () => { ${notifyCommentScript} })()`),
+            await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
             expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("Failed to update comment")),
             expect(mockCore.warning).toHaveBeenCalledWith(expect.stringContaining("API error")),
             expect(mockCore.setFailed).not.toHaveBeenCalled());
@@ -230,7 +230,7 @@ const mockCore = {
             (process.env.GH_AW_OUTPUT_CREATE_ISSUE_ISSUE_URL = "https://github.com/owner/repo/issues/42"),
             (process.env.GH_AW_OUTPUT_ADD_COMMENT_COMMENT_URL = "https://github.com/owner/repo/issues/1#issuecomment-123"),
             (process.env.GH_AW_OUTPUT_CREATE_PULL_REQUEST_PULL_REQUEST_URL = "https://github.com/owner/repo/pull/5"),
-            await eval(`(async () => { ${notifyCommentScript} })()`),
+            await eval(`(async () => { ${notifyCommentScript}; await main(); })()`),
             expect(mockGithub.request).toHaveBeenCalledWith("PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}", expect.objectContaining({ owner: "testowner", repo: "testrepo", comment_id: 123456 })));
           const callArgs = mockGithub.request.mock.calls[0][1];
           (expect(callArgs.body).toContain("https://github.com/owner/repo/issues/42"),
@@ -247,7 +247,7 @@ const mockCore = {
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "success"),
               (process.env.GH_AW_SAFE_OUTPUT_JOBS = JSON.stringify({ create_issue: "issue_url" })),
-              await eval(`(async () => { ${notifyCommentScript} })()`));
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`));
             const callArgs = mockGithub.request.mock.calls[0][1];
             expect(callArgs.body).toMatch(/completed successfully.*⚓💰$/);
           }),
@@ -256,7 +256,7 @@ const mockCore = {
               (process.env.GH_AW_RUN_URL = "https://github.com/owner/repo/actions/runs/123"),
               (process.env.GH_AW_WORKFLOW_NAME = "test-workflow"),
               (process.env.GH_AW_AGENT_CONCLUSION = "success"),
-              await eval(`(async () => { ${notifyCommentScript} })()`));
+              await eval(`(async () => { ${notifyCommentScript}; await main(); })()`));
             const callArgs = mockGithub.request.mock.calls[0][1];
             expect(callArgs.body).toMatch(/completed successfully.*⚓💰$/);
           }));
diff --git a/pkg/workflow/js/push_to_pull_request_branch.cjs b/pkg/workflow/js/push_to_pull_request_branch.cjs
index 4eb85a669f..25ffcc183a 100644
--- a/pkg/workflow/js/push_to_pull_request_branch.cjs
+++ b/pkg/workflow/js/push_to_pull_request_branch.cjs
@@ -422,4 +422,4 @@ async function main() {
   await core.summary.addRaw(summaryContent).write();
 }
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/push_to_pull_request_branch.test.cjs b/pkg/workflow/js/push_to_pull_request_branch.test.cjs
index c4b628f2cd..347857c255 100644
--- a/pkg/workflow/js/push_to_pull_request_branch.test.cjs
+++ b/pkg/workflow/js/push_to_pull_request_branch.test.cjs
@@ -60,7 +60,14 @@ const mockCore = {
           return agentOutputPath && filepath === agentOutputPath ? fs.readFileSync(filepath, encoding || "utf8") : patchContent;
         });
       },
-      executeScript = async () => ((global.core = mockCore), (global.context = mockContext), (global.github = mockGithub), (global.mockFs = mockFs), (global.exec = mockExec), await eval(`(async () => { ${pushToPrBranchScript} })()`));
+      executeScript = async () => (
+        (global.core = mockCore),
+        (global.context = mockContext),
+        (global.github = mockGithub),
+        (global.mockFs = mockFs),
+        (global.exec = mockExec),
+        await eval(`(async () => { ${pushToPrBranchScript}; await main(); })()`)
+      );
     (beforeEach(() => {
       (vi.clearAllMocks(),
         delete process.env.GH_AW_PUSH_TARGET,
@@ -204,7 +211,7 @@ const mockCore = {
         (it("should have valid JavaScript syntax", () => {
           const scriptPath = path.join(__dirname, "push_to_pull_request_branch.cjs"),
             scriptContent = fs.readFileSync(scriptPath, "utf8");
-          (expect(scriptContent).toContain("async function main()"), expect(scriptContent).toContain("core.setFailed"), expect(scriptContent).toContain("/tmp/gh-aw/aw.patch"), expect(scriptContent).toContain("await main()"));
+          (expect(scriptContent).toContain("async function main()"), expect(scriptContent).toContain("core.setFailed"), expect(scriptContent).toContain("/tmp/gh-aw/aw.patch"), expect(scriptContent).toContain("module.exports = { main }"));
         }),
           it("should export a main function", () => {
             const scriptPath = path.join(__dirname, "push_to_pull_request_branch.cjs"),
diff --git a/pkg/workflow/js/redact_secrets.test.cjs b/pkg/workflow/js/redact_secrets.test.cjs
index d9026bbb86..660f9913bc 100644
--- a/pkg/workflow/js/redact_secrets.test.cjs
+++ b/pkg/workflow/js/redact_secrets.test.cjs
@@ -45,14 +45,14 @@ describe("redact_secrets.cjs", () => {
     }),
     describe("main function integration", () => {
       (it("should skip redaction when GH_AW_SECRET_NAMES is not set", async () => {
-        (await eval(`(async () => { ${redactScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("GH_AW_SECRET_NAMES not set, no redaction performed"));
+        (await eval(`(async () => { ${redactScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("GH_AW_SECRET_NAMES not set, no redaction performed"));
       }),
         it("should redact secrets from files in /tmp using exact matching", async () => {
           const testFile = path.join(tempDir, "test.txt"),
             secretValue = "ghp_1234567890abcdefghijklmnopqrstuvwxyz";
           (fs.writeFileSync(testFile, `Secret: ${secretValue} and another ${secretValue}`), (process.env.GH_AW_SECRET_NAMES = "GITHUB_TOKEN"), (process.env.SECRET_GITHUB_TOKEN = secretValue));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          await eval(`(async () => { ${modifiedScript} })()`);
+          await eval(`(async () => { ${modifiedScript}; await main(); })()`);
           const redactedContent = fs.readFileSync(testFile, "utf8");
           (expect(redactedContent).toBe("Secret: ghp************************************* and another ghp*************************************"),
             expect(mockCore.info).toHaveBeenCalledWith("Starting secret redaction in /tmp/gh-aw directory"),
@@ -67,7 +67,7 @@ describe("redact_secrets.cjs", () => {
             (process.env.SECRET_API_KEY2 = "api-key-456"),
             (process.env.SECRET_API_KEY3 = "api-key-789"));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          (await eval(`(async () => { ${modifiedScript} })()`),
+          (await eval(`(async () => { ${modifiedScript}; await main(); })()`),
             expect(fs.readFileSync(path.join(tempDir, "test1.txt"), "utf8")).toBe("Secret: api********"),
             expect(fs.readFileSync(path.join(tempDir, "test2.json"), "utf8")).toBe('{"key": "api********"}'),
             expect(fs.readFileSync(path.join(tempDir, "test3.log"), "utf8")).toBe("Log: api********"));
@@ -77,7 +77,7 @@ describe("redact_secrets.cjs", () => {
             secretValue = "sk-1234567890";
           (fs.writeFileSync(testFile, `Secret: ${secretValue} and ${secretValue}`), (process.env.GH_AW_SECRET_NAMES = "API_KEY"), (process.env.SECRET_API_KEY = secretValue));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          (await eval(`(async () => { ${modifiedScript} })()`),
+          (await eval(`(async () => { ${modifiedScript}; await main(); })()`),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("occurrence(s) of a secret")),
             expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Processed")));
         }),
@@ -86,7 +86,7 @@ describe("redact_secrets.cjs", () => {
             secretValue = "sk-very-secret-key-123";
           (fs.writeFileSync(testFile, `Secret: ${secretValue}`), (process.env.GH_AW_SECRET_NAMES = "SECRET_KEY"), (process.env.SECRET_SECRET_KEY = secretValue));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          await eval(`(async () => { ${modifiedScript} })()`);
+          await eval(`(async () => { ${modifiedScript}; await main(); })()`);
           const allCalls = [...mockCore.debug.mock.calls, ...mockCore.info.mock.calls, ...mockCore.warning.mock.calls];
           for (const call of allCalls) {
             const callString = JSON.stringify(call);
@@ -97,7 +97,7 @@ describe("redact_secrets.cjs", () => {
           const testFile = path.join(tempDir, "test.txt");
           (fs.writeFileSync(testFile, "Short: abc123"), (process.env.GH_AW_SECRET_NAMES = "SHORT_SECRET"), (process.env.SECRET_SHORT_SECRET = "abc"));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          (await eval(`(async () => { ${modifiedScript} })()`), expect(fs.readFileSync(testFile, "utf8")).toBe("Short: abc123"));
+          (await eval(`(async () => { ${modifiedScript}; await main(); })()`), expect(fs.readFileSync(testFile, "utf8")).toBe("Short: abc123"));
         }),
         it("should handle multiple secrets in same file", async () => {
           const testFile = path.join(tempDir, "test.txt"),
@@ -105,7 +105,7 @@ describe("redact_secrets.cjs", () => {
             secret2 = "sk-proj-abcdef1234567890";
           (fs.writeFileSync(testFile, `Token1: ${secret1}\nToken2: ${secret2}\nToken1 again: ${secret1}`), (process.env.GH_AW_SECRET_NAMES = "TOKEN1,TOKEN2"), (process.env.SECRET_TOKEN1 = secret1), (process.env.SECRET_TOKEN2 = secret2));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          await eval(`(async () => { ${modifiedScript} })()`);
+          await eval(`(async () => { ${modifiedScript}; await main(); })()`);
           const redacted = fs.readFileSync(testFile, "utf8");
           expect(redacted).toBe("Token1: ghp*************************************\nToken2: sk-*********************\nToken1 again: ghp*************************************");
         }),
@@ -113,7 +113,7 @@ describe("redact_secrets.cjs", () => {
           const testFile = path.join(tempDir, "test.txt");
           (fs.writeFileSync(testFile, "No secrets here"), (process.env.GH_AW_SECRET_NAMES = "EMPTY_SECRET"), (process.env.SECRET_EMPTY_SECRET = ""));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          (await eval(`(async () => { ${modifiedScript} })()`), expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No secret values found to redact")));
+          (await eval(`(async () => { ${modifiedScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("No secret values found to redact")));
         }),
         it("should handle new file extensions (.md, .mdx, .yml, .jsonl)", async () => {
           (fs.writeFileSync(path.join(tempDir, "test.md"), "# Markdown\nSecret: api-key-md123"),
@@ -126,7 +126,7 @@ describe("redact_secrets.cjs", () => {
             (process.env.SECRET_API_YML = "api-key-yml123"),
             (process.env.SECRET_API_JSONL = "api-key-jsonl123"));
           const modifiedScript = redactScript.replace('findFiles("/tmp/gh-aw", targetExtensions)', `findFiles("${tempDir.replace(/\\/g, "\\\\")}", targetExtensions)`);
-          (await eval(`(async () => { ${modifiedScript} })()`),
+          (await eval(`(async () => { ${modifiedScript}; await main(); })()`),
             expect(fs.readFileSync(path.join(tempDir, "test.md"), "utf8")).toBe("# Markdown\nSecret: api**********"),
             expect(fs.readFileSync(path.join(tempDir, "test.mdx"), "utf8")).toBe("# MDX\nSecret: api***********"),
             expect(fs.readFileSync(path.join(tempDir, "test.yml"), "utf8")).toBe("# YAML\nkey: api***********"),
diff --git a/pkg/workflow/js/sanitize_output.test.cjs b/pkg/workflow/js/sanitize_output.test.cjs
index 8c69ba9afd..9b222a8a8a 100644
--- a/pkg/workflow/js/sanitize_output.test.cjs
+++ b/pkg/workflow/js/sanitize_output.test.cjs
@@ -325,13 +325,13 @@ const mockCore = {
           }),
           it("should handle missing GH_AW_SAFE_OUTPUTS environment variable", async () => {
             (delete process.env.GH_AW_SAFE_OUTPUTS,
-              await eval(`(async () => { ${sanitizeScript} })()`),
+              await eval(`(async () => { ${sanitizeScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("GH_AW_SAFE_OUTPUTS not set, no output to collect"),
               expect(mockCore.setOutput).toHaveBeenCalledWith("output", ""));
           }),
           it("should handle non-existent output file", async () => {
             ((process.env.GH_AW_SAFE_OUTPUTS = "/tmp/gh-aw/non-existent-file.txt"),
-              await eval(`(async () => { ${sanitizeScript} })()`),
+              await eval(`(async () => { ${sanitizeScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Output file does not exist: /tmp/gh-aw/non-existent-file.txt"),
               expect(mockCore.setOutput).toHaveBeenCalledWith("output", ""));
           }),
@@ -339,7 +339,7 @@ const mockCore = {
             const testFile = "/tmp/gh-aw/test-empty-output.txt";
             (fs.writeFileSync(testFile, "   \n  \t  \n  "),
               (process.env.GH_AW_SAFE_OUTPUTS = testFile),
-              await eval(`(async () => { ${sanitizeScript} })()`),
+              await eval(`(async () => { ${sanitizeScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Output file is empty"),
               expect(mockCore.setOutput).toHaveBeenCalledWith("output", ""),
               fs.unlinkSync(testFile));
@@ -349,7 +349,7 @@ const mockCore = {
               testFile = "/tmp/gh-aw/test-output.txt";
             (fs.writeFileSync(testFile, testContent),
               (process.env.GH_AW_SAFE_OUTPUTS = testFile),
-              await eval(`(async () => { ${sanitizeScript} })()`),
+              await eval(`(async () => { ${sanitizeScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith(expect.stringMatching(/Collected agentic output \(sanitized\):.*@user/)));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
@@ -363,7 +363,7 @@ const mockCore = {
           it("should truncate log output for very long content", async () => {
             const longContent = "x".repeat(250),
               testFile = "/tmp/gh-aw/test-long-output.txt";
-            (fs.writeFileSync(testFile, longContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, longContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const logCalls = mockCore.info.mock.calls,
               outputLogCall = logCalls.find(call => call[0] && call[0].includes("Collected agentic output (sanitized):"));
             (expect(outputLogCall).toBeDefined(), expect(outputLogCall[0]).toContain("..."), expect(outputLogCall[0].length).toBeLessThan(longContent.length), fs.unlinkSync(testFile));
@@ -378,7 +378,7 @@ const mockCore = {
             process.env.GH_AW_SAFE_OUTPUTS = testFile;
             let thrownError = null;
             try {
-              await eval(`(async () => { ${sanitizeScript} })()`);
+              await eval(`(async () => { ${sanitizeScript}; await main(); })()`);
             } catch (error) {
               thrownError = error;
             }
@@ -387,7 +387,7 @@ const mockCore = {
           it("should handle binary file content", async () => {
             const binaryData = Buffer.from([0, 1, 2, 255, 254, 253]),
               testFile = "/tmp/gh-aw/test-binary.txt";
-            (fs.writeFileSync(testFile, binaryData), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, binaryData), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             (expect(outputCall).toBeDefined(), fs.unlinkSync(testFile));
           }),
@@ -396,7 +396,7 @@ const mockCore = {
               testFile = "/tmp/gh-aw/test-whitespace.txt";
             (fs.writeFileSync(testFile, whitespaceContent),
               (process.env.GH_AW_SAFE_OUTPUTS = testFile),
-              await eval(`(async () => { ${sanitizeScript} })()`),
+              await eval(`(async () => { ${sanitizeScript}; await main(); })()`),
               expect(mockCore.info).toHaveBeenCalledWith("Output file is empty"),
               expect(mockCore.setOutput).toHaveBeenCalledWith("output", ""),
               fs.unlinkSync(testFile));
@@ -405,7 +405,7 @@ const mockCore = {
             const lineContent = 'This is a line with @user and https://evil.com plus <script>alert("xss")<\/script>\n',
               repeatedContent = lineContent.repeat(7e4),
               testFile = "/tmp/gh-aw/test-large-mixed.txt";
-            (fs.writeFileSync(testFile, repeatedContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, repeatedContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -414,7 +414,7 @@ const mockCore = {
           it("should preserve log message format for short content", async () => {
             const shortContent = "Short message with @user",
               testFile = "/tmp/gh-aw/test-short.txt";
-            (fs.writeFileSync(testFile, shortContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, shortContent), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const logCalls = mockCore.info.mock.calls,
               outputLogCall = logCalls.find(call => call[0] && call[0].includes("Collected agentic output (sanitized):"));
             (expect(outputLogCall).toBeDefined(), expect(outputLogCall[0]).not.toContain("..."), expect(outputLogCall[0]).toContain("`@user`"), fs.unlinkSync(testFile));
@@ -428,7 +428,7 @@ const mockCore = {
             process.env.GH_AW_COMMAND = "test-bot";
             const content = "/test-bot please analyze this code",
               testFile = "/tmp/gh-aw/test-command-start.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -438,7 +438,7 @@ const mockCore = {
             process.env.GH_AW_COMMAND = "helper";
             const content = "I need help from /helper please",
               testFile = "/tmp/gh-aw/test-command-middle.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -448,7 +448,7 @@ const mockCore = {
             process.env.GH_AW_COMMAND = "review-bot";
             const content = "  \n/review-bot analyze this PR",
               testFile = "/tmp/gh-aw/test-command-whitespace.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -457,7 +457,7 @@ const mockCore = {
           it("should not modify text when no command is configured", async () => {
             const content = "/some-bot do something",
               testFile = "/tmp/gh-aw/test-no-command.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -467,7 +467,7 @@ const mockCore = {
             process.env.GH_AW_COMMAND = "test-bot_v2";
             const content = "/test-bot_v2 execute task",
               testFile = "/tmp/gh-aw/test-special-chars.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -477,7 +477,7 @@ const mockCore = {
             process.env.GH_AW_COMMAND = "analyze-bot";
             const content = "/analyze-bot check @user for https://evil.com issues",
               testFile = "/tmp/gh-aw/test-combined.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const outputCall = mockCore.setOutput.mock.calls.find(call => "output" === call[0]);
             expect(outputCall).toBeDefined();
             const result = outputCall[1];
@@ -491,7 +491,7 @@ const mockCore = {
           it("should log when HTTPS URLs with disallowed domains are redacted", async () => {
             const content = "Check out https://evil.com/malware for details",
               testFile = "/tmp/gh-aw/test-url-logging-https.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLog = infoCalls.find(call => call[0] && call[0].includes("Redacted URL: evil.com"));
             (expect(redactionLog).toBeDefined(), expect(redactionLog[0]).toBe("Redacted URL: evil.com"));
@@ -502,7 +502,7 @@ const mockCore = {
           it("should log when HTTP URLs are redacted", async () => {
             const content = "Visit http://example.com for more info",
               testFile = "/tmp/gh-aw/test-url-logging-http.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLog = infoCalls.find(call => call[0] && call[0].includes("Redacted URL: example.com"));
             (expect(redactionLog).toBeDefined(), expect(redactionLog[0]).toBe("Redacted URL: example.com"));
@@ -513,7 +513,7 @@ const mockCore = {
           it("should log when javascript: URLs are redacted", async () => {
             const content = "Click here: javascript:alert('xss')",
               testFile = "/tmp/gh-aw/test-url-logging-js.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLog = infoCalls.find(call => call[0] && call[0].includes("Redacted URL: javascript:a"));
             (expect(redactionLog).toBeDefined(), expect(redactionLog[0]).toBe("Redacted URL: javascript:a..."));
@@ -524,7 +524,7 @@ const mockCore = {
           it("should log multiple URL redactions", async () => {
             const content = "Links: http://bad1.com, https://bad2.com, ftp://bad3.com",
               testFile = "/tmp/gh-aw/test-url-logging-multiple.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLogs = infoCalls.filter(call => call[0] && call[0].startsWith("Redacted URL:"));
             (expect(redactionLogs.length).toBeGreaterThanOrEqual(3),
@@ -536,7 +536,7 @@ const mockCore = {
           it("should not log when HTTPS URLs with allowed domains are preserved", async () => {
             const content = "Visit https://github.com for more info",
               testFile = "/tmp/gh-aw/test-url-logging-allowed.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLogs = infoCalls.filter(call => call[0] && call[0].includes("Redacted URL: github.com"));
             (expect(redactionLogs.length).toBe(0), fs.unlinkSync(testFile));
@@ -544,7 +544,7 @@ const mockCore = {
           it("should log when data: URLs are redacted", async () => {
             const content = "Image: data:text/html,<script>alert(1)<\/script>",
               testFile = "/tmp/gh-aw/test-url-logging-data.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLog = infoCalls.find(call => call[0] && call[0].includes("Redacted URL: data:text/ht"));
             (expect(redactionLog).toBeDefined(), fs.unlinkSync(testFile));
@@ -552,7 +552,7 @@ const mockCore = {
           it("should handle mixed content with both redacted and allowed URLs", async () => {
             const content = "Good: https://github.com/repo Bad: https://evil.com/bad More: http://another.bad",
               testFile = "/tmp/gh-aw/test-url-logging-mixed.txt";
-            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript} })()`));
+            (fs.writeFileSync(testFile, content), (process.env.GH_AW_SAFE_OUTPUTS = testFile), await eval(`(async () => { ${sanitizeScript}; await main(); })()`));
             const infoCalls = mockCore.info.mock.calls,
               redactionLogs = infoCalls.filter(call => call[0] && call[0].startsWith("Redacted URL:"));
             (expect(redactionLogs.length).toBeGreaterThanOrEqual(2),
diff --git a/pkg/workflow/js/unlock-issue.test.cjs b/pkg/workflow/js/unlock-issue.test.cjs
index a4f32dcb0f..6a2540f2cc 100644
--- a/pkg/workflow/js/unlock-issue.test.cjs
+++ b/pkg/workflow/js/unlock-issue.test.cjs
@@ -17,7 +17,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should unlock issue successfully", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !0 } }),
           mockGithub.rest.issues.unlock.mockResolvedValue({ status: 204 }),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.unlock).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #42 is locked"),
@@ -27,7 +27,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       }),
       it("should skip unlocking if issue is not locked", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } }),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.unlock).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #42 is locked"),
@@ -36,7 +36,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       }),
       it("should skip unlocking if issue is a pull request", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !0, pull_request: { url: "https://api.github.com/repos/testowner/testrepo/pulls/42" } } }),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.get).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 42 }),
           expect(mockGithub.rest.issues.unlock).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #42 is locked"),
@@ -46,7 +46,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should fail when issue number is not found in context", async () => {
         ((global.context.issue = {}),
           delete global.context.payload.issue,
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.unlock).not.toHaveBeenCalled(),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Issue number not found in context"));
       }),
@@ -54,7 +54,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !0 } });
         const apiError = new Error("Issue was not locked");
         (mockGithub.rest.issues.unlock.mockRejectedValue(apiError),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.unlock).toHaveBeenCalled(),
           expect(mockCore.error).toHaveBeenCalledWith("Failed to unlock issue: Issue was not locked"),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to unlock issue #42: Issue was not locked"));
@@ -62,7 +62,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should handle non-Error exceptions", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !0 } }),
           mockGithub.rest.issues.unlock.mockRejectedValue("String error"),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith("Failed to unlock issue: String error"),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to unlock issue #42: String error"));
       }),
@@ -71,7 +71,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           (global.context.payload.issue = { number: 200 }),
           mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 200, locked: !0 } }),
           mockGithub.rest.issues.unlock.mockResolvedValue({ status: 204 }),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.unlock).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 200 }),
           expect(mockCore.info).toHaveBeenCalledWith("Checking if issue #200 is locked"),
           expect(mockCore.info).toHaveBeenCalledWith("Unlocking issue #200 after agent workflow execution"),
@@ -81,14 +81,14 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !0 } });
         const permissionError = new Error("Resource not accessible by integration");
         (mockGithub.rest.issues.unlock.mockRejectedValue(permissionError),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.unlock).toHaveBeenCalled(),
           expect(mockCore.error).toHaveBeenCalledWith("Failed to unlock issue: Resource not accessible by integration"),
           expect(mockCore.setFailed).toHaveBeenCalledWith("Failed to unlock issue #42: Resource not accessible by integration"));
       }),
       it("should skip if issue is already unlocked (redundant test for completeness)", async () => {
         (mockGithub.rest.issues.get.mockResolvedValue({ data: { number: 42, locked: !1 } }),
-          await eval(`(async () => { ${unlockIssueScript} })()`),
+          await eval(`(async () => { ${unlockIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.unlock).not.toHaveBeenCalled(),
           expect(mockCore.info).toHaveBeenCalledWith("ℹ️ Issue #42 is not locked, skipping unlock operation"),
           expect(mockCore.setFailed).not.toHaveBeenCalled());
diff --git a/pkg/workflow/js/update_discussion.cjs b/pkg/workflow/js/update_discussion.cjs
index 45fe353d00..3ba7c56f17 100644
--- a/pkg/workflow/js/update_discussion.cjs
+++ b/pkg/workflow/js/update_discussion.cjs
@@ -281,4 +281,4 @@ const main = createUpdateHandler({
   executeUpdate: executeDiscussionUpdate,
 });
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/update_discussion.test.cjs b/pkg/workflow/js/update_discussion.test.cjs
index 51e24ac69e..b6d492b8fb 100644
--- a/pkg/workflow/js/update_discussion.test.cjs
+++ b/pkg/workflow/js/update_discussion.test.cjs
@@ -81,14 +81,14 @@ describe("update_discussion.cjs", () => {
   });
 
   it("should skip when no agent output is provided", async () => {
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
     expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found");
     expect(mockGithub.graphql).not.toHaveBeenCalled();
   });
 
   it("should skip when agent output is empty", async () => {
     setAgentOutput("");
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
     expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty");
     expect(mockGithub.graphql).not.toHaveBeenCalled();
   });
@@ -99,7 +99,7 @@ describe("update_discussion.cjs", () => {
     });
     process.env.GH_AW_UPDATE_TITLE = "true";
     global.context.eventName = "push";
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
     expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in discussion context, skipping discussion update');
     expect(mockGithub.graphql).not.toHaveBeenCalled();
   });
@@ -146,7 +146,7 @@ describe("update_discussion.cjs", () => {
       },
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(3);
     expect(mockCore.setOutput).toHaveBeenCalledWith("discussion_number", 123);
@@ -197,7 +197,7 @@ describe("update_discussion.cjs", () => {
       },
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(3);
     expect(mockCore.setOutput).toHaveBeenCalledWith("discussion_number", 123);
@@ -254,7 +254,7 @@ describe("update_discussion.cjs", () => {
       },
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(3);
   });
@@ -308,7 +308,7 @@ describe("update_discussion.cjs", () => {
       },
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(3);
     // Should use the explicit discussion number 456
@@ -329,7 +329,7 @@ describe("update_discussion.cjs", () => {
     process.env.GH_AW_UPDATE_BODY = "false";
     global.context.eventName = "discussion";
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockCore.info).toHaveBeenCalledWith("No valid updates to apply for this item");
     expect(mockGithub.graphql).not.toHaveBeenCalled();
@@ -388,7 +388,7 @@ describe("update_discussion.cjs", () => {
       });
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(3);
     // Verify the custom footer was used
@@ -462,7 +462,7 @@ describe("update_discussion.cjs", () => {
       },
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(5);
     expect(mockCore.setOutput).toHaveBeenCalledWith("discussion_number", 123);
@@ -543,7 +543,7 @@ describe("update_discussion.cjs", () => {
       },
     });
 
-    await eval(`(async () => { ${updateDiscussionScript} })()`);
+    await eval(`(async () => { ${updateDiscussionScript}; await main(); })()`);
 
     expect(mockGithub.graphql).toHaveBeenCalledTimes(5);
   });
diff --git a/pkg/workflow/js/update_issue.cjs b/pkg/workflow/js/update_issue.cjs
index 980ddf62dd..3fd5564e18 100644
--- a/pkg/workflow/js/update_issue.cjs
+++ b/pkg/workflow/js/update_issue.cjs
@@ -45,4 +45,4 @@ const main = createUpdateHandler({
   executeUpdate: executeIssueUpdate,
 });
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/update_issue.test.cjs b/pkg/workflow/js/update_issue.test.cjs
index d0fa560292..f60675ba00 100644
--- a/pkg/workflow/js/update_issue.test.cjs
+++ b/pkg/workflow/js/update_issue.test.cjs
@@ -57,16 +57,16 @@ const mockCore = {
         tempFilePath && require("fs").existsSync(tempFilePath) && (require("fs").unlinkSync(tempFilePath), (tempFilePath = void 0));
       }),
       it("should skip when no agent output is provided", async () => {
-        (await eval(`(async () => { ${updateIssueScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"), expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
+        (await eval(`(async () => { ${updateIssueScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("No GH_AW_AGENT_OUTPUT environment variable found"), expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
       }),
       it("should skip when agent output is empty", async () => {
-        (setAgentOutput(""), await eval(`(async () => { ${updateIssueScript} })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"), expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
+        (setAgentOutput(""), await eval(`(async () => { ${updateIssueScript}; await main(); })()`), expect(mockCore.info).toHaveBeenCalledWith("Agent output content is empty"), expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
       }),
       it("should skip when not in issue context for triggering target", async () => {
         (setAgentOutput({ items: [{ type: "update_issue", title: "Updated title" }] }),
           (process.env.GH_AW_UPDATE_TITLE = "true"),
           (global.context.eventName = "push"),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith('Target is "triggering" but not running in issue context, skipping issue update'),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
       }),
@@ -74,7 +74,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "update_issue", title: "Updated issue title" }] }), (process.env.GH_AW_UPDATE_TITLE = "true"), (global.context.eventName = "issues"));
         const mockIssue = { number: 123, title: "Updated issue title", html_url: "https://github.com/testowner/testrepo/issues/123" };
         (mockGithub.rest.issues.update.mockResolvedValue({ data: mockIssue }),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, title: "Updated issue title" }),
           expect(mockCore.setOutput).toHaveBeenCalledWith("issue_number", 123),
           expect(mockCore.setOutput).toHaveBeenCalledWith("issue_url", mockIssue.html_url),
@@ -85,7 +85,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "update_issue", status: "closed" }] }), (process.env.GH_AW_UPDATE_STATUS = "true"), (global.context.eventName = "issues"));
         const mockIssue = { number: 123, html_url: "https://github.com/testowner/testrepo/issues/123" };
         (mockGithub.rest.issues.update.mockResolvedValue({ data: mockIssue }),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, state: "closed" }));
       }),
       it("should update multiple fields successfully", async () => {
@@ -96,14 +96,14 @@ const mockCore = {
           (global.context.eventName = "issues"));
         const mockIssue = { number: 123, html_url: "https://github.com/testowner/testrepo/issues/123" };
         (mockGithub.rest.issues.update.mockResolvedValue({ data: mockIssue }),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 123, title: "New title", body: "New body content", state: "open" }));
       }),
       it('should handle explicit issue number with target "*"', async () => {
         (setAgentOutput({ items: [{ type: "update_issue", issue_number: 456, title: "Updated title" }] }), (process.env.GH_AW_UPDATE_TITLE = "true"), (process.env.GH_AW_UPDATE_TARGET = "*"), (global.context.eventName = "push"));
         const mockIssue = { number: 456, html_url: "https://github.com/testowner/testrepo/issues/456" };
         (mockGithub.rest.issues.update.mockResolvedValue({ data: mockIssue }),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockGithub.rest.issues.update).toHaveBeenCalledWith({ owner: "testowner", repo: "testrepo", issue_number: 456, title: "Updated title" }));
       }),
       it("should skip when no valid updates are provided", async () => {
@@ -112,7 +112,7 @@ const mockCore = {
           (process.env.GH_AW_UPDATE_TITLE = "false"),
           (process.env.GH_AW_UPDATE_BODY = "false"),
           (global.context.eventName = "issues"),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("No valid updates to apply for this item"),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
       }),
@@ -120,7 +120,7 @@ const mockCore = {
         (setAgentOutput({ items: [{ type: "update_issue", status: "invalid" }] }),
           (process.env.GH_AW_UPDATE_STATUS = "true"),
           (global.context.eventName = "issues"),
-          await eval(`(async () => { ${updateIssueScript} })()`),
+          await eval(`(async () => { ${updateIssueScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("Invalid status value: invalid. Must be 'open' or 'closed'"),
           expect(mockGithub.rest.issues.update).not.toHaveBeenCalled());
       }));
diff --git a/pkg/workflow/js/update_project.cjs b/pkg/workflow/js/update_project.cjs
index 78cbbbec34..65496f51e3 100644
--- a/pkg/workflow/js/update_project.cjs
+++ b/pkg/workflow/js/update_project.cjs
@@ -422,4 +422,5 @@ async function main() {
       }
     }
 }
-("undefined" != typeof module && module.exports && (module.exports = { updateProject, parseProjectInput, generateCampaignId, main }), ("undefined" != typeof module && require.main !== module) || main());
+
+module.exports = { updateProject, parseProjectInput, generateCampaignId, main };
diff --git a/pkg/workflow/js/update_project.test.cjs b/pkg/workflow/js/update_project.test.cjs
index 514dc17c69..36cf68442f 100644
--- a/pkg/workflow/js/update_project.test.cjs
+++ b/pkg/workflow/js/update_project.test.cjs
@@ -52,6 +52,10 @@ beforeAll(async () => {
   updateProject = exports.updateProject;
   parseProjectInput = exports.parseProjectInput;
   generateCampaignId = exports.generateCampaignId;
+  // Call main to execute the module
+  if (exports.main) {
+    await exports.main();
+  }
 });
 
 function clearMock(fn) {
diff --git a/pkg/workflow/js/update_pull_request.cjs b/pkg/workflow/js/update_pull_request.cjs
index 3c27ff1ad6..79cbedb758 100644
--- a/pkg/workflow/js/update_pull_request.cjs
+++ b/pkg/workflow/js/update_pull_request.cjs
@@ -80,4 +80,4 @@ const main = createUpdateHandler({
   executeUpdate: executePRUpdate,
 });
 
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/update_pull_request.test.cjs b/pkg/workflow/js/update_pull_request.test.cjs
index 47a93febea..522d66bddc 100644
--- a/pkg/workflow/js/update_pull_request.test.cjs
+++ b/pkg/workflow/js/update_pull_request.test.cjs
@@ -58,6 +58,10 @@ describe("update_pull_request.cjs - executePRUpdate function", () => {
 
     // Import the module fresh for each test
     updatePRModule = await import("./update_pull_request.cjs");
+    // Call main if it exists
+    if (updatePRModule.main) {
+      await updatePRModule.main();
+    }
 
     // Reset mock implementations
     mockGithub.rest.pulls.get.mockResolvedValue({
diff --git a/pkg/workflow/js/update_release.cjs b/pkg/workflow/js/update_release.cjs
index e0fc653f84..fbf939107d 100644
--- a/pkg/workflow/js/update_release.cjs
+++ b/pkg/workflow/js/update_release.cjs
@@ -167,5 +167,4 @@ async function main() {
   await core.summary.addRaw(summaryContent).write();
 }
 
-// Call the main function
-await main();
+module.exports = { main };
diff --git a/pkg/workflow/js/update_release.test.cjs b/pkg/workflow/js/update_release.test.cjs
index 9ce8c57294..ea1241d506 100644
--- a/pkg/workflow/js/update_release.test.cjs
+++ b/pkg/workflow/js/update_release.test.cjs
@@ -24,7 +24,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       }),
       it("should handle empty agent output", async () => {
         (setAgentOutput({ items: [], errors: [] }),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith("No update-release items found in agent output"),
           expect(mockGithub.rest.repos.getReleaseByTag).not.toHaveBeenCalled());
       }),
@@ -35,7 +35,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.rest.repos.updateRelease.mockResolvedValue({ data: mockUpdatedRelease }),
           setAgentOutput({ items: [{ type: "update_release", tag: "v1.0.0", operation: "replace", body: "New release notes" }], errors: [] }),
           (process.env.GH_AW_WORKFLOW_NAME = "Test Workflow"),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getReleaseByTag).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", tag: "v1.0.0" }),
           expect(mockGithub.rest.repos.updateRelease).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", release_id: 1, body: "New release notes" }),
           expect(mockCore.setOutput).toHaveBeenCalledWith("release_id", 1),
@@ -51,7 +51,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.rest.repos.updateRelease.mockResolvedValue({ data: mockUpdatedRelease }),
           setAgentOutput({ items: [{ type: "update_release", tag: "v2.0.0", operation: "append", body: "Additional notes" }], errors: [] }),
           (process.env.GH_AW_WORKFLOW_NAME = "Test Workflow"),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockGithub.rest.repos.updateRelease).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", release_id: 2, body: expectedBody }),
           expect(mockCore.info).toHaveBeenCalledWith("Operation: append (add to end with separator)"));
       }),
@@ -63,14 +63,14 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
           mockGithub.rest.repos.updateRelease.mockResolvedValue({ data: mockUpdatedRelease }),
           setAgentOutput({ items: [{ type: "update_release", tag: "v3.0.0", operation: "prepend", body: "Prepended notes" }], errors: [] }),
           (process.env.GH_AW_WORKFLOW_NAME = "Test Workflow"),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockGithub.rest.repos.updateRelease).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", release_id: 3, body: expectedBody }),
           expect(mockCore.info).toHaveBeenCalledWith("Operation: prepend (add to start with separator)"));
       }),
       it("should handle staged mode", async () => {
         ((process.env.GH_AW_SAFE_OUTPUTS_STAGED = "true"),
           setAgentOutput({ items: [{ type: "update_release", tag: "v1.0.0", operation: "replace", body: "New notes" }], errors: [] }),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockCore.summary.addRaw).toHaveBeenCalled(),
           expect(mockGithub.rest.repos.getReleaseByTag).not.toHaveBeenCalled(),
           expect(mockGithub.rest.repos.updateRelease).not.toHaveBeenCalled());
@@ -78,7 +78,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
       it("should handle release not found error", async () => {
         (mockGithub.rest.repos.getReleaseByTag.mockRejectedValue(new Error("Not Found")),
           setAgentOutput({ items: [{ type: "update_release", tag: "v99.99.99", operation: "replace", body: "New notes" }], errors: [] }),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("Failed to update release")),
           expect(mockCore.error).toHaveBeenCalledWith(expect.stringContaining("not found")),
           expect(mockCore.setFailed).toHaveBeenCalled());
@@ -95,7 +95,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
             ],
             errors: [],
           }),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockGithub.rest.repos.getReleaseByTag).toHaveBeenCalledTimes(2),
           expect(mockGithub.rest.repos.updateRelease).toHaveBeenCalledTimes(2),
           expect(mockCore.summary.addRaw).toHaveBeenCalledWith(expect.stringContaining("Updated 2 release(s)")));
@@ -106,7 +106,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         (mockGithub.rest.repos.getReleaseByTag.mockResolvedValue({ data: mockRelease }),
           mockGithub.rest.repos.updateRelease.mockResolvedValue({ data: { ...mockRelease, body: "Updated body" } }),
           setAgentOutput({ items: [{ type: "update_release", operation: "replace", body: "Updated body" }], errors: [] }),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockCore.info).toHaveBeenCalledWith(expect.stringContaining("Inferred release tag from event context: v1.5.0")),
           expect(mockGithub.rest.repos.getReleaseByTag).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", tag: "v1.5.0" }),
           expect(mockGithub.rest.repos.updateRelease).toHaveBeenCalledWith({ owner: "test-owner", repo: "test-repo", release_id: 1, body: "Updated body" }),
@@ -117,7 +117,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), warning: vi.fn(), error: vi.fn
         ((mockContext.eventName = "push"),
           (mockContext.payload = {}),
           setAgentOutput({ items: [{ type: "update_release", operation: "replace", body: "Updated body" }], errors: [] }),
-          await eval(`(async () => { ${updateReleaseScript} })()`),
+          await eval(`(async () => { ${updateReleaseScript}; await main(); })()`),
           expect(mockCore.error).toHaveBeenCalledWith("No tag provided and unable to infer from event context"),
           expect(mockCore.setFailed).toHaveBeenCalledWith(expect.stringContaining("Release tag is required")),
           delete mockContext.eventName,
diff --git a/pkg/workflow/js/upload_assets.test.cjs b/pkg/workflow/js/upload_assets.test.cjs
index e87087c535..5d37cd60c8 100644
--- a/pkg/workflow/js/upload_assets.test.cjs
+++ b/pkg/workflow/js/upload_assets.test.cjs
@@ -10,7 +10,7 @@ const mockCore = { debug: vi.fn(), info: vi.fn(), notice: vi.fn(), warning: vi.f
         const content = "string" == typeof data ? data : JSON.stringify(data);
         (fs.writeFileSync(tempFilePath, content), (process.env.GH_AW_AGENT_OUTPUT = tempFilePath));
       },
-      executeScript = async () => ((global.core = mockCore), (global.exec = mockExec), await eval(`(async () => { ${uploadAssetsScript} })()`));
+      executeScript = async () => ((global.core = mockCore), (global.exec = mockExec), await eval(`(async () => { ${uploadAssetsScript}; await main(); })()`));
     (beforeEach(() => {
       (vi.clearAllMocks(), delete process.env.GH_AW_ASSETS_BRANCH, delete process.env.GH_AW_AGENT_OUTPUT, delete process.env.GH_AW_SAFE_OUTPUTS_STAGED);
       const scriptPath = path.join(__dirname, "upload_assets.cjs");