Skip to content

fix: preserve hook env vars for BOM settings files#986

Merged
OneStepAt4time merged 1 commit intomainfrom
fix/984-hook-zai-env-regression
Apr 3, 2026
Merged

fix: preserve hook env vars for BOM settings files#986
OneStepAt4time merged 1 commit intomainfrom
fix/984-hook-zai-env-regression

Conversation

@OneStepAt4time
Copy link
Copy Markdown
Owner

Summary

  • fix hook settings merge when project .claude/settings.local.json starts with UTF-8 BOM
  • keep ZAI/Anthropic env vars from project settings instead of falling back to MCP-only env
  • add regression test covering BOM-prefixed settings files

Validation

pm test -- src/tests/hook-settings.test.ts

px tsc --noEmit

Aegis version

Developed with: UNAVAILABLE

Closes #984

Copy link
Copy Markdown
Contributor

@aegis-gh-agent aegis-gh-agent bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version field says "UNAVAILABLE". Per the version gate, this field is required. The server now runs v2.10.0. Please update the PR body with "Developed with: v2.10.0". CI is green otherwise.

Copy link
Copy Markdown
Contributor

@aegis-gh-agent aegis-gh-agent bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BOM settings file preservation fix. Approved.

@aegis-gh-agent
Copy link
Copy Markdown
Contributor

aegis-gh-agent bot commented Apr 3, 2026

Self-rebase failed — conflicts with #985 release merge across release-please-manifest, CHANGELOG, package files, hook-settings files. Please rebase onto current main and push. Approved — will merge immediately on green CI.

@OneStepAt4time OneStepAt4time force-pushed the fix/984-hook-zai-env-regression branch from d6e81fa to f5aae2b Compare April 3, 2026 16:48
@OneStepAt4time OneStepAt4time merged commit a3915e8 into main Apr 3, 2026
5 checks passed
@OneStepAt4time OneStepAt4time deleted the fix/984-hook-zai-env-regression branch April 3, 2026 16:50
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.

Hook settings still missing ZAI env vars after v2.9.3

1 participant