From b1d9215adffa962c3496dcce6630e1dbf0df3472 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 29 Jun 2026 13:57:33 +0000
Subject: [PATCH 1/2] Initial plan


From 629342e3a40bceff94d7449f413f729095aa2f6e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 29 Jun 2026 14:05:56 +0000
Subject: [PATCH 2/2] fix: internalize provider session id helper

---
 src/services/api-proxy-env-config.ts         |  2 +-
 src/services/api-proxy-service-split.test.ts | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/services/api-proxy-env-config.ts b/src/services/api-proxy-env-config.ts
index f8d285932..6b09133b1 100644
--- a/src/services/api-proxy-env-config.ts
+++ b/src/services/api-proxy-env-config.ts
@@ -52,7 +52,7 @@ export function buildProviderTargetEnv(config: WrapperConfig): Record<string, st
   return env;
 }
 
-export function resolveProviderSessionId(config: WrapperConfig): string | undefined {
+function resolveProviderSessionId(config: WrapperConfig): string | undefined {
   // Auto-derivation from GITHUB_RUN_ID was removed because the Copilot
   // `session_id`/`x-session-id` convention causes strict OpenAI-compatible
   // BYOK targets (e.g. Azure OpenAI) to reject every request with HTTP 400.
diff --git a/src/services/api-proxy-service-split.test.ts b/src/services/api-proxy-service-split.test.ts
index ceaa0fc37..a04832747 100644
--- a/src/services/api-proxy-service-split.test.ts
+++ b/src/services/api-proxy-service-split.test.ts
@@ -78,6 +78,23 @@ describe('API proxy split builders', () => {
     expect(env.AWF_PROVIDER_SESSION_ID).toBe('session-123');
   });
 
+  it('buildProviderTargetEnv trims AWF_PROVIDER_SESSION_ID from process.env', () => {
+    const savedSessionId = process.env.AWF_PROVIDER_SESSION_ID;
+    process.env.AWF_PROVIDER_SESSION_ID = ' session-from-env ';
+
+    try {
+      const env = buildProviderTargetEnv({
+        ...baseConfig,
+        workDir: '/tmp/awf-test',
+      });
+
+      expect(env.AWF_PROVIDER_SESSION_ID).toBe('session-from-env');
+    } finally {
+      if (savedSessionId !== undefined) process.env.AWF_PROVIDER_SESSION_ID = savedSessionId;
+      else delete process.env.AWF_PROVIDER_SESSION_ID;
+    }
+  });
+
   it('buildAgentCredentialEnv builds isolated agent credentials', () => {
     const agentEnvAdditions = buildAgentCredentialEnv({
       config: {