Skip to content

fix(ci): unblock main — TS blocklist parity + 3 lint errors#107

Merged
MarkKropf merged 2 commits into
mainfrom
fix/ts-blocklist-parity-sync
Jun 3, 2026
Merged

fix(ci): unblock main — TS blocklist parity + 3 lint errors#107
MarkKropf merged 2 commits into
mainfrom
fix/ts-blocklist-parity-sync

Conversation

@MarkKropf

@MarkKropf MarkKropf commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

main's test CI job is red on two independent fronts, blocking the entire donmai merge queue (every open PR, including the parallel gemini/credential/interview work). This PR greens all of it.

1. TS blocklist parity (Test step)

TestBlocklistParity_TSClient failed: Go canonical internal/credentials/blocklist.go gained DONMAI_DAEMON_TOKEN + DONMAI_ORCHESTRATOR_URL (debrand/security commits) but the TS duplicate clients/credentials-client-ts/src/blocklist.ts was never synced (got 9, want 11). Mirrored the two entries — additive to a security blocklist, no behavior risk.

A third hardcoded copy lives in rensei-tui daemon/credentials/socket.go (FOLLOWUP-17, separate repo) — flag for follow-up sync.

2. Lint (golangci-lint v2.11.4, repo-wide)

Three pre-existing violations in parallel subsystems (not introduced here), surfaced by the lint version:

  • provider/gemini/handle.go:118 — gosec G118 false positive: cancel is retained on Handle.cancel and invoked via h.cancel() (line 189). Annotated with a justified //nolint:gosec.
  • internal/interview/wiretypes.go — revive stutter: InterviewTokenChannelTokenChannel (zero callers; safe rename).
  • provider/gemini/gemini_test.go — revive redefines-builtin: test-local capmaxTurns (all 4 refs).

Verification

  • go test -run TestBlocklistParity ./clients/credentials-client-ts/...
  • golangci-lint run0 issues
  • go test ./provider/gemini/... ./internal/interview/... ./clients/credentials-client-ts/...

Touches files owned by the in-flight gemini-first-class + interactive-interviews lanes (all on main already, not their WIP branches). Those branches will pick these up on rebase.

🤖 Generated with Claude Code

MarkKropf and others added 2 commits June 3, 2026 12:36
…ed on main)

internal/credentials/blocklist.go (canonical) added DONMAI_DAEMON_TOKEN and
DONMAI_ORCHESTRATOR_URL in the recent debrand/security commits, but the TS
duplicate at clients/credentials-client-ts/src/blocklist.ts was not synced.
TestBlocklistParity_TSClient has been red on main since, blocking every PR.
Mirror the two missing entries to restore parity.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
… builtin shadow

golangci-lint v2.11.4 is red on main (blocks the whole queue), in code from
parallel subsystems unrelated to this branch's blocklist fix:

- provider/gemini/handle.go:118 (gosec G118): cancel IS retained on
  Handle.cancel and invoked via h.cancel() (line 189) — false positive;
  annotate with a justified //nolint:gosec.
- internal/interview/wiretypes.go (revive stutter): rename
  InterviewTokenChannel -> TokenChannel (zero callers; safe).
- provider/gemini/gemini_test.go (revive redefines-builtin): rename local
  `cap` -> `maxTurns` (all 4 references).

Verified: `golangci-lint run` reports 0 issues; gemini + interview tests pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@MarkKropf MarkKropf changed the title fix(credentials): sync TS blocklist with Go canonical (parity guard red on main) fix(ci): unblock main — TS blocklist parity + 3 lint errors Jun 3, 2026
@MarkKropf
MarkKropf merged commit dd51e36 into main Jun 3, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant