[closed in error — wrong repo] chore(fork): always take ours for appcast.xml on upstream merges#136
Closed
Uncle-Peke wants to merge 7 commits into
Closed
Conversation
ExitPlanMode permission requests now show a dedicated two-button UI (MANUAL / AUTO-ACCEPT) instead of the standard allow/deny card, matching Claude Code's own plan execution choices. AUTO-ACCEPT sets acceptEdits mode for the session so subsequent file edits require no further approval. Also fixes a race where the ExitPlanMode approval card stayed visible after the user resolved the plan dialog in the terminal: the card is now auto-dismissed when the session is already running at hook arrival time, or when the next tool event arrives while ExitPlanMode is still queued. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Adds an EDIT button (amber) to the ExitPlanMode approval UI in both the main ApprovalBar and the inline SessionCard. Clicking EDIT reveals a text input (reusing the QuestionCard "Other" pattern) — submitting sends a deny response with the typed text as a reason field so Claude can revise the plan accordingly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Remove preemptive auto-approve in handlePermissionRequest when session is .running/.processing. The status-based heuristic produced false positives when ExitPlanMode hooks arrived during unrelated tool execution. The queue-and-drain logic in handleHookEvent already covers the genuine late-arrival case via the "different-tool event draws the stale ExitPlanMode" path. - Reorder plan approval buttons to [EDIT, MANUAL, AUTO-ACCEPT]. - Add ExitPlanMode-specific row to ApprovalToolDetailView showing the plan text inline, with a click hint routing to a full preview window. - Add PlanPreviewWindowController — a resizable NSWindow with monospaced scrolling plan text and selectable copy. - README: add Uncle-Peke fork notice crediting upstream wxtsky, and add install instructions for the Uncle-Peke Homebrew tap. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
- SettingsView: About page links now point to the Uncle-Peke repo for GitHub / Issues, with an explicit "Upstream" link back to wxtsky's original repository. - Info.plist: SUFeedURL now points to the fork's appcast so Sparkle does not silently offer upgrades to the signed upstream DMG over the unsigned fork install. - appcast.xml: cleared to an empty feed for the fork — Homebrew Cask owns the upgrade path (`brew upgrade --cask codeisland`). Sparkle therefore reports "up to date" for manual DMG installs instead of cross-upgrading to upstream. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Drops upstream-only install paths, the features/supported-tools table, and the star-history chart (that chart tracks wxtsky's stars, not the fork's). Keeps the upstream credit at the top, the single `brew install` path, build-from-source against the fork URL, and an explicit "limitations vs upstream" section so users know what they lose by choosing the fork (unsigned DMG, no Sparkle auto-update). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
- README: explicit note that this fork does not accept bug reports; point users at upstream's issue tracker. - SettingsView: replace fork "Issues" link and standalone "Upstream" link with a single "Report Issue (upstream)" entry that jumps directly to wxtsky/CodeIsland/issues. Issues / Wiki / Discussions are also disabled on Uncle-Peke/CodeIsland itself (via GitHub API) so the UI doesn't even surface an entry point. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Adds a .gitattributes rule so future upstream syncs auto-resolve appcast.xml in favor of the fork's empty <channel>. The fork is not Developer ID signed, so importing upstream's signed enclosure entries would cause Sparkle to offer fork users an upgrade to upstream's DMG and break their install. Upgrade path is the Homebrew tap only. The merge=ours driver must also be registered per-clone (cannot be committed); the cloud upstream-sync routine needs: git config merge.ours.driver true before invoking `git merge upstream/main`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Author
|
Sorry, mis-targeted — meant to open this on the fork (Uncle-Peke/CodeIsland), not upstream. Closing. |
Uncle-Peke
changed the title
Author
|
Apologies for the noise — this was meant for my fork (Uncle-Peke/CodeIsland), not upstream. |
nguyenvanduocit
pushed a commit
to nguyenvanduocit/CodeIsland
that referenced
this pull request
Apr 27, 2026
No new actionable upstream changes since v1.0.23 (Apr 25). PR wxtsky#133 (Sparkle DEBUG fix), wxtsky#135 (Turkish L10n), wxtsky#136 (wrong-repo) and Issue wxtsky#134 (cursor-agent/qodercli) all skipped. Notes GitHub Issues disabled in our repo; tracking continues via kanban only. https://claude.ai/code/session_01GExyntV3NY82SUvfvjEjJW
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
.gitattributesruleappcast.xml merge=oursso future upstream syncs auto-resolve appcast.xml in favor of the fork's empty<channel>.eac72c3 feat(fork): point in-app update/About links to Uncle-Peke fork— the fork is not Developer ID signed, so importing upstream's signed enclosure entries would let Sparkle offer fork users an upgrade to upstream's DMG and break installs. Upgrade path stays Homebrew Cask only.git config merge.ours.driver truein Step 1 so the rule actually fires (driver registration can't be committed).Why this exists
PR #1's only feature-level conflict was
appcast.xml. With this in place, that file should silently resolve to ours on subsequent sync PRs and stop showing up as NEEDS REVIEW.Test plan
## Conflictsin the resulting sync PR