Fix merge conflicts for PR #1240: Add Kimi Code 2.6 support#1452

Open

dilukangelosl wants to merge 69 commits into

dilukangelosl:add-kimi-code-support-fixed

Commits on Mar 24, 2026

docs: add Codex App compatibility design spec (PRI-823)

authored and
arittr
committed
docs: address spec review feedback for PRI-823

authored and
arittr
committed
docs: address team review feedback for PRI-823 spec

authored and
arittr
committed
docs: clarify executing-plans in What Does NOT Change section

authored and
arittr
committed
docs: add cleanup guard test (#5) and sandbox fallback test (#10) to spec

authored and
arittr
committed
docs: add implementation plan for Codex App compatibility (PRI-823)

authored and
arittr
committed
docs(codex-tools): add named agent dispatch mapping for Codex (#647)

Drew Ritter
authored and
arittr
committed
fix(writing-skills): correct false 'only two fields' frontmatter claim (#882)
arittr
committed
Replace subagent review loops with lightweight inline self-review

obra
and
claude
committed
Revert "Replace subagent review loops with lightweight inline self-review"
obra
committed
Reapply "Replace subagent review loops with lightweight inline self-review"
obra
committed
Merge branch 'main' into dev
obra
committed
Add v5.0.6 release notes
obra
committed
Move brainstorm server metadata to .meta/ subdirectory
obra
committed
Revert "Move brainstorm server metadata to .meta/ subdirectory"
obra
committed
Separate brainstorm server content and state into peer directories
obra
committed
Fix owner-PID false positive when owner runs as different user
obra
committed
Fix owner-PID lifecycle monitoring for cross-platform reliability
obra
committed
Merge branch 'fix/owner-pid-lifecycle' into dev
obra
committed

Commits on Mar 26, 2026

Commits on Apr 7, 2026

Commits on Apr 13, 2026

Commits on Apr 16, 2026

Remove the deprecated legacy slash commands (#1188)
obra
authored

Commits on Apr 21, 2026

Add first-class support for Kimi Code 2.6- Add .kimi/AGENTS.md bootstrap (survives /init, auto-merged into system prompt)- Add .kimi/INSTALL.md with global skills junction instructions- Add .kimi/T…
XxclaymoreXx
committed

Commits on Apr 24, 2026

Replace Kimi Code symlink-based install with first-class native hook support
XxclaymoreXx
committed

Commits on Apr 27, 2026

fix: prevent subagent-driven-development from pausing every 3 tasks

obra
authored and
Jesse Vincent
committed
Remove Integration sections from skills
Jesse Vincent
committed
Merge remote-tracking branch 'origin/main' into dev
arittr
committed
fix(opencode): cache bootstrap content at module level to eliminate per-step file I/O

voidborne-d
authored and
arittr
committed
test(opencode): simplify bootstrap cache coverage
arittr
committed
docs: clarify opencode install caveats
arittr
committed
test(opencode): modernize integration tests
arittr
committed
docs: add Factory Droid installation instructions

Skyline-9
authored and
arittr
committed
Preserve Codex marketplace metadata
arittr
committed

Commits on Apr 30, 2026

Lift superpowers:code-reviewer agent into the requesting-code-review skill

Jesse Vincent
authored and
arittr
committed
Merge remote-tracking branch 'origin/main' into dev
arittr
committed
Prepare v5.1.0: release notes and version bump

obra
and
claude
committed

Commits on May 1, 2026

Merge PR #1240: Add first-class support for Kimi Code 2.6
dilukangelosl
committed