Merge v1.1.1.1-integration-test: Upstream v1.1.1 + UI/Permission/Worktree improvements #263

shuv1337 · 2026-01-05T02:30:35Z

Summary

Integration of upstream v1.1.1 with significant improvements to the permission system, UI components, and new features including managed git worktrees and MCP enhancements.

Changes

Upstream Integration

Merged upstream v1.1.1 release with all upstream improvements
Updated Nix flake.lock and hashes
Synced repo references from sst/opencode to anomalyco/opencode

Core Features

Permission rework (Permission rework anomalyco/opencode#6319): Complete overhaul of the permission system with new arity-based evaluation logic
Managed git worktrees (feat: add managed git worktrees anomalyco/opencode#6674): Add sandbox support for working in multiple directories per project
Per-project MCP config overrides (feat: add per-project MCP config overrides anomalyco/opencode#5406): Allow project-specific MCP server configurations
MCP resources (feat: mcp resources anomalyco/opencode#6542): Add resource support to MCP
Kotlin LSP integration (feat: Add kotlin lsp integration anomalyco/opencode#6601): New language server for Kotlin with improved root detection for Gradle multi-project builds
Session compaction (fix(session): check for context overflow mid-turn in finish-step anomalyco/opencode#6480): Handle context overflow mid-turn with /compact command

App/UI Improvements

Adopt upstream header pattern and relocate theme/font settings to sidebar
Improve sidebar collapsed state UI
Add session components: context tab, header, sortable tabs
Fix auto-scroll behaviors and scroll position restoration
Add image preview support in session viewer (feat(app): add image preview support in session viewer anomalyco/opencode#6678)
Fix diff rendering performance

TUI Improvements

Fix memory leaks in session management
Add permission dialogs with escape key handling
Add Osaka Jade theme
Add reload functionality with reset capability
Add assistant metadata to session export (feat: add assistant metadata to session export anomalyco/opencode#6611)
Add reject message support to permission dialogs

Desktop App

Nix flake integration for desktop builds
Edit project fix (Desktop: Edit Project Fix anomalyco/opencode#6757)
Improve resize handle layout
Properly decode session id for permission context (fix(desktop): Properly decode session id for permission context anomalyco/opencode#6580)

CI/Workflows

Add duplicate PR detection bot
Add Nix desktop workflow
Update publish workflow

Tests

Add comprehensive permission tests (arity, next)
Add session compaction tests
Add message-v2 tests
Add transcript tests
Add session-select server tests
Update agent tests with new permission system

Type Fixes (this PR)

Fix permissionID -> requestID in global-sync.tsx to match SDK types
Fix sync.tsx to use 'status: complete' instead of 'ready' property
Add proper McpResource type definition in TUI sync context
Use valid keybind key in search.tsx
Add ts-ignore for complex Hono route chain type inference

Breaking Changes

None - all changes are backwards compatible.

Testing

All 606 tests pass in packages/opencode
No merge conflicts with integration branch
Full typecheck passes across all 12 packages

…alyco#6587)

)

…malyco#6480)

Co-authored-by: Github Action <action@github.com> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>

…ds like rm, cd, etc

…ror handling

…#6777)

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>

Co-authored-by: Adam Spiers <opencode@adamspiers.org>

- Realigned with native upstream PermissionNext system (abandoned custom glob-permissions) - Realigned with native upstream worktree ID logic (abandoned differentiated IDs) - Preserved AskQuestionTool integration - Resolved multiple package.json syntax errors and version conflicts - Fixed layout state conflicts and updated docs - Verified with full test suite (606 passes)

… context

…ings to sidebar

- Center logo in sidebar header when collapsed - Hide font/theme pickers when sidebar is collapsed

- Fix permissionID -> requestID in global-sync.tsx to match SDK types - Fix sync.tsx to use 'status: complete' instead of 'ready' property - Add proper McpResource type definition in TUI sync context - Use valid keybind key in search.tsx - Add ts-ignore for complex Hono route chain type inference

greptile-apps · 2026-01-05T02:30:39Z

Skipped: This PR changes more files than the configured file change limit: (218 files found, 200 file limit)

- Resolved version conflicts in package.json files (kept v1.1.1) - Merged default_agent feature from integration - Fixed missing 'default' property in Agent type - Added path and fs imports to agent tests

actions-user and others added 30 commits January 1, 2026 12:04

ignore: update download stats 2026-01-01

41f9a58

fix(server): add Content-Type headers for proxied static assets (anom…

dc85863

…alyco#6587)

chore: generate

35fff0c

fix: display error if invalid agent is used in a command (anomalyco#6578

3b03324

)

fix(session): check for context overflow mid-turn in finish-step (ano…

7a3ff5b

…malyco#6480)

core: use --no-cache when behind proxy to avoid hangs

8ebc601

core: make installdeps non blocking

e503654

ignore: keep the process exit logic

5138f92

core: fix stats command day calculation and time filtering

9be944a

fix: remove outdated Haiku filter for GitHub Copilot (anomalyco#6593)

8b35d56

docs: update zen processing fee

5f2be55

core: fix import command regex

dccb887

Permission rework (anomalyco#6319)

351ddee

Co-authored-by: Github Action <action@github.com> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>

chore: generate

99794c2

ignore: comment out repo default for ask

7760b33

fix: ensure new permissions changes work for special case bash comman…

76186d1

…ds like rm, cd, etc

test: fix bash test

7aa1dbe

Desktop: Improve Resize Handle (anomalyco#6608)

680db7b

fix: windows fallback for "less" cmd in session list (anomalyco#6515)

154c52c

feat: add assistant metadata to session export (anomalyco#6611)

05eee67

ignore

4f1ef93

tui: improve permission error handling and evaluation logic

963f407

tui: fix permission tests for new evaluate function signature

db8d83b

tui: add heap snapshot option to system menu for debugging memory usage

2aaea71

tui: fix memory leaks in session management and improve permission er…

dad9c91

…ror handling

chore: generate

07c008f

tui: remove memory leak fixes documentation after implementation

b84a1f7

wip(app): file context

78940d5

wip(desktop): progress

b8872d9

wip(desktop): progress

6647b1e

elithrar and others added 27 commits January 4, 2026 02:05

github: handle duplicate PR creation when agent creates PR (anomalyco…

4486174

…#6777)

fix(app): auto-scroll behaviors

7ce0520

fix(app): don't override ctrl+a on windows

c9f907c

fix(app): scroll position restoration

177b01a

fix(app): auto-scroll

5053822

tweak: prioritize free gpt-5-mini for small model in github copilot

d72d7ab

docs: add logging best practices for plugin authors (anomalyco#6833)

8aa56dc

chore: generate

4f3ac70

ci: update duplicate pr action

29672e7

docs: typo in subtask documentation (anomalyco#6821)

1f8dab5

Remove opencode-skills entry from ecosystem.mdx (anomalyco#6817)

f3cd3b8

initialize config in worktree

2d074f0

feat(nix): preliminary desktop app flake integration (anomalyco#6135)

e00621c

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>

feat: mcp resources (anomalyco#6542)

21dc3c2

fix(tui): add missing theme_list keybind (anomalyco#6779)

24dedb4

Co-authored-by: Adam Spiers <opencode@adamspiers.org>

chore: generate

555a5cc

ensure @opencode-ai/plugin exists only on first run

97977f6

tui: add development scripts for better debugging workflow

a76570b

Update Nix flake.lock and hashes

0f9130b

release: v1.1.1

dc25669

fix(app): restore missing mobileSidebar and view properties to layout…

feabef0

… context

fix(app): restore missing theme and font properties to layout context

2c670e5

feat(app): adopt upstream header pattern and relocate theme/font sett…

90d5fc8

…ings to sidebar

style(app): remove redundant status bar and fix sidebar menu alignment

d60c9a9

fix: improve sidebar collapsed state UI

5e374b1

- Center logo in sidebar header when collapsed - Hide font/theme pickers when sidebar is collapsed

Merge origin/integration into v1.1.1.1-integration-test

bdf2646

- Resolved version conflicts in package.json files (kept v1.1.1) - Merged default_agent feature from integration - Fixed missing 'default' property in Agent type - Added path and fs imports to agent tests

shuv1337 merged commit f8845ff into integration Jan 5, 2026
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge v1.1.1.1-integration-test: Upstream v1.1.1 + UI/Permission/Worktree improvements #263

Merge v1.1.1.1-integration-test: Upstream v1.1.1 + UI/Permission/Worktree improvements #263

shuv1337 commented Jan 5, 2026

Uh oh!

greptile-apps bot commented Jan 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Merge v1.1.1.1-integration-test: Upstream v1.1.1 + UI/Permission/Worktree improvements #263

Merge v1.1.1.1-integration-test: Upstream v1.1.1 + UI/Permission/Worktree improvements #263

Conversation

shuv1337 commented Jan 5, 2026

Summary

Changes

Upstream Integration

Core Features

App/UI Improvements

TUI Improvements

Desktop App

CI/Workflows

Tests

Type Fixes (this PR)

Breaking Changes

Testing

Uh oh!

greptile-apps bot commented Jan 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants