[refactor] pkg/ctxutil + pkg/envutil: 3 call sites bypass ctxutil.OrBackground, incl. wasm/non-wasm divergence #52402

Overview

Semantic function clustering analysis of the pkg/ctxutil and pkg/envutil package slice.

The two analyzed files are themselves clean — no outlier functions, no internal duplicates, correct one-file-per-feature organization. All findings below are call sites elsewhere in the repo that hand-roll logic these packages already provide.

Key Issues

1. Exact inline duplicate of ctxutil.OrBackground

pkg/workflow/skills_ref_resolution.go:70-73 reproduces the helper byte-for-byte:

ctx := data.Ctx
if ctx == nil {
    ctx = context.Background()
}

This is precisely the pattern ctxutil.OrBackground was created to eliminate — its doc comment quotes this exact snippet as the anti-pattern.

Fix: ctx := ctxutil.OrBackground(data.Ctx)

2. wasm / non-wasm build variants diverge (most notable finding)

Two sibling files in the same package solve the identical problem differently:

// pkg/workflow/github_cli_wasm.go:59-61  — uses the helper
func ghUnavailableCommand(ctx context.Context) *exec.Cmd {
    ctx = ctxutil.OrBackground(ctx)
    return exec.CommandContext(ctx, "echo", "gh CLI not available in Wasm")
}

// pkg/workflow/github_cli.go:49-51  — hand-rolled, and picks TODO() not Background()
if ctx == nil {
    ctx = context.TODO()
}

The wasm variant was migrated to ctxutil; the primary build path was not. Beyond the duplication, the two paths disagree on the fallback context type.

Fix: ctx = ctxutil.OrBackground(ctx) in setupGHCommand, and update the doc comment at line 42 which currently documents the context.TODO() behavior.

3. normalizeDockerContext is a redundant named helper

// pkg/cli/docker_images.go:70-75
func normalizeDockerContext(ctx context.Context) context.Context {
    if ctx == nil {
        return context.TODO()
    }
    return ctx
}

Same signature and same purpose as ctxutil.OrBackground, differing only in TODO() vs Background().

Fix: delete and call ctxutil.OrBackground directly at its call sites.

Next Actions

• Replace the inline block in pkg/workflow/skills_ref_resolution.go:70-73 with ctxutil.OrBackground
• Migrate setupGHCommand in pkg/workflow/github_cli.go and fix its stale doc comment
• Delete normalizeDockerContext in pkg/cli/docker_images.go and inline the helper at call sites
• Consider a lint rule for the if ctx == nil fallback pattern to stop regressions

Estimated effort: ~1 hour. All three are mechanical, behavior-preserving except the deliberate TODO() → Background() normalization.

Analysis Metadata

• Files analyzed: 2 (pkg/ctxutil/ctxutil.go, pkg/envutil/envutil.go)
• Functions cataloged: 5
• Clusters identified: 2
• Outliers in slice: 0
• Duplicate call sites found: 3
• Method: Serena semantic analysis + repo-wide pattern search for the slice's helper signatures

Generated by 🔧 Semantic Function Refactoring · sonnet46 · 193.1 AIC · ⌖ 20.4 AIC · ⊞ 9.6K · ◷

• expires on Aug 14, 2026, 7:16 PM UTC-08:00