Skip to content

chore: upstream sync → 1.16.2#15

Merged
aiand-atul merged 113 commits into
devfrom
chore/upstream-sync-1.16.2
Jun 8, 2026
Merged

chore: upstream sync → 1.16.2#15
aiand-atul merged 113 commits into
devfrom
chore/upstream-sync-1.16.2

Conversation

@aiand-atul

Copy link
Copy Markdown

Syncs the fork with upstream/dev (112 commits): 1.16.0 → 1.16.2.

Conflicts resolved (4 — all Phase-1 branding, per FORK.md)

  • packages/opencode/src/cli/logo.ts — upstream moved the logo into @opencode-ai/tui/logo; took upstream's re-export and ported our aiand mark into the new canonical packages/tui/src/logo.ts.
  • packages/app/src/app.tsx — took upstream (our side was a commented-out Show block).
  • packages/tui/src/app.tsx — kept "aiand-code" terminal title, took upstream's isDefaultTitle.
  • packages/tui/src/attention.ts — kept DEFAULT_TITLE = "aiand-code", dropped the now-unused Log.create line.

Verification

  • bun install — lockfile already consistent (no hand-merge).
  • Single-platform verify build (darwin/arm64): 108 MB binary, --version smoke test passed.
  • Fork delta intact (aiand-code bin, managed-backend repoint, free-default model).

🤖 Generated with Claude Code

Hona and others added 30 commits June 5, 2026 06:30
Co-authored-by: Brendan Allan <git@brendonovich.dev>
kitlangton and others added 25 commits June 6, 2026 21:55
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
…1.16.2

# Conflicts:
#	packages/app/src/app.tsx
#	packages/opencode/src/cli/logo.ts
#	packages/tui/src/app.tsx
#	packages/tui/src/attention.ts
@github-actions

github-actions Bot commented Jun 8, 2026

Copy link
Copy Markdown

This PR doesn't fully meet our contributing guidelines and PR template.

What needs to be fixed:

  • PR description is missing required template sections. Please use the PR template.

Please edit this PR description to address the above within 2 hours, or it will be automatically closed.

If you believe this was flagged incorrectly, please let a maintainer know.

@github-actions

github-actions Bot commented Jun 8, 2026

Copy link
Copy Markdown

Thanks for your contribution!

This PR doesn't have a linked issue. All PRs must reference an existing issue.

Please:

  1. Open an issue describing the bug/feature (if one doesn't exist)
  2. Add Fixes #<number> or Closes #<number> to this PR description

See CONTRIBUTING.md for details.

@aiand-atul aiand-atul merged commit 21a33bd into dev Jun 8, 2026
3 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.