From c0078b207260b6c0a6565c83bb165cb7ec7471cd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 6 Jan 2026 23:05:20 +0000
Subject: [PATCH] Simplify user-agent logic and update integration test

Co-authored-by: TingluoHuang <1750815+TingluoHuang@users.noreply.github.com>
---
 .github/workflows/integration.yml | 2 +-
 dist/index.js                     | 5 +----
 src/main.ts                       | 6 +-----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 346a57f..06827f2 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -167,7 +167,7 @@ jobs:
             exit 1
           fi
           echo "- Validating user-agent set to an empty string"
-          expected="octokit-core.js/"
+          expected="actions/github-script octokit-core.js/"
           if [[ "${{steps.user-agent-empty.outputs.result}}" != "$expected"* ]]; then
             echo $'::error::\u274C' "Expected user-agent to start with '$expected', got ${{steps.user-agent-empty.outputs.result}}"
             exit 1
diff --git a/dist/index.js b/dist/index.js
index 67f5d4e..06db0a2 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -36267,7 +36267,7 @@ async function main() {
     const retries = parseInt(core.getInput('retries'));
     const exemptStatusCodes = parseNumberArray(core.getInput('retry-exempt-status-codes'));
     const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes, utils.defaults);
-    const baseUserAgent = userAgent === '' ? '' : userAgent || 'actions/github-script';
+    const baseUserAgent = userAgent || 'actions/github-script';
     const finalUserAgent = getUserAgentWithOrchestrationId(baseUserAgent);
     const opts = {
         log: debug ? console : undefined,
@@ -36327,9 +36327,6 @@ function getUserAgentWithOrchestrationId(userAgent) {
     }
     // Sanitize orchestration ID - replace invalid characters with underscore
     const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, '_');
-    if (!sanitized) {
-        return userAgent;
-    }
     return `${userAgent} orchestration-id/${sanitized}`;
 }
 
diff --git a/src/main.ts b/src/main.ts
index fa80835..d1f755c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -39,8 +39,7 @@ async function main(): Promise<void> {
     defaultGitHubOptions
   )
 
-  const baseUserAgent =
-    userAgent === '' ? '' : userAgent || 'actions/github-script'
+  const baseUserAgent = userAgent || 'actions/github-script'
   const finalUserAgent = getUserAgentWithOrchestrationId(baseUserAgent)
 
   const opts: Options = {
@@ -114,9 +113,6 @@ function getUserAgentWithOrchestrationId(userAgent: string): string {
 
   // Sanitize orchestration ID - replace invalid characters with underscore
   const sanitized = orchestrationId.replace(/[^a-zA-Z0-9._-]/g, '_')
-  if (!sanitized) {
-    return userAgent
-  }
 
   return `${userAgent} orchestration-id/${sanitized}`
 }