Skip to content

cherry-pick: Warn loudly when config-shaping env vars arrive via component .env files (not honored) (conflicts → v5.1)#1754

Merged
kylebernhardy merged 3 commits into
v5.1from
cherry-pick/v5.1/pr-1580
Jul 10, 2026
Merged

cherry-pick: Warn loudly when config-shaping env vars arrive via component .env files (not honored) (conflicts → v5.1)#1754
kylebernhardy merged 3 commits into
v5.1from
cherry-pick/v5.1/pr-1580

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Cherry-pick of PR #1580 onto `v5.1` produced conflicts on commit(s): `0e80b6bdbe8b46e5162d55419d53ffac952df7bc`.

Resolve the conflict markers on branch `cherry-pick/v5.1/pr-1580` and merge this PR.

@claude please review branch `cherry-pick/v5.1/pr-1580` and suggest a patch that resolves the conflict markers (<<<<<<< / ======= / >>>>>>>) introduced by cherry-picking PR #1580 onto `v5.1`. Post the suggested patch as a comment here — do not push.

Warn loudly when config-shaping env vars arrive via component .env files (not honored)
nizzlenitz and others added 2 commits July 10, 2026 07:51
v5.1's loadEnv predates the env-secrets machinery on main; the patch
takes only the #1513 warn-and-skip against v5.1's file shape. DESIGN.md
takes the incoming sections.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@kylebernhardy

Copy link
Copy Markdown
Member

Conflicts resolved (9b61349 + 0b118c4), deliberately minimal for the release line:

Verified in the branch: 14 unit tests + the flipped integration test (fixture delivers HARPER_CONFIG via .env; /mcp stays unmounted) pass, lint clean.

Comment generated by an LLM (Claude Fable 5).

@kylebernhardy kylebernhardy merged commit 2fff827 into v5.1 Jul 10, 2026
46 checks passed
@kylebernhardy kylebernhardy deleted the cherry-pick/v5.1/pr-1580 branch July 10, 2026 14:23
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.

2 participants