Refactor optional sidecar assembly into focused helpers in optional-services

[Copilot]

assembleOptionalServices had grown into a 200+ line mixed-responsibility function spanning env pre-sets, sysroot staging, iptables init, and multiple sidecar wiring paths. This change keeps it as a thin coordinator and splits sidecar/sysroot assembly into focused internal helpers to improve reviewability and isolate security-relevant paths.

• What changed

  • Extracted env pre-set logic into presetSidecarIpEnvVars(...) (sets AWF_API_PROXY_IP, AWF_CLI_PROXY_IP, AWF_NETWORK_ISOLATION before init-container construction).
  • Extracted sysroot-specific volume filtering into filterAgentVolumesForSysroot(...).
  • Extracted sysroot staging/wiring into assembleSysrootService(...).
  • Extracted per-sidecar assembly helpers:
    • assembleIptablesInitService(...)
    • assembleApiProxyService(...)
    • assembleDohProxyService(...)
    • assembleCliProxyService(...)
  • Extracted sysroot named-volume finalization into finalizeSysrootVolumes(...).
  • Reduced assembleOptionalServices(...) to orchestration only, preserving existing behavior and call surface.

• Targeted test coverage added

  • New src/services/optional-services.test.ts with focused tests for:
    • sidecar env pre-set behavior
    • sysroot volume filtering behavior
  • Exposed internal test hooks via testHelpers for precise unit coverage of extracted logic.

• Example (coordinator shape after split)

  presetSidecarIpEnvVars(environment, config, networkConfig);
  assembleSysrootService(params, imageConfig.registry, imageConfig.parsedTag.tag, sysrootActive);
  assembleIptablesInitService(params, networkIsolation);
  assembleApiProxyService(params);
  assembleDohProxyService(params);
  assembleCliProxyService(params);
  
  const namedVolumes = finalizeSysrootVolumes(agentVolumes, sysrootActive);
  return { namedVolumes };

[Copilot]

Pull request overview

Refactors assembleOptionalServices into smaller internal helpers to isolate sidecar/sysroot wiring concerns, while keeping the exported coordinator function as a thin orchestrator.

Changes:

• Extracted env pre-set logic, sysroot volume filtering, sysroot staging wiring, and per-sidecar assembly into focused helper functions.
• Added testHelpers exports for unit testing of extracted internal logic.
• Added new unit tests covering env pre-set behavior and sysroot volume filtering behavior.

Show a summary per file

File	Description
src/services/optional-services.ts	Splits optional sidecar/sysroot assembly into internal helpers and keeps assembleOptionalServices as an orchestrator.
src/services/optional-services.test.ts	Adds focused unit tests for the extracted helper logic via testHelpers.

Review details

Tip

Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

• Files reviewed: 2/2 changed files
• Comments generated: 1
• Review effort level: Low

[github-actions]

✅ Copilot review passed with no inline comments.

@copilot Add the ready-for-aw label to this PR to trigger agentic CI smoke tests.

[github-actions]

✅ Smoke Copilot BYOK completed. Copilot BYOK mode operational. 🔓

[github-actions]

✅ Smoke Copilot BYOK AOAI (api-key) completed. Copilot AOAI BYOK (api-key) mode operational. 🔓

[github-actions]

✅ Smoke Copilot BYOK AOAI (Entra) completed. Copilot AOAI BYOK (Entra) mode operational. 🔓

[github-actions]

🌑 The shadows whisper... Smoke Codex failed. The oracle requires further meditation...

[github-actions]

✅ Smoke Claude passed

[github-actions]

🔑 Smoke Copilot PAT PAT auth validated. All systems operational. ✅

[github-actions]

✅ Contribution Check completed successfully!

PR #5833 follows the applicable CONTRIBUTING.md guidelines based on the provided metadata, diff, and contribution guide; no comment needed.

[github-actions]

✅ Build Test Suite completed successfully!

[github-actions]

🔌 Smoke Services — All services reachable! ✅

[github-actions]

📡 Smoke OTel Tracing completed. All tracing scenarios validated. ✅

[github-actions]

🚀 Security Guard has started processing this pull request

[github-actions]

📰 VERDICT: Smoke Copilot has concluded. All systems operational. This is a developing story. 🎤

[github-actions]

Chroot tests failed Smoke Chroot failed - See logs for details.

[github-actions]

✅ Smoke Gemini completed. All facets verified. 💎

Smoke test completed with partial failures. Results reported to PR #5833.

[github-actions]

Smoke Test: Claude Engine Validation

Check	Result
API Status	✅ PASS
GH Check	✅ PASS
File Status	✅ PASS

Overall Result: PASS ✅

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

Generated by Smoke Claude for #5833 · 35.6 AIC · ⊞ 3.3K · ◷
_{Add label ready-for-aw to run again}

[github-actions]

🔥 Smoke Test: Copilot PAT Auth

Test	Result
GitHub MCP connectivity	✅
GitHub.com HTTP connectivity	✅
File write/read	✅

Overall: PASS | Auth mode: PAT (COPILOT_GITHUB_TOKEN)

@lpcox all checks passed.

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🔑 PAT report filed by Smoke Copilot PAT
_{Add label ready-for-aw to run again}

[github-actions]

${{ steps.smoke-data.outputs.SMOKE_PR_DATA }}

✅ GitHub MCP Testing
✅ GitHub.com Connectivity
✅ File Write/Read Test
✅ BYOK Inference Test

Note: Running in direct BYOK mode (AWF_AUTH_TYPE=github-oidc + AWF_AUTH_AZURE_* + COPILOT_PROVIDER_BASE_URL) via api-proxy → Azure OpenAI (Foundry, o4-mini-aw) authenticated via Microsoft Entra
Overall: PASS
cc @lpcox

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🪪 BYOK (AOAI Entra) report filed by Smoke Copilot BYOK AOAI (Entra)
_{Add label ready-for-aw to run again}

[github-actions]

🔬 Smoke Test Results

Test	Result
GitHub MCP Connectivity	✅
GitHub.com Connectivity	✅ HTTP 200/301
File Write/Read	✅ Verified

Overall: PASS

PR author: @lpcox

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

📰 BREAKING: Report filed by Smoke Copilot
_{Add label ready-for-aw to run again}

[github-actions]

Smoke Test: GitHub Actions Services Connectivity

• Redis PING: ❌ (Network is unreachable)
• PostgreSQL pg_isready: ❌ (no response)
• PostgreSQL SELECT 1: ❌ (Network is unreachable)

Overall: FAIL — host.docker.internal (172.17.0.1) is unreachable from this environment. Service containers may not be running or are not accessible from this runner.

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🔌 Service connectivity validated by Smoke Services
_{Add label ready-for-aw to run again}

[github-actions]

Smoke Test Results: Copilot BYOK ✅

Tests:

• ✅ GitHub MCP connectivity: Verified
• ✅ GitHub.com connectivity: HTTP 200
• ✅ File write/read: OK
• ✅ BYOK inference: Active (direct COPILOT_PROVIDER_API_KEY → api-proxy → api.githubcopilot.com)

Mode: Direct BYOK via api-proxy sidecar

Status: PASS

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🔑 BYOK report filed by Smoke Copilot BYOK
_{Add label ready-for-aw to run again}

[github-actions]

@lpcox

GitHub MCP Testing: ✅
GitHub.com Connectivity: ✅
File Write/Read Test: ✅
BYOK Inference Test: ✅

Running in direct BYOK mode (COPILOT_PROVIDER_API_KEY + COPILOT_PROVIDER_BASE_URL) via api-proxy → Azure OpenAI (Foundry, o4-mini-aw)
Overall: PASS

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🔑 BYOK (AOAI api-key) report filed by Smoke Copilot BYOK AOAI (api-key)
_{Add label ready-for-aw to run again}

[github-actions]

Smoke Test: API Proxy OpenTelemetry Tracing

Scenario	Status	Details
Module Loading	✅	otel.js loads successfully; exports: startRequestSpan, setTokenAttributes, setBudgetAttributes, endSpan, endSpanError, shutdown, isEnabled + internal helpers
Test Suite	✅	59 tests passed, 0 failed across 2 suites (otel.test.js, otel-fanout.test.js)
Env Var Forwarding	✅	src/services/api-proxy-env-config.ts forwards GH_AW_OTLP_ENDPOINTS, OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_HEADERS, GITHUB_AW_OTEL_TRACE_ID, GITHUB_AW_OTEL_PARENT_SPAN_ID, OTEL_SERVICE_NAME to the api-proxy container
Token Tracker Integration	✅	onUsage callback exists in token-tracker-http.js (lines 283/324) as the OTEL hook point
OTEL Diagnostics	✅	Graceful degradation confirmed: when no OTLP endpoint is configured, spans fall back to /var/log/api-proxy/otel.jsonl (no errors)

All 5 scenarios passed. OTEL tracing integration is working correctly.

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

📡 OTel tracing validated by Smoke OTel Tracing
_{Add label ready-for-aw to run again}

[github-actions]

Smoke Test Results

• GitHub MCP Testing: ❌ (Tools not found)
• GitHub.com Connectivity: ❌ (Network unreachable)
• File Writing Testing: ✅
• Bash Tool Testing: ✅

Overall status: FAIL

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• localhost

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "localhost"

See Network Configuration for more information.

💎 Faceted by Smoke Gemini
_{Add label ready-for-aw to run again}

[github-actions]

🏗️ Build Test Suite Results

Ecosystem	Project	Build/Install	Tests	Status
Bun	elysia	✅	1/1 passed	✅ PASS
Bun	hono	✅	1/1 passed	✅ PASS
C++	fmt	✅	N/A	✅ PASS
C++	json	✅	N/A	✅ PASS
Deno	oak	N/A	1/1 passed	✅ PASS
Deno	std	N/A	1/1 passed	✅ PASS
.NET	hello-world	✅	N/A	✅ PASS
.NET	json-parse	✅	N/A	✅ PASS
Go	color	✅	1/1 passed	✅ PASS
Go	env	✅	1/1 passed	✅ PASS
Go	uuid	✅	1/1 passed	✅ PASS
Java	gson	✅	1/1 passed	✅ PASS
Java	caffeine	✅	1/1 passed	✅ PASS
Node.js	clsx	✅	all passed	✅ PASS
Node.js	execa	✅	all passed	✅ PASS
Node.js	p-limit	✅	all passed	✅ PASS
Rust	fd	✅	1 passed	✅ PASS
Rust	zoxide	✅	1 passed	✅ PASS

Overall: 8/8 ecosystems passed — ✅ PASS

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

• awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

Generated by Build Test Suite for #5833 · 77.5 AIC · ⊞ 6.9K · ◷
_{Add label ready-for-aw to run again}