Skip to content

Commit 8143efd

Browse files
committed
fix(cli): remove the OpenShell first-poll settle wait
OpenShell 0.1.3 and later include NVIDIA/OpenShell#3819, so the supervisor's first settings poll no longer reloads policy and terminates connections in flight (NVIDIA/OpenShell#3809). With the pin at 0.1.4 (#8299), the 12 s wait before the GitHub pre-flight check is no longer needed. Local runs still on OpenShell 0.1.2 should upgrade to the pinned version. Signed-off-by: Wayne Sun <[email protected]> Assisted-by: Claude
1 parent b9fe1fe commit 8143efd

3 files changed

Lines changed: 1 addition & 184 deletions

File tree

‎internal/cli/openshell_settle.go‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎internal/cli/openshell_settle_test.go‎

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎internal/cli/run.go‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,9 +1923,6 @@ func runAgent(ctx context.Context, agentName, fullsendDir, outputBase, targetRep
19231923
printer.StepFail("Failed to create sandbox")
19241924
return fmt.Errorf("creating sandbox: %w", err)
19251925
}
1926-
// Anchor for waitForOpenShellFirstPoll (OpenShell #3809) before the first
1927-
// network request.
1928-
sandboxReadyAt := time.Now()
19291926
finalizeSandboxSpan(sandboxSpan, nil)
19301927

19311928
if len(runScopedProviders) > 0 {
@@ -2420,14 +2417,7 @@ func runAgent(ctx context.Context, agentName, fullsendDir, outputBase, targetRep
24202417
}
24212418
}
24222419

2423-
// 9b-1. Let OpenShell 0.1.2's first settings poll pass before any network
2424-
// request; it terminates connections in flight (OpenShell #3809). Remove
2425-
// with openShellFirstPollSettle once the pin includes the upstream fix.
2426-
if _, err := waitForOpenShellFirstPoll(ctx, sandboxReadyAt, printer); err != nil {
2427-
return fmt.Errorf("waiting for the sandbox's first policy poll: %w", err)
2428-
}
2429-
2430-
// 9b-2. Pre-flight GitHub API connectivity check.
2420+
// 9b. Pre-flight GitHub API connectivity check.
24312421
// Validates that the sandbox can reach api.github.com through the proxy
24322422
// before starting the agent. Without this, agents that depend on gh CLI
24332423
// burn their entire timeout on doomed API calls. See #2143.

0 commit comments

Comments
 (0)