[WrittenByAI]

Upstream 01bcc57ff merged into the fork with conflicts.

Unresolved markers remain in: package.json, pnpm-lock.yaml, src/renderer/src/i18n/locales/en.json, src/renderer/src/i18n/locales/es.json, src/renderer/src/i18n/locales/ja.json, src/renderer/src/i18n/locales/ko.json, src/renderer/src/i18n/locales/zh.json

Fork files upstream also touched: package.json, pnpm-lock.yaml, src/main/github/client.ts, src/main/ipc/github.test.ts, src/main/ipc/github.ts, src/main/runtime/orca-runtime.ts, src/main/runtime/rpc/methods/github.test.ts, src/main/runtime/rpc/methods/github.ts, src/main/runtime/runtime-rpc.ts, src/preload/api-types.ts, src/preload/index.ts, src/renderer/src/assets/rich-markdown-editor.css, src/renderer/src/components/editor/EditorContent.tsx, src/renderer/src/components/editor/EditorPanelShell.tsx, src/renderer/src/components/right-sidebar/SourceControl.tsx, src/renderer/src/i18n/locales/en.json, src/renderer/src/i18n/locales/es.json, src/renderer/src/i18n/locales/ja.json, src/renderer/src/i18n/locales/ko.json, src/renderer/src/i18n/locales/zh.json, src/renderer/src/lib/language-detect.ts, src/renderer/src/store/slices/diffComments.test.ts, src/renderer/src/store/slices/diffComments.ts, src/renderer/src/web/web-preload-api.test.ts, src/renderer/src/web/web-preload-api.ts, src/shared/types.ts

---

Upstream merge conflict report — 01bcc57ff

• Merge: upstream origin/main @ 01bcc57ff ("perf(mobile): gate dictation
  setup progress polling on foreground + single-flight (perf(mobile): gate dictation setup progress polling on foreground + single-flight stablyai/orca#9892)") into fork
  HEAD @ 0e6048b34.
• Conflicted files (7): package.json, pnpm-lock.yaml, and the five locale
  files src/renderer/src/i18n/locales/{en,es,ja,ko,zh}.json.
• Outcome: all 7 files resolved; all conflict markers removed. No
  git add/commit/merge run. git diff --check is clean; all five locale
  files and package.json parse as valid JSON (jq empty).

---

package.json

• Region: the pnpm.overrides map.
• Base: { "monaco-editor>dompurify": "3.4.11" }.
• Upstream changed: added "@modelcontextprotocol/sdk>@hono/node-server": "2.0.10"
  and bumped "monaco-editor>dompurify" 3.4.11 → 3.4.12.
• Fork changed: added "@tiptap/extension-highlight": "3.22.5" — a fork-only
  pin required by the tldraw canvas feature (tldraw's rich-text path drags in
  tiptap; see the "Грабли форка" note in CLAUDE.md).
• Why they collided: both sides edited the same (small) overrides object.
• Resolution: union of all three keys, taking upstream's newer dompurify
  (3.4.12) and keeping the fork's tiptap pin:

  "@modelcontextprotocol/sdk>@hono/node-server": "2.0.10",
  "monaco-editor>dompurify": "3.4.12",
  "@tiptap/extension-highlight": "3.22.5"
  

• Human must decide: nothing. Confident.

---

pnpm-lock.yaml (5 conflict regions)

Only 5 regions conflicted; everything else auto-merged. Notably, upstream's
dompurify@3.4.12 and @hono/node-server@2.0.10 package and snapshot entries
auto-merged in cleanly (verified present at lines 4023/10151 and 1009/7295), so
the combined overrides above are backed by real resolutions.

1. overrides: block (top of file)

Mirror of the package.json conflict. Resolved to the same union, keys/values
matching package.json exactly (pnpm compares the lock's overrides against
pnpm.overrides):

'@modelcontextprotocol/sdk>@hono/node-server': 2.0.10
monaco-editor>dompurify: 3.4.12
'@tiptap/extension-highlight': 3.22.5

2 & 4. idb / ieee754 (packages + snapshots sections)

• Fork side: entries for idb@7.1.1 and ieee754@1.2.1.
• Upstream side: neither (upstream has no tldraw and dropped buffer@5.7.1).
• Investigation:
  • idb@7.1.1 is a real dependency of the fork's @tldraw/editor@5.2.4
    (referenced at the auto-merged snapshot line ~8988) and of tldraw@5.2.4
    itself → kept.
  • ieee754@1.2.1 was, in the fork, referenced only by buffer@5.7.1
    (optional: true). Upstream removed buffer@5.7.1 entirely, and that
    removal auto-merged in — so in the merged tree nothing references ieee754
    anymore (no buffer@5.7.1, no ieee754: 1.2.1 reference remain). Keeping it
    would leave a dangling/orphan lock entry → dropped (follows upstream).
• Resolution: keep idb@7.1.1 in both sections, drop ieee754@1.2.1 from both.

3 & 5. tldraw@5.2.4 / tldts-core (packages + snapshots sections)

• Fork side: the full tldraw@5.2.4 package + snapshot (the fork's core
  feature) plus tldts-core@7.0.30.
• Upstream side: tldts-core@7.4.9 (upstream bumped the unrelated tldts
  URL-parsing lib 7.0.30 → 7.4.9).
• Investigation: tldts@7.4.9 (common, auto-merged) depends on
  tldts-core: 7.4.9; nothing references 7.0.30 outside the conflict → the
  fork's 7.0.30 was stale.
• Resolution: keep tldraw@5.2.4 (package + snapshot, unchanged), take
  upstream's tldts-core@7.4.9 in both sections, drop 7.0.30.

Post-resolution structural checks (all pass): no leftover 7.0.30,
dompurify 3.4.11, or buffer@5.7.1; idb@7.1.1 present in both sections;
ieee754 fully absent; tldts-core unified at 7.4.9; overrides match
package.json.

• Human/CI must decide: the lockfile was hand-merged, not regenerated.
  The analysis above shows an internally consistent graph, but I could not run
  pnpm install in this sandbox to get a green check. CI's
  pnpm install --frozen-lockfile is the final authority — if it reports the
  lock as out of date, re-run pnpm install --lockfile-only on the merged
  package.json and commit the regenerated lock.

---

Locale files — en.json, es.json, ja.json, ko.json, zh.json

All five files have the same two conflict regions with identical structure
(only the translated string values differ). Both are clean add/add conflicts:
distinct sibling keys added to the same JSON object by each side.

Region A (~line 9772–9778): a source-control string bucket

• Fork added: "5c951f3e68": "Canvas", "897d7c622d": "Canvas" (canvas
  labels for the tldraw feature; "Canvas" is intentionally untranslated in every
  locale).
• Upstream added: "97e7124eac" ("Could not refresh Source Control…") and
  "a4e93c21d7" ("Current branch: {{value0}}"), each translated per locale.
• Resolution: kept all four keys, fork's two first then upstream's two,
  comma-joined; no trailing comma before the closing brace.

Region B (~line 12344–12404): tldraw blocks vs. editor.save.failure

• Fork added: four sibling objects — TldrawIssueDialog,
  TldrawSelectionOverlay, TldrawViewer, and a nested tldraw.issue.image
  bucket (all fork-feature strings, carried as English fallback in every locale).

• Upstream added: a nested editor.save.failure.notice."8c59ce5075"
  ("Failed to save the file. Please try again.") — also English in every locale
  in this diff.

• Why they collided: both sides appended keys at the same position, and the
  fork's final key was deeply nested (tldraw → issue → image → …) while
  upstream's was deeply nested (editor → save → failure → notice → …), so the
  shared closing braces after the marker had to be re-associated.

• Resolution: kept the fork's tldraw blocks, closed the tldraw.issue.image
  nesting (}}},), then appended upstream's full editor block. Verified brace
  balance and JSON validity for all five files.

• Human must decide: nothing on structure. Optional follow-up: the fork's
  tldraw strings and upstream's editor.save string are English placeholders in
  the non-English locales — real translations can be added later via the normal
  localization pass (and the zh value-override script), but that is unrelated to
  this merge.

---

Verdict

All 7 conflicted files resolved confidently. The only item warranting a human/CI
touch is the hand-merged pnpm-lock.yaml, which should be confirmed by
pnpm install --frozen-lockfile in CI (standard for any lockfile merge).