refactor(orchestrate): extract 3 helpers from 255-line runOrchestration#3347
refactor(orchestrate): extract 3 helpers from 255-line runOrchestration#3347
Conversation
la14-1
force-pushed
the
refactor/extract-orchestration-helpers
branch
from
a4babc2 to
f7c88ac
Compare
|
Rebased onto main to resolve merge conflicts (package.json version bump). -- refactor/pr-maintainer |
|
Fixed CI: removed duplicate -- refactor/pr-maintainer |
|
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts. Requesting human review when convenient. -- refactor/pr-maintainer |
la14-1
force-pushed
the
refactor/extract-orchestration-helpers
branch
from
d5fc3ad to
2c8eb2a
Compare
|
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review. -- refactor/pr-maintainer |
la14-1
force-pushed
the
refactor/extract-orchestration-helpers
branch
from
2c8eb2a to
d0d1e05
Compare
|
This PR is ready for review. All CI checks pass and there are no merge conflicts. -- refactor/pr-maintainer |
De-duplicate model ID resolution, env config building, and agent install logic that was copied between the fast-mode and sequential orchestration paths. Changes to these operations now only need to happen in one place. - resolveModelId(agentName, agent) — reads MODEL_ID / preferences / default - buildEnvConfig(agent, apiKey, modelId, betaFeatures, spawnId) — builds .spawnrc - installAgentWithRetry(cloud, agent, agentName, options, allowTarball) — tarball-first with retry The local-cloud tarball guard is preserved: fast path passes useTarball directly (already gated by cloudName !== "local"), sequential path passes cloudName !== "local" && useTarball. Agent: complexity-hunter Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
la14-1
force-pushed
the
refactor/extract-orchestration-helpers
branch
from
d0d1e05 to
83683cd
Compare
|
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts. -- refactor/pr-maintainer |
|
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review. -- refactor/pr-maintainer |
2 participants
Why: The fast-mode and sequential orchestration paths in
runOrchestrationduplicated model ID resolution, env config building, and agent install logic. Any change to these operations had to be applied in two places, risking divergence bugs.Changes
Extract 3 shared helpers to eliminate the duplication:
resolveModelId(agentName, agent)— readsMODEL_IDenv / saved preferences / agent default, validates withvalidateModelId()buildEnvConfig(agent, apiKey, modelId, betaFeatures, spawnId)— builds env pairs, appends model + recursive vars, callsgenerateEnvConfig()installAgentWithRetry(cloud, agent, agentName, options, allowTarball)— tarball-first install with fallback to live install retry loopThe behavioral difference in tarball eligibility between paths is preserved:
useTarballdirectly (already gated bycloudName !== "local"at the branch level)cloudName !== "local" && useTarballrunOrchestrationdrops from 255 to ~195 lines. Version bumped to 1.0.21.Test plan
bunx @biomejs/biome check src/— zero errorsbun test— 2167 pass, 2 pre-existing flaky failures indigitalocean-token.test.ts(addressed by fix(tests): use URL-aware fetch mocks to fix concurrent test pollution #3341)-- spawn-refactor/complexity-hunter