Distillation

Date: Sep 17, 2026

• 🔴 (09:21) User stated Jujutsu (jj) never fails on conflict; after rebase, new, or squash, the conflict is recorded in the resulting commit and must be detected with jj st, resolved by manually editing files, and verified with jj st rather than using interactive jj resolve.
• 🔴 (09:21) User provided Jujutsu workflow rules: use jj rather than git for mutations when .jj/ exists; never use interactive flags; always pass -m "msg" when describing or committing; verify mutations with jj st and jj log; prefer stable letter-based change IDs over hexadecimal commit IDs; do not rebase or describe immutable commits; use jj undo or jj op restore <op-id> for recovery.
• 🔴 (09:21) User stated Jujutsu bookmarks do not auto-advance; after jj commit, move one with jj bookmark set <name> -r @-. The new @ is empty after jj commit, while committed content is in @-; jj new creates a new empty change rather than acting like git commit.
• 🔴 (09:21) User showed /home/byk/Code/opencode-lore-embedding-runtime is a colocated Jujutsu/Git repository containing both .jj/ and .git/.
• 🟡 (09:21) Repository root /home/byk/Code/opencode-lore-embedding-runtime contained 28 entries: .craft.yml, .git, .github/, .gitignore, .jj/, .lore.md, .oxfmtrc.json, .oxlintrc.json, AGENTS.md, CHANGELOG.md, codecov.yml, LICENSE, node_modules/, package.json, packages/, patches/, pnpm-lock.yaml, pnpm-workspace.yaml, quality/, README.md, scripts/, stryker.config.mjs, supabase/, tsconfig.base.json, tsconfig.json, vitest.config.ts, vitest.evals.config.ts, and vitest.mutation.config.ts.