Skip to content

chore(skillctrl): pin を upstream 履歴から base を復元する版へ上げる - #130

Merged
wwwyo merged 1 commit into
mainfrom
wwwyo/skillctrl-pin-upstream-history
Oct 25, 2026
Merged

wwwyo merged 1 commit into
mainfrom
wwwyo/skillctrl-pin-upstream-history

Conversation

@wwwyo

@wwwyo wwwyo commented Oct 25, 2026

Copy link
Copy Markdown
Owner

Blast Radius

低 — 週次の skillctrl-update workflow と、ローカルの skillctrl CLI の版だけが変わる。新しい CLI で skillctrl check が通ること、workflow 接続テストが通ることは確認済み。問題があれば pin を戻せば復旧できる。

What

skillctrl の pin を wwwyo/skillctrl#27 の merge commit へ上げる。update agent の prompt から、廃止された originals snapshot と update report の original field への言及を外す。

Background

skillctrl の update は、upstream の変更を 3-way merge でローカル skill に取り込む。これまで base は repo 内の .agents/skillctrl/originals/ に置いた snapshot から取っていた。wwwyo/skillctrl#27 で、lock に記録済みの tree hash を使って upstream の Git 履歴から base を復元する方式に変わり、snapshot は作られなくなった。本 PR では、dotfiles の CLI と CI をその版へ揃える。

Related: wwwyo/skillctrl#27

QA

  • 新しい版の CLI を install し、この worktree で skillctrl check が exit 0 になることを確認した(lock の不一致なし)
  • bash tests/skillctrl-workflow.test.sh が OK になることを確認した
  • workflow の実行(土曜の定期実行・手動 dispatch)は merge 後でないと走らないため、QA は未実施

Summary

  • go:github.com/wwwyo/skillctrl の pin を 7271615 へ更新した。対象は mise の config・lock と、テストの fixture
  • update prompt の report field を新しい schema(base・reason)に合わせた。あわせて、diff3 conflict と、binary・modify/delete conflict の扱いを書き直し、originals snapshot への編集禁止の記述を削除した
  • dotfiles は .agents/skillctrl/originals/ を git で追跡していないため、削除する対象はない
  • .lock.yml は、既存の lock と同じ compiler である gh-aw v0.89.21 で再生成した

https://claude.ai/code/session_01EUgMLcfukUoucoQ5DWyw4u

@wwwyo wwwyo self-assigned this Oct 25, 2026
@coderabbitai

coderabbitai Bot commented Oct 25, 2026 •

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 53 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Central YAML; Path: .coderabbit.yaml
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 8fd12f2a-9747-422b-8a0c-e79b0d676739
Commits

Reviewing files that changed from the base of the PR and between 57ba4c0 and 1b788a1.

Files ignored due to path filters: 1
  • home/dot_config/mise/mise.lock is excluded by !**/*.lock
Files selected for processing: 4
  • .github/workflows/skillctrl-update.lock.yml
  • .github/workflows/skillctrl-update.md
  • home/dot_config/mise/config.toml
  • tests/skillctrl-workflow.test.sh
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@pullfrog pullfrog Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ No new issues found.

Reviewed changes

Reviewed PR #130 (head 1b788a1): bumps the skillctrl CLI pin from ebc6921 to 7271615 and updates the skillctrl-update workflow prompt to the new report schema.

  • Pin bump in home/dot_config/mise/config.toml and home/dot_config/mise/mise.lock to 727161586f725278ba1f7cd8f70c14137724c058 (wwwyo/skillctrl#27, merge-base recovery from upstream tree history).
  • Test fixture in tests/skillctrl-workflow.test.sh updated to the new pin; the trusted-pin step and lock-mismatch assertion both pass.
  • skillctrl-update.md prompt migrated from the obsolete original field to base/reason, with diff3 conflict handling and binary/modify-delete behavior rewritten to match the new CLI.
  • Removed the now-obsolete prohibition on editing .agents/skillctrl/originals/ snapshots.
  • .github/workflows/skillctrl-update.lock.yml regenerated (body_hash only) with gh-aw v0.89.21.

Verification performed: commit 7271615 exists on wwwyo/skillctrl and is a single-parent commit implementing merge-base recovery; installed the new binary via mise and ran skillctrl check on a writable copy of the repo (exit 0, lock_changed: false); ran bash tests/skillctrl-workflow.test.sh (OK). No stale references to the old pin remain.

Pullfrog  | View workflow run | Using beam-free | 𝕏

@wwwyo
wwwyo marked this pull request as ready for review October 25, 2026 03:12
@wwwyo
wwwyo merged commit 27ea16d into main Oct 25, 2026
18 checks passed
@wwwyo
wwwyo deleted the wwwyo/skillctrl-pin-upstream-history branch October 25, 2026 03:12
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.

1 participant