Skip to content

chore(otter): changes before the 2026-10-02 sync - #14

Merged
Laurin-Notemann merged 1 commit into
mainfrom
otter/sync-2026-10-02
Oct 2, 2026
Merged

Laurin-Notemann merged 1 commit into
mainfrom
otter/sync-2026-10-02

Conversation

@Laurin-Notemann

Copy link
Copy Markdown

Everything committed to main since the last sync, moved onto the rebuilt main so it lands as one squash commit. The rebuilt main is upstream PR pingdotgg#2829 at 66a91077f, plus the kept Otter Code commits, the 2026-09-25, 2026-09-26, 2026-09-27, and 2026-09-29 sync squashes, and a regenerated adapt commit. PR pingdotgg#2829 is still open, so upstream is its head.

Commits:

  • chore(otter): point release and source links at otterware-app/otter-code

The 30 new upstream commits needed these conflict resolutions in the kept commits:

  • Brand commit: upstream replaced the hand-written Android subscription widget (Kotlin and resources) with an expo-widgets config, so the fork's edits to those deleted files are gone. The widget descriptions in app.config.ts take upstream's new iOS/Android split and still say Otter Code. The Live Activity placeholder takes upstream's new stale-date argument and keeps the "Otter Code" title. mobile-showcase.ts keeps the Otter package and scheme next to upstream's new dev-client launch flags.
  • Release commit: upstream split the marketing deploy into build_marketing and deploy_marketing (perf(release): build Vercel deployments early and go live after publish pingdotgg/t3code#14029). Both keep the pingdotgg/t3code-only gate.
  • Linear commit: the Linear command palette actions sit next to upstream's new "Restart agent session" action (feat(web): restart the agent session from cmd+k to load new skills and plugins pingdotgg/t3code#14542).
  • 2026-09-26 squash: the @vscode/l10n license entry sits next to upstream's new noxcturnal entries.

The regenerated adapt commit picks up upstream's new release jobs (Ubuntu runners in place of Blacksmith). Upstream added no relay migrations.

Aligning with upstream: none of the 30 upstream commits (OpenCode 2, Pi 1.0, project from a name, restart session, hotkey recording, release pipeline perf) overlaps a fork feature (diff panel, code intelligence, Linear, Otter release links). No acme-acme-acme references remain. Only the marketing site, which the fork never deploys, still links to pingdotgg releases.

Verified:

  • Typecheck in contracts, client-runtime, server, web, mobile, and relay.
  • Tests for the files changed since the last sync, the mobile widget and Live Activity, command palette, diff panel, sidebar/timeline logic, and the server's Linear and orchestration tests (36 files, 639 tests).
  • Format and lint on the hand-resolved files (remaining lint warnings are upstream's).
  • A server boot against a snapshot of real Otter data: V2 recovery ran and the server served requests. The only warning was a project whose worktree no longer exists.

🤖 Generated with Claude Code

The repository moved from acme-acme-acme to otterware-app. npm provenance
rejects packages whose repository.url does not match the publishing repo.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@Laurin-Notemann
Laurin-Notemann merged commit 6092090 into main Oct 2, 2026
18 checks passed
Laurin-Notemann added a commit that referenced this pull request Oct 3, 2026
* chore(otter): point release and source links at otterware-app/otter-code

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Otter-Sync: 2026-10-02
Laurin-Notemann added a commit that referenced this pull request Oct 3, 2026
* chore(otter): point release and source links at otterware-app/otter-code

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Otter-Sync: 2026-10-02
@ckafrouni
ckafrouni deleted the otter/sync-2026-10-02 branch October 3, 2026 15:42
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