Skip to content

chore: merge main into dependency-cooldown branch and fix audit vulnerabilities#97

Draft
Copilot wants to merge 13 commits intoclaude/dependency-breach-cooldown-bagsGfrom
copilot/resolve-conflict-and-run-ci
Draft

chore: merge main into dependency-cooldown branch and fix audit vulnerabilities#97
Copilot wants to merge 13 commits intoclaude/dependency-breach-cooldown-bagsGfrom
copilot/resolve-conflict-and-run-ci

Conversation

Copy link
Copy Markdown

Copilot AI commented Apr 30, 2026

PR #92 had merge conflicts with main (which had advanced through PRs #93#96) and two new audit vulnerabilities surfaced after the merge.

Conflict resolution

  • bunfig.toml: kept minimumReleaseAgeExcludes from main alongside the existing minimumReleaseAge = 604800
  • package.json / bun.lock: merged vite override from main with smol-toml and picomatch overrides from the PR branch

Audit fixes

Two vulnerabilities exposed after the merge:

"overrides": {
  "fast-xml-parser": ">=5.7.0",
  "rollup": ">=4.59.0",
  "smol-toml": ">=1.6.1",
  "vite": ">=7.3.2 <8.0.0",
  "picomatch": ">=4.0.4",
  "postcss": ">=8.5.10"
}

claude and others added 13 commits April 9, 2026 12:09
zghalintで確立した設定とスキルをreview-codecommit向けに適応して移植:
- settings.json: effortLevel, language, SessionStartフック(bun install), permissions
- update-plan skill: プランモード検証スキル(既存update-designの10カテゴリ評価を流用)

https://claude.ai/code/session_01A8TVGsDKAQwp8GJnDiP9B5
Add design document for line number gutter display and ]c/[c change
navigation. Covers component design, state transitions, edge cases,
TDD strategy, and consistency checks against existing design docs.

https://claude.ai/code/session_019VGi6GMhSS1eT3HbDbCPzd
Address 6 review findings (2 P1, 4 P2):
- P1: Fix formatGutter truthiness check to use !== undefined
- P1: Add pendingBracket visual feedback design in footer
- P2: Document n/N vs ]c/[c wrap-around behavior difference
- P2: Add timeout-less UX impact analysis for 2-key sequence
- P2: Add commit view line number gutter to edge case table
- P2: Add roadmap.md update to out-of-scope section

https://claude.ai/code/session_015NbnHYsXMH45WpAakjZoki
Add before/after line numbers to add, delete, and context diff lines
using a dimColor gutter format (e.g. "   3    4 │ "). Header and
comment lines are unaffected.

https://claude.ai/code/session_015NbnHYsXMH45WpAakjZoki
Add Vim-style ]c (next change) and [c (previous change) keybindings
to jump between add/delete lines in the PR detail diff view. Uses a
pendingBracket state for 2-key sequence handling with visual feedback
in the footer.

https://claude.ai/code/session_015NbnHYsXMH45WpAakjZoki
Update requirements.md, roadmap.md, README.md, and design doc to reflect
the implemented line number gutter and ]c/[c change line jump features.

https://claude.ai/code/session_015NbnHYsXMH45WpAakjZoki
Add overrides for smol-toml (>=1.6.1), vite (>=7.3.2), and
picomatch (>=4.0.4) to fix 8 audit vulnerabilities (4 high,
4 moderate). Create bunfig.toml with minimumReleaseAge=604800
(7 days) as supply chain attack mitigation.

https://claude.ai/code/session_01MyQde86BJvKTRRWRCumL5j
Co-authored-by: watany-dev <76135106+watany-dev@users.noreply.github.com>
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.

3 participants