chore: back-merge main release history into develop#36
Merged
Conversation
Promote the validated release branch to main and trigger protected semantic-release publishing.
…docs (#33) * feat: generalize MCP agent targets and refresh app icon (#31) * feat: refresh app icon to the Mimir monogram mark Replace the placeholder favicon with the black/purple Mimir square mark used across brand surfaces, in both the Tauri app and the landing package. * feat(core): support custom MCP agent targets in setup and install-skill Generalize the previously hardcoded Claude/Codex/Kimi/OpenCode/Cline MCP helper generation into a configurable agentHelpers list. Add --agents, --mcp-name, --mcp-command, and --mcp-arg to `mimir setup` and `mimir install-skill` so an arbitrary MCP-compatible agent can be targeted without a source change. * feat: pin Node toolchain with mise and add LLM/skills discovery docs (#32) * feat: pin Node.js toolchain with mise Replace the Node version hardcoded across CI workflows with a single mise.toml pin, installed via jdx/mise-action in ci.yml and native-app-build.yml. npm-publish.yml keeps actions/setup-node since it also wires npm registry auth. pnpm stays pinned via Corepack's packageManager field, not duplicated in mise.toml. * docs: add llms.txt and context7.json for LLM-facing discovery Prepare the repo to be indexed by Context7: llms.txt follows the llmstxt.org convention and links the docs relevant to consuming Mimir as a library/CLI/MCP server (excludes Tauri app, landing, and licensing docs, which aren't part of that surface). context7.json scopes the crawler away from generated/private directories and adds a few correctness rules. Also documents the direct skills.sh install path for the bundled mimir skill. * fix(ci): install mise via curl instead of jdx/mise-action jdx/mise-action is blocked by this repo's Actions permissions policy (allowed_actions: selected, restricted to actions/*, github/codeql-action/*, and verified creators), which caused a startup_failure on every workflow run. Install mise with the official curl script in a plain run: step instead, which isn't subject to the uses: allowlist.
Reconcile squash-merged release history: main #33 squashed develop's #31/#32 and carried a main-only release commit whose substantive infra (npm-publish, ci, codeql, releaserc) is already identical on develop. develop is a verified content superset, so keep develop's tree and record main as a parent to unblock the develop -> main release merge.
|
🎉 This PR is included in version 1.2.0 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
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
1 participant
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.
Why
mainanddevelopdiverged: PR #33 landed onmainas a squash of develop's #31/#32, andmainalso carried a release commit. Git therefore could not auto-reconciledevelop -> main(PR #35 was CONFLICTING), even though every conflicting file ondevelopis a content superset ofmain.Verified before this back-merge:
npm-publish.yml,ci.yml,codeql.yml,.releaserc.jsonare identical on both branches.developbeing newer (e.g.--semanticsetup,sourcescommand, hardenedresolveMcpProjectRoot, no-telemetry Astro wrapper, TTSallowRemoteModels=falsedefault).What
A
-s oursmerge ofmainintodevelop: it recordsmainas a parent (somainbecomes an ancestor ofdevelop) while keepingdevelop's tree byte-for-byte unchanged. This PR therefore has no file changes — it only reconciles history so thedevelop -> mainrelease merge (#35) can proceed cleanly.Merge method
Must be merged with a merge commit (not squash/rebase) to preserve the
mainparent link.