Skip to content

ci: use changelog v0 and remove conflict resolver - #11

Merged
coisa merged 2 commits into
mainfrom
codex/changelog-channel-cleanup
Oct 20, 2026
Merged

coisa merged 2 commits into
mainfrom
codex/changelog-channel-cleanup

Conversation

@coisa

@coisa coisa commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

Manage the Changelog contributor skill through Composer instead of committing generated copies. Preserve the existing @v0 caller, full package/version title template and publication settings.

Add development-only llm/skills:^1.15 and its specific plugin allowlist entry. Native skills:init / skills:add commands created skills.json, sourcing only fast-forward-changelog from php-fast-forward/changelog on GitHub within ^0.3.0. Composer dependency discovery, vendor sources and aliases are disabled. composer install restores the local skill; composer skills:show inspects it and composer skills:update --from=github refreshes it within that range.

Untrack only the Changelog skill's generated payload and former native receipt. Keep the six published payload files locally, ignore generated .agents/ files, and exclude development setup from Composer archives. Other existing tracked .agents assets remain unchanged. Application runtime requirements and other plugin permissions are preserved; no lockfile is introduced.

The obsolete DevTools auto-resolve-conflicts wrapper is removed; its upstream workflow no longer exists. Release PR titles use the full package name and prefixed version transition.

Validation: native manager synchronization and skills:show passed; all six installed file hashes match published Changelog 0.3.0; Composer strict metadata validation and the complete dependency-graph dry run passed with llm/skills 1.15.0; actionlint, fragment validation and a committed comparison for this migration passed. The plugin commands ran with a workspace-isolated Composer home/cache; no host-global plugin state was modified. Full application tests are delegated to CI because runtime code is unchanged.

Head: 1e04ca698de76dc96c43c3d3d0f2d27257bf894c. CI/reviews are being refreshed for this head. No merge, tag creation, GitHub Release publication or existing Release-body change was performed.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-20T16:18:14.178311Z 1e04ca6 New commits
🔒 Security Review ✅ Completed 2026-10-20T16:20:29.624142Z 1e04ca6 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@coderabbitai

coderabbitai Bot commented Oct 20, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: ASSERTIVE
  • Plan: Advanced
  • Run ID: f18f94b9-03fc-47cc-b4c7-e14f79f997cd
📥 Commits

Reviewing files that changed from the base of the PR and between f755fd5 and 1e04ca6.

📒 Files selected for processing: 16
  • .agents/skills/fast-forward-changelog/.fast-forward-install.json
  • .agents/skills/fast-forward-changelog/LICENSE
  • .agents/skills/fast-forward-changelog/SKILL.md
  • .agents/skills/fast-forward-changelog/examples/contribution.php
  • .agents/skills/fast-forward-changelog/references/automation.md
  • .agents/skills/fast-forward-changelog/references/cli.md
  • .agents/skills/fast-forward-changelog/references/php-api.md
  • .changelog/changelog-channel-cleanup.md
  • .changelog/composer-managed-changelog-skill.md
  • .gitattributes
  • .github/workflows/auto-resolve-conflicts.yml
  • .github/workflows/changelog.yml
  • .gitignore
  • CONTRIBUTING.md
  • composer.json
  • skills.json
💤 Files with no reviewable changes: 8
  • .agents/skills/fast-forward-changelog/LICENSE
  • .agents/skills/fast-forward-changelog/SKILL.md
  • .agents/skills/fast-forward-changelog/.fast-forward-install.json
  • .agents/skills/fast-forward-changelog/references/automation.md
  • .agents/skills/fast-forward-changelog/references/php-api.md
  • .github/workflows/auto-resolve-conflicts.yml
  • .agents/skills/fast-forward-changelog/references/cli.md
  • .agents/skills/fast-forward-changelog/examples/contribution.php

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

📝 Summary

Summary by CodeRabbit

  • Documentation

    • Updated contribution guidance for installing and refreshing development skills.
    • Documented the published changelog workflow channel and release pull-request naming convention.
    • Added changelog entries describing recent workflow and skill-management changes.
  • Chores

    • Added managed configuration for restoring the changelog contributor skill.
    • Excluded generated skill files from exported archives and version control.
    • Removed the obsolete automatic conflict-resolution workflow and local skill copies.
    • Updated changelog automation to use the published workflow channel.

The repository now configures Composer to source the changelog skill from GitHub instead of tracking its local copy. The changelog workflow uses the v0 channel and a revised release PR title. The automatic conflict-resolution workflow was removed.

Changes: Changelog tooling and contributor workflow

Layer / File(s) Summary
Configure Composer-managed skill sourcing
composer.json, skills.json, .gitattributes
Adds the development-only llm/skills plugin and configures the changelog skill source, synchronization settings, and archive exclusion for skills.json.
Replace checked-in skill copy with managed sourcing
.agents/skills/fast-forward-changelog/*, .gitignore, CONTRIBUTING.md, .changelog/composer-managed-changelog-skill.md
Removes the local skill files. Updates ignore rules and contributor guidance for Composer-managed skill installation and refresh. Adds a changelog entry for the skill sourcing change.
Update changelog workflow channel
.github/workflows/changelog.yml, .github/workflows/auto-resolve-conflicts.yml, .changelog/changelog-channel-cleanup.md, CONTRIBUTING.md
Changes the reusable workflow reference to @v0 and revises the release PR title. Removes the automatic conflict-resolution workflow and documents the channel and title changes.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Other

Suggested reviewers: php-fast-forward

Merge Risk: ⚪ Minimal · up to 1e04c

This change moves the changelog workflow to the published v0 channel, as documented. It manages the changelog skill through Composer instead of committed copies and removes the obsolete conflict-resolution workflow. No outstanding issue blocks merging.

Pre-merge checks: Passed 5
Check name Status Explanation
Title check Passed The title clearly summarizes the two primary changes: adopting Changelog v0 and removing the obsolete conflict resolver.
Docstring Coverage Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Description check Passed The pull request description directly matches the changes. It covers Composer-based Changelog skill management, generated-file removal, workflow updates, and validation.
Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0 files. (8 skipped: 8 unsupported.)

✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • 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

A rabbit checks the changelog page,
Then hops to skills in Composer’s cage.
The local copies leave the ground,
The v0 channel now is found.
Fresh release titles greet the day,
And carrots mark the merge-way.

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

@github-actions

github-actions Bot commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

Changelog

✅ Contribution check passed.

Head: 1e04ca698de76dc96c43c3d3d0f2d27257bf894c

Base: f755fd5a8237c7b79882bf444cf9ea50028d440b

Contribution: 2 new valid fragment(s). Policy: ordinary.

  • changelog-channel-cleanup.md — fixed, patch

    Use the published Changelog v0 workflow channel, identify the package and version transition in release PR titles, and remove obsolete automatic conflict resolution now that pending changes use independent fragments.

  • composer-managed-changelog-skill.md — changed, patch

    Restore the Changelog contributor skill through the development-only Composer skill manager and its reviewed GitHub source instead of versioning generated skill copies.

@github-actions

Copy link
Copy Markdown
Contributor

@coisa
coisa merged commit ed8a059 into main Oct 20, 2026
45 checks passed
@coisa
coisa deleted the codex/changelog-channel-cleanup branch October 20, 2026 20:23
github-actions Bot added a commit that referenced this pull request Oct 20, 2026
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