From 36a4363bb773cb655a2baa715ae05085efdfa00e Mon Sep 17 00:00:00 2001 From: amico-sync-bot Date: Sun, 16 Aug 2026 12:14:47 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20upstream=20sync=20report=20for=201.18.?= =?UTF-8?q?18=20@=203fd77ae980=20=E2=80=94=2032=20conflicts=20need=20hand-?= =?UTF-8?q?merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream anomalyco/opencode dev @ 3fd77ae980 into local/amicode. Auto-merge failed on 32 files (see .upstream-sync/report.md). Next: hand-merge per AMICODE-PATCHES.md. Co-authored-by: amico-sync-bot --- .upstream-sync/report.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .upstream-sync/report.md diff --git a/.upstream-sync/report.md b/.upstream-sync/report.md new file mode 100644 index 000000000..96d0862c6 --- /dev/null +++ b/.upstream-sync/report.md @@ -0,0 +1,32 @@ +# Upstream sync report — 2026-08-16 + +Upstream: anomalyco/opencode `dev` @ `3fd77ae980c9e68eccd10f1c396f32c6e3965046` (`3fd77ae980`, version `1.18.18`) +Base: harmoniqs/opencode `local/amicode` @ b24d43d9f2 +Branch: `notturno/merge-upstream-2026-08-16` + +## Result +Merge exited with conflicts — **hand-merge required** (32 files). + +## Conflict files +``` +bun.lock packages/app/src/app.tsx packages/app/src/components/debug-bar.tsx packages/app/src/components/prompt-input/placeholder.ts packages/app/src/components/session/session-context-tab.tsx packages/app/src/components/titlebar.tsx packages/app/src/context/language.tsx packages/app/src/desktop-menu.ts packages/app/src/entry.tsx packages/app/src/i18n/ar.ts packages/app/src/i18n/da.ts packages/app/src/i18n/de.ts packages/app/src/i18n/fr.ts packages/app/src/i18n/ja.ts packages/app/src/i18n/ko.ts packages/app/src/i18n/pl.ts packages/app/src/i18n/th.ts packages/app/src/i18n/uk.ts packages/app/src/pages/layout.tsx packages/app/src/pages/session.tsx packages/app/src/pages/session/timeline/message-timeline.tsx packages/app/src/wsl/settings-model.test.ts packages/app/src/wsl/settings-model.ts packages/opencode/src/server/shared/ui.ts packages/opencode/src/session/system.ts packages/opencode/test/server/httpapi-ui.test.ts packages/session-ui/package.json packages/session-ui/src/components/markdown-stream.test.ts packages/session-ui/src/components/markdown.tsx packages/session-ui/src/components/message-part.tsx packages/session-ui/src/v2/components/session-review-v2.css packages/ui/src/context/marked.tsx +``` + +## Full conflict list +``` + +``` + +## Next steps +1. `git fetch upstream && git checkout notturno/merge-upstream-2026-08-16 && git merge upstream/dev` +2. Resolve per AMICODE-PATCHES.md policy: + - adopt upstream bugfixes wholesale + - keep fork branding/KaTeX/AmicoSpinner/entity-rail/bug-dock + - re-delete `debug-bar.tsx` (fork keeps it deleted) + - `bun.lock` → theirs + `bun install` + - i18n: re-run `script/translate-app.ts` or copy EN fallbacks +3. Update `AMICODE-PATCHES.md` header + new sync section, bump `package.json` versions to `1.18.18`. +4. Verify: `env -u OPENCODE_CONFIG_CONTENT -u OPENCODE_SERVER_PASSWORD bun test`, `bun run typecheck`, and `OPENCODE_CHANNEL=dev` build gate (`grep newLayoutDesigns`). +5. Push — PR auto-updates. + +_Generated manually (amicode unavailable) on 2026-08-16_