Skip to content

chore(deps): Drop SwiftTerm fork — all fixes now upstream#102

Merged
eyelock merged 3 commits into
mainfrom
chore/drop-swiftterm-fork
Apr 11, 2026
Merged

chore(deps): Drop SwiftTerm fork — all fixes now upstream#102
eyelock merged 3 commits into
mainfrom
chore/drop-swiftterm-fork

Conversation

@eyelock
Copy link
Copy Markdown
Owner

@eyelock eyelock commented Apr 11, 2026

Summary

All three fixes staged in eyelock/SwiftTerm have landed in migueldeicaza/SwiftTerm upstream. The fork was never wired into Package.swift (plans were documented but never executed), so this PR simply advances the upstream pin and cleans up.

The three fixes now in upstream

Fix Upstream resolution
Cursor ghosting (DECTCEM / CaretView hidden but still rendered) Landed independently — ref #452
EV_VANISHED crash on terminal close (childMonitor race) PR #401 by ipodishima (merged Oct 2025)
PTY resize / Auto Layout mismatch (setFrameSize not calling processSizeChange) PR #469 by colemaco (merged Feb 2026)

Changes

  • SwiftTerm pin: 75d0fd9b6ce28a4 (post-v1.13.0, Apr 6 2026 — all three fixes included)
  • swift-sdk lower bound: 0.9.00.12.0 (tightened to match the API already used by tests since commit 48c5823)
  • ToolHandlers.swift: Updated to non-deprecated Tool.Content.text(text:annotations:_meta:) enum case (required by the sdk bump)

Follow-up

After merge, eyelock/SwiftTerm can be archived via Settings → Danger Zone.
The fix/tmux-panels branch should be rebased onto updated main (git rebase origin/mainPackage.swift was not modified on that branch so the rebase should be clean).

Test plan

  • make build — passes, zero errors, zero deprecation warnings
  • make lint — 0 serious violations
  • make format-check — passes (warnings are pre-existing)
  • make test — all tests pass

🤖 Generated with Claude Code

David Collie and others added 3 commits April 11, 2026 14:23
Replace per-file exclusions inside TermQ.app/ with a top-level ignore
for the entire directory, which is fully generated at build time. Also
removes previously-tracked Info-Debug.plist and AppIcon.icns.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
All three fixes from eyelock/SwiftTerm are now in migueldeicaza/SwiftTerm main:

- Cursor ghosting (DECTCEM / CaretView): landed independently in upstream
  Ref: migueldeicaza/SwiftTerm#452
- EV_VANISHED crash (childMonitor race): PR #401 by ipodishima (Oct 2025)
  Ref: migueldeicaza/SwiftTerm#401
- PTY resize / Auto Layout: PR #469 by colemaco (Feb 2026)
  Ref: migueldeicaza/SwiftTerm#469

The eyelock/SwiftTerm fork was never wired into Package.swift — these plans
were documented but not executed. The fork can now be archived.

Also tightens MCP swift-sdk lower bound to 0.12.0, matching the API used
by tests since commit 48c5823. Updates ToolHandlers.swift to use the new
non-deprecated Tool.Content.text(text:annotations:_meta:) enum case.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
The .gitignore simplification in the previous commit excluded the entire
TermQ.app/ bundle, but Info-Debug.plist is a source template (not a build
artifact) that the Makefile depends on. Move it to Config/ and update
the INFO_PLIST reference accordingly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@eyelock eyelock merged commit b7bd674 into main Apr 11, 2026
8 checks passed
@eyelock eyelock deleted the chore/drop-swiftterm-fork branch April 11, 2026 13:45
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