sync: isolated skill bootstrap and per-model context windows - #22
Merged
Merged
Conversation
(cherry picked from commit cfac6be)
When [compact] context_window is not set explicitly, size it from a new per-model rule catalog (model_context_window, mirroring model_max_tokens) instead of the flat 200K fallback. Third-party OpenAI-compatible endpoints (Kimi/Moonshot, DeepSeek, Qwen, MiniMax) get realistic windows, so autocompact thresholds reflect the model actually in use. An explicit [compact] context_window always wins; user-provided model_context_window rules replace the preset, matching model_max_tokens merge semantics. (cherry picked from commit ffdef1f)
…model catalog (cherry picked from commit b72b400)
(cherry picked from commit 611ea82)
Isolated bootstrap should document and test the canonical .csbu-workmate project directory, while still accepting legacy .aionrs skills.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Cherry-pick the small set of useful upstream commits this fork was missing: isolated skill bootstrap directories, and compact
context_windowresolution from the per-model catalog (including the model-safe follow-up). Fork-only WorkMate branding and tool/MCP work are preserved. No user-visible AionUi branding.TAKEN
Cherry-picked from
iOfficeAI/aionrsmain(original SHAs):cfac6befeat(skills): support isolated bootstrap directoriesffdef1ffeat(config): resolve compact context_window from per-model catalogb72b400chore(config): log debug line when compact context_window comes from model catalog611ea82fix(config): make context windows model-safeFork follow-up on this branch:
2729a7bfix(skills): keep WorkMate branded path in isolated skill discovery (docs + test use.csbu-workmate/skills; legacy.aionrs/skillsstill works)SKIPPED
Merge wrappers (feature commits already taken above):
0168a0fMerge pull request feat(config): resolve compact context_window from per-model catalog iOfficeAI/aionrs#268 from salim4n/poc/per-model-context-windowf711174Merge pull request feat(skills): support isolated bootstrap directories iOfficeAI/aionrs#261 from jsoncm/feat/isolated-skill-discoveryNot requested / not on the 6-commit behind set: TUI REPL, session fork, tool-output truncation, and other unrelated upstream work.
Preserved fork-only
.csbu-workmatecanonical,.aionrslegacy)Test plan
cargo test -p aion-config --lib -- context_window— 21 passedcargo test -p aion-agent --lib -- isolated_skill set_config_model_change— 6 passed (isolated skills + catalog recompute / explicit window)cargo check --workspace --tests— ok.csbu-workmate/skillsand legacy.aionrs/skills